live-bootstrap

commit: 3a130d4385847eb70801554d76336c87f1de8893
parent ecdc428ac738a363a1a41d6e05e00441139c95fc
Author: Andrius Štikonas <andrius@stikonas.eu>
Date:   Sat, 11 Mar 2023 00:08:45 +0000

Fix initramfs generation.

Fixes #259.

Diffstat:
M
sysa/linux-4.9.10/linux-4.9.10.sh
2
+-
M
sysa/run.sh
23
-----------------------
M
sysa/run2.sh
6
+++---

3 files changed, 4 insertions(+), 27 deletions(-)
diff --git 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
@@ -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
@@ -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