Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkarchroot: code cleanup

This commit is contained in:
Pierre Schmitz 2013-04-06 18:38:10 +02:00
parent 1f0374d8a6
commit 4bcafd9768
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mkarchroot.in
View File

@ -171,23 +171,15 @@ else
pacargs+=("--config=${pac_conf}")
fi
if (( $# != 0 )); then
if [[ $FORCE = 'y' ]]; then
pacargs+=("--force")
fi
if ! pacstrap -GMcd "${working_dir}" "${pacargs[@]}" "$@"; then
die 'Failed to install all packages'
fi
if [[ $FORCE = 'y' ]]; then
pacargs+=("--force")
fi
if ! pacstrap -GMcd "${working_dir}" "${pacargs[@]}" "$@"; then
die 'Failed to install all packages'
fi
if [[ -d "${working_dir}/lib/modules" ]]; then
chroot_run "${working_dir}" ldconfig
fi
if [[ -e "${working_dir}/etc/locale.gen" ]]; then
sed -i 's@^#\(en_US\|de_DE\)\(\.UTF-8\)@\1\2@' "${working_dir}/etc/locale.gen"
chroot_run "${working_dir}" locale-gen
fi
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "${working_dir}/etc/locale.gen"
chroot_run "${working_dir}" locale-gen
echo 'LANG=C' > "${working_dir}/etc/locale.conf"
copy_hostconf