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

reactivate branch setting

Browse source
This commit is contained in:
udeved 2015-01-11 21:02:29 +01:00
parent a98cf213ca
commit 882627ffaf
4 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/buildiso.in
View file

@ -188,7 +188,6 @@ fi
mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf" mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
create_args+=(-v -a ${arch} -D ${install_dir} -C ${pacman_conf} -M ${mirrors_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}) mkiso_args+=(-a ${arch} -D ${install_dir} -L ${iso_label} -c ${compression})

6
bin/chroot-run.in
View file

@ -93,9 +93,9 @@ build_mount_args() {
track_mount "/etc/resolv.conf" "${working_dir}/etc/resolv.conf" -B track_mount "/etc/resolv.conf" "${working_dir}/etc/resolv.conf" -B
track_mount "${cache_dirs[0]}" "${working_dir}${cache_dirs[0]}" -B track_mount "${cache_dirs[0]}" "${working_dir}${cache_dirs[0]}" -B
# for cache_dir in ${cache_dirs[@]:1}; do for cache_dir in ${cache_dirs[@]:1}; do
# track_mount "$cache_dir" "${working_dir}${cache_dir}" -Br track_mount "$cache_dir" "${working_dir}${cache_dir}" -Br
# done done
if [[ -n ${mountargs_ro[@]} ]];then if [[ -n ${mountargs_ro[@]} ]];then
local IFS=',' local IFS=','

15
bin/mkchroot.in
View file

@ -84,11 +84,12 @@ echo "$version" > "$working_dir/.manjaro-tools"
if ${build_locales};then if ${build_locales};then
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
echo 'LANG=C' > "$working_dir/etc/locale.conf" echo 'LANG=C' > "$working_dir/etc/locale.conf"
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 fi
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

9
lib/util-iso.sh
View file

@ -528,17 +528,10 @@ make_root_image() {
# cp "${work_dir}/root-image"/etc/machine-id "${work_dir}/root-image"/var/lib/dbus/machine-id # cp "${work_dir}/root-image"/etc/machine-id "${work_dir}/root-image"/var/lib/dbus/machine-id
# configure_machine_id "${work_dir}/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" 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 if [ -e ${work_dir}/root-image/boot/grub/grub.cfg ] ; then
rm ${work_dir}/root-image/boot/grub/grub.cfg rm ${work_dir}/root-image/boot/grub/grub.cfg