commit: 07caf3e213b541c6e165e1d65d73640cb2deee10
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 01:23:31 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 01:23:31 2018 +0000
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=07caf3e2
grs/Netboot.py: return to using busybox from system root
grs/Kernel.py | 1 -
grs/Netboot.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/grs/Kernel.py b/grs/Kernel.py
index 924bdf9..fe411bd 100644
--- a/grs/Kernel.py
+++ b/grs/Kernel.py
@@ -123,7 +123,6 @@ class Kernel():
cmd += '--module-prefix=%s ' % image_dir
cmd += '--modprobedir=%s ' % modprobe_dir
cmd += '--arch-override=%s ' % arch
- cmd += '--utils-arch=%s ' % arch
if has_modules:
cmd += 'all'
else:
diff --git a/grs/Netboot.py b/grs/Netboot.py
index 6b1fe7c..976a24d 100644
--- a/grs/Netboot.py
+++ b/grs/Netboot.py
@@ -81,6 +81,7 @@ class Netboot(HashIt):
a kernel and initramfs is to drop the Kernel.py module altogether and
emerge genkernel in the fledgeling system via the script directive, set
genkernel.conf via the populate directive and then just run genkernel.
+ '''
# 2.5 Don't trust genkernel's busybox, but copy in our own version
# built in the system chroot. This ensures it will work on the
@@ -89,7 +90,6 @@ class Netboot(HashIt):
busybox_src = os.path.join(self.portage_configroot, 'bin/busybox')
busybox_dst = os.path.join(self.kernelroot, 'initramfs/bin/busybox')
shutil.copy(busybox_src, busybox_dst)
- '''
# 3. Make the squashfs image in the tmpdir directory.
squashfs_dir = os.path.join(initramfs_root, 'mnt/cdrom')
