diff --git a/sysa/linux-4.9.10/linux-4.9.10.sh b/sysa/linux-4.9.10/linux-4.9.10.sh index 94bc9258..09e72d9e 100644 --- a/sysa/linux-4.9.10/linux-4.9.10.sh +++ b/sysa/linux-4.9.10/linux-4.9.10.sh @@ -51,7 +51,7 @@ src_compile() { # Allow use of patched initramfs_list.sh (which is required anyway) make ARCH=i386 prepare - make ARCH=i386 + PATH="${PWD}/usr:${PATH}" make ARCH=i386 # Clear up more space find . -name '*.o' -delete diff --git a/sysa/run.sh b/sysa/run.sh index a2be81f1..75a14d20 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -21,29 +21,6 @@ SRCDIR="${srcdir}" # shellcheck source=sysa/helpers.sh . helpers.sh -create_sysb() { - # Copy everything in - echo "Creating sysb rootfs" - sys_transfer /sysb_image /sysb gzip patch - cp -rl /sysc /sysb_image/sysc_src - echo "Creating sysb initramfs" - gen_initramfs_list.sh -o "/boot/initramfs-sysb.cpio.gz" /sysb_image - rm -rf /sysb /sysb_image # Cleanup -} - -go_sysb() { - # Mount proc for kexec - mkdir /proc /etc - mount -t proc proc /proc - # kexec time - echo "Loading kernel + sysb initramfs using kexec" - kexec -l "/boot/linux-4.9.10" --console-serial \ - --initrd="/boot/initramfs-sysb.cpio.gz" \ - --append="init=/init console=ttyS0" - echo "kexecing into sysb" - kexec -e -} - # Ask some questions echo echo "Now that bash has been built, there are potentially some questions for you!" diff --git a/sysa/run2.sh b/sysa/run2.sh index bcf079a2..74d54b38 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -20,7 +20,7 @@ create_sysb() { sys_transfer /sysb_image /sysb gzip patch cp -rl /sysc /sysb_image/sysc_src echo "Creating sysb initramfs" - gen_initramfs_list.sh -o "${PREFIX}/boot/initramfs-sysb.cpio.gz" /sysb_image + gen_initramfs_list.sh -o "/boot/initramfs-sysb.cpio.gz" /sysb_image rm -rf /sysb /sysb_image # Cleanup } @@ -30,8 +30,8 @@ go_sysb() { mount -t proc proc /proc # kexec time echo "Loading kernel + sysb initramfs using kexec" - kexec -l "${PREFIX}/boot/linux-4.9.10" --console-serial \ - --initrd="${PREFIX}/boot/initramfs-sysb.cpio.gz" \ + kexec -l "/boot/linux-4.9.10" --console-serial \ + --initrd="/boot/initramfs-sysb.cpio.gz" \ --append="init=/init console=ttyS0" echo "kexecing into sysb" kexec -e