diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-28 03:59:26 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-02-28 03:59:26 +0000 |
| commit | 1d418f2d14905b513deb0e3c0fae172d2b8ae08f (patch) | |
| tree | 03c829a23f2d04056092b2581d49b348b3d94811 /targets/netboot | |
| parent | Rearrange some of the functions in chroot-functions.sh in preparation for som... (diff) | |
| download | catalyst-1d418f2d14905b513deb0e3c0fae172d2b8ae08f.tar.gz catalyst-1d418f2d14905b513deb0e3c0fae172d2b8ae08f.tar.bz2 catalyst-1d418f2d14905b513deb0e3c0fae172d2b8ae08f.zip | |
Changing run_emerge to run_merge, changing both setup_portage and setup_myfeatures to add any USE changes to make.conf prior to merge, then removing the settings added, rather than (ab)using the environment.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1333 d1e1f19c-881f-0410-ab34-b69fee027534
Diffstat (limited to 'targets/netboot')
| -rwxr-xr-x | targets/netboot/netboot-chroot.sh | 2 | ||||
| -rw-r--r-- | targets/netboot/netboot-combine.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh index 76e97aac..3115cac8 100755 --- a/targets/netboot/netboot-chroot.sh +++ b/targets/netboot/netboot-chroot.sh @@ -3,4 +3,4 @@ source /tmp/chroot-functions.sh # START BUILD -run_emerge "${clst_packages}" +run_merge "${clst_packages}" diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh index 8d9898b3..ad3916cd 100644 --- a/targets/netboot/netboot-combine.sh +++ b/targets/netboot/netboot-combine.sh @@ -35,7 +35,7 @@ case ${clst_hostarch} in esac #if [ ! -z "${booter}" ] ; then -# run_emerge ${booter} || exit 1 +# run_merge ${booter} || exit 1 #fi extract_kernels ${clst_chroot_path}/tmp |