summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 11:23:02 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 11:23:02 -0400
commit5285252fb7d4a690b69ed5dda3633beeaff28342 (patch)
tree8ae5d499bbc9e5bf4b5a795bd32784eafba3e3e3
parent98c9230dbf2f3d1f128f6ea284177270a47533d5 (diff)
parent4bcafd9768be4d1fefea2047ea1f34d8904eeb9e (diff)
downloaddevtools32-5285252fb7d4a690b69ed5dda3633beeaff28342.tar.xz
Merge commit '4bca' into complete
Conflicts: mkarchroot.in
-rw-r--r--mkarchroot.in20
1 files changed, 6 insertions, 14 deletions
diff --git a/mkarchroot.in b/mkarchroot.in
index 9e58cc9..8cf9474 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -203,23 +203,15 @@ else
pacargs+=("--config=${pac_conf}")
fi
- if (( $# != 0 )); then
- if [[ $FORCE = 'y' ]]; then
- pacargs+=("--force")
- fi
- if ! pacstrap -GMcd "${working_dir}" "${pacargs[@]}" "${PKGS[@]}"; then
- die 'Failed to install all packages'
- fi
+ if [[ $FORCE = 'y' ]]; then
+ pacargs+=("--force")
fi
-
- if [[ -d "${working_dir}/lib/modules" ]]; then
- chroot_run "${working_dir}" ldconfig
+ if ! pacstrap -GMcd "${working_dir}" "${pacargs[@]}" "${PKGS[@]}"; then
+ die 'Failed to install all packages'
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