diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2018-01-14 20:23:31 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2018-01-14 20:23:31 -0500 |
| commit | 07caf3e213b541c6e165e1d65d73640cb2deee10 (patch) | |
| tree | 15ded08eeb8773ac38a15b6fefde8343c1157f20 | |
| parent | grs/Kernel.py: utils to have same arch as kernel (diff) | |
| download | grss-07caf3e213b541c6e165e1d65d73640cb2deee10.tar.gz grss-07caf3e213b541c6e165e1d65d73640cb2deee10.tar.bz2 grss-07caf3e213b541c6e165e1d65d73640cb2deee10.zip | |
grs/Netboot.py: return to using busybox from system root
| -rw-r--r-- | grs/Kernel.py | 1 | ||||
| -rw-r--r-- | grs/Netboot.py | 2 |
2 files changed, 1 insertions, 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') |