reactivate branch setting
This commit is contained in:
parent
a98cf213ca
commit
882627ffaf
4 changed files with 12 additions and 19 deletions
|
@ -188,7 +188,6 @@ fi
|
|||
mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
|
||||
|
||||
create_args+=(-v -a ${arch} -D ${install_dir} -C ${pacman_conf} -M ${mirrors_conf})
|
||||
# mkchroot_args+=(-C ${pacman_conf} -M ${mirrors_conf})
|
||||
|
||||
mkiso_args+=(-a ${arch} -D ${install_dir} -L ${iso_label} -c ${compression})
|
||||
|
||||
|
|
|
@ -93,9 +93,9 @@ build_mount_args() {
|
|||
track_mount "/etc/resolv.conf" "${working_dir}/etc/resolv.conf" -B
|
||||
track_mount "${cache_dirs[0]}" "${working_dir}${cache_dirs[0]}" -B
|
||||
|
||||
# for cache_dir in ${cache_dirs[@]:1}; do
|
||||
# track_mount "$cache_dir" "${working_dir}${cache_dir}" -Br
|
||||
# done
|
||||
for cache_dir in ${cache_dirs[@]:1}; do
|
||||
track_mount "$cache_dir" "${working_dir}${cache_dir}" -Br
|
||||
done
|
||||
|
||||
if [[ -n ${mountargs_ro[@]} ]];then
|
||||
local IFS=','
|
||||
|
|
|
@ -84,11 +84,12 @@ echo "$version" > "$working_dir/.manjaro-tools"
|
|||
if ${build_locales};then
|
||||
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
|
||||
echo 'LANG=C' > "$working_dir/etc/locale.conf"
|
||||
fi
|
||||
|
||||
exec chroot-run \
|
||||
exec chroot-run \
|
||||
${pac_conf:+-C "$pac_conf"} \
|
||||
${makepkg_conf:+-M "$makepkg_conf"} \
|
||||
${mirrors_conf:+-S "$mirrors_conf"} \
|
||||
${cache_dir:+-c "$cache_dir"} \
|
||||
"$working_dir" locale-gen
|
||||
fi
|
||||
|
||||
|
|
|
@ -529,16 +529,9 @@ make_root_image() {
|
|||
|
||||
# configure_machine_id "${work_dir}/root-image"
|
||||
|
||||
# mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
|
||||
#
|
||||
# setarch ${arch} \
|
||||
# mkchroot ${mkchroot_args[*]} ${work_dir}/root-image ${packages} || die "Please check you Packages file! Exiting."
|
||||
#
|
||||
# clean_image "${work_dir}/root-image"
|
||||
|
||||
pacman -Qr "${work_dir}/root-image" > "${work_dir}/root-image/root-image-pkgs.txt"
|
||||
|
||||
# cp ${work_dir}/root-image/etc/locale.gen.bak ${work_dir}/root-image/etc/locale.gen
|
||||
cp ${work_dir}/root-image/etc/locale.gen.bak ${work_dir}/root-image/etc/locale.gen
|
||||
|
||||
if [ -e ${work_dir}/root-image/boot/grub/grub.cfg ] ; then
|
||||
rm ${work_dir}/root-image/boot/grub/grub.cfg
|
||||
|
|
Loading…
Reference in a new issue