root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel

Browse source
This commit is contained in:
udeved 2015-01-20 22:41:37 +01:00
commit cca9044502
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bin/mkchroot.in
View file

@ -85,9 +85,11 @@ basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
echo "$version" > "$working_dir/.manjaro-tools"
if ${build_locales};then
printf '%s.UTF-8 UTF-8\n en_US.UTF-8 UTF-8\n de_DE.UTF-8 UTF-8\n' > "$working_dir/etc/locale.gen"
echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
echo 'LC_MESSAGES=C' >> "$working_dir/etc/locale.conf"
cp "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.bak"
cp "$working_dir/etc/locale.conf" "$working_dir/etc/locale.conf.bak"
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
printf '%s.UTF-8' en_US > "$working_dir/etc/locale.conf"
printf 'LC_MESSAGES=C' >> "$working_dir/etc/locale.conf"
fi
exec chroot-run \
@ -98,3 +100,8 @@ exec chroot-run \
${cache_dir:+-c "$cache_dir"} \
"$working_dir" locale-gen
if ${build_locales};then
cp "$working_dir/etc/locale.gen.bak" "$working_dir/etc/locale.gen"
cp "$working_dir/etc/locale.conf.bak" "$working_dir/etc/locale.conf"
fi

7
bin/mkiso.in
View file

@ -25,6 +25,7 @@ COMPRESSION="xz"
CREATE_DEFAULT=false
INSTALL_DIR="manjaro"
IMAGE_FOLDER="root-image"
LOCALE=""
APPNAME=$(basename "${0}")
MIRRORS=''
@ -149,7 +150,7 @@ clean_up(){
_mkchroot(){
#set locale.gen
if [ "${IMAGE_FOLDER}" == "livecd-image" ]; then
if [ "${IMAGE_FOLDER}" == "root-image" ]; then
LOCALE="-L"
fi
@ -168,10 +169,6 @@ _mkchroot(){
"${work_dir}/${IMAGE_FOLDER}" $@ || die "Failed to retrieve one or more packages!"
fi
# if [ -e "${work_dir}/root-image/etc/locale.gen" ]; then
# cp ${work_dir}/root-image/etc/locale.gen ${work_dir}/root-image/etc/locale.gen.bak
# fi
# Cleanup
find "${work_dir}" -name *.pacnew -name *.pacsave -name *.pacorig -delete
}