Fix initramfs generation.

Fixes #259.
This commit is contained in:
Andrius Štikonas 2023-03-11 00:08:45 +00:00
parent ecdc428ac7
commit 3a130d4385
3 changed files with 4 additions and 27 deletions

View file

@ -51,7 +51,7 @@ src_compile() {
# Allow use of patched initramfs_list.sh (which is required anyway) # Allow use of patched initramfs_list.sh (which is required anyway)
make ARCH=i386 prepare make ARCH=i386 prepare
make ARCH=i386 PATH="${PWD}/usr:${PATH}" make ARCH=i386
# Clear up more space # Clear up more space
find . -name '*.o' -delete find . -name '*.o' -delete

View file

@ -21,29 +21,6 @@ SRCDIR="${srcdir}"
# shellcheck source=sysa/helpers.sh # shellcheck source=sysa/helpers.sh
. 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 # Ask some questions
echo echo
echo "Now that bash has been built, there are potentially some questions for you!" echo "Now that bash has been built, there are potentially some questions for you!"

View file

@ -20,7 +20,7 @@ create_sysb() {
sys_transfer /sysb_image /sysb gzip patch sys_transfer /sysb_image /sysb gzip patch
cp -rl /sysc /sysb_image/sysc_src cp -rl /sysc /sysb_image/sysc_src
echo "Creating sysb initramfs" 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 rm -rf /sysb /sysb_image # Cleanup
} }
@ -30,8 +30,8 @@ go_sysb() {
mount -t proc proc /proc mount -t proc proc /proc
# kexec time # kexec time
echo "Loading kernel + sysb initramfs using kexec" echo "Loading kernel + sysb initramfs using kexec"
kexec -l "${PREFIX}/boot/linux-4.9.10" --console-serial \ kexec -l "/boot/linux-4.9.10" --console-serial \
--initrd="${PREFIX}/boot/initramfs-sysb.cpio.gz" \ --initrd="/boot/initramfs-sysb.cpio.gz" \
--append="init=/init console=ttyS0" --append="init=/init console=ttyS0"
echo "kexecing into sysb" echo "kexecing into sysb"
kexec -e kexec -e