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

[basestrap][buildpkg] clean up

Browse source
This commit is contained in:
udeved 2015-06-01 23:16:15 +02:00
parent 9f4382fdb9
commit d76f477726
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/basestrap.in
View file

@ -46,7 +46,6 @@ usage() {
# exit $(( $# ? 0 : 1 )) # exit $(( $# ? 0 : 1 ))
# fi # fi
# #
# (( EUID == 0 )) || die 'This script must be run with root privileges'
orig_argv=("$@") orig_argv=("$@")
@ -108,8 +107,6 @@ fi
if ${copymirrorlist}; then if ${copymirrorlist}; then
# install the host's mirrorlist onto the new root # install the host's mirrorlist onto the new root
cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/" cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
#cp -a ${PKGDATADIR}/pacman-mirrors-${branch}.conf "$newroot/etc" #/pacman.d/"
#pacman-mirrors -g -b ${branch}
fi fi
# vim: et ts=2 sw=2 ft=sh: # vim: et ts=2 sw=2 ft=sh:

8
bin/buildpkg.in
View file

@ -185,10 +185,8 @@ ${wipe_clean} && clean_up
[[ -d ${work_dir}/root ]] && check_chroot_version [[ -d ${work_dir}/root ]] && check_chroot_version
#[[ $(get_branch) != ${branch} ]] && set_branch "${branch}"
chroot_init chroot_init
fix_pacman_conf "${work_dir}/root"
chroot_build
#reset_branch fix_pacman_conf "${work_dir}/root"
chroot_build