git/SparkOS
1
0
Fork 0
mirror of https://github.com/johndoe6345789/SparkOS.git synced 2026-04-24 13:34:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure initrd is required and always copied during image build

Browse Source 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-02 00:45:35 +00:00
parent 5605feabff
commit 3db98e9a33
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/docker-image-create-uefi-old.sh
View File

@@ -57,7 +57,15 @@ INITRD_PATH=$(find /kernel/boot -name "initrd.img-*" | head -1)
# Copy kernel and initrd to staging # Copy kernel and initrd to staging
echo "Copying kernel to staging..." echo "Copying kernel to staging..."
cp $KERNEL_PATH /staging/esp/boot/vmlinuz cp $KERNEL_PATH /staging/esp/boot/vmlinuz
if [ -f "$INITRD_PATH" ]; then cp $INITRD_PATH /staging/esp/boot/initrd.img; fi
# Ensure initrd exists (required for booting)
if [ ! -f "$INITRD_PATH" ]; then
echo "ERROR: initrd not found. The kernel requires an initrd to boot."
echo "Expected to find: initrd.img-* in /kernel/boot/"
exit 1
fi
echo "Copying initrd to staging..."
cp $INITRD_PATH /staging/esp/boot/initrd.img
# Create GRUB configuration # Create GRUB configuration
printf '%s\n' \ printf '%s\n' \
@@ -66,6 +74,7 @@ printf '%s\n' \
'' \ '' \
'menuentry "SparkOS" {' \ 'menuentry "SparkOS" {' \
' linux /boot/vmlinuz root=LABEL=SparkOS rw init=/sbin/init console=tty1 quiet' \ ' linux /boot/vmlinuz root=LABEL=SparkOS rw init=/sbin/init console=tty1 quiet' \
' initrd /boot/initrd.img' \
'}' \ '}' \
> /staging/esp/boot/grub/grub.cfg > /staging/esp/boot/grub/grub.cfg

14
scripts/docker-image-create-uefi.sh
View File

@@ -40,7 +40,15 @@ INITRD_PATH=$(find /kernel/boot -name "initrd.img-*" | head -1)
# Copy kernel and initrd to staging # Copy kernel and initrd to staging
echo "Copying kernel to staging..." echo "Copying kernel to staging..."
cp $KERNEL_PATH /staging/esp/boot/vmlinuz cp $KERNEL_PATH /staging/esp/boot/vmlinuz
if [ -f "$INITRD_PATH" ]; then cp $INITRD_PATH /staging/esp/boot/initrd.img; fi
# Ensure initrd exists (required for booting)
if [ ! -f "$INITRD_PATH" ]; then
echo "ERROR: initrd not found. The kernel requires an initrd to boot."
echo "Expected to find: initrd.img-* in /kernel/boot/"
exit 1
fi
echo "Copying initrd to staging..."
cp $INITRD_PATH /staging/esp/boot/initrd.img
# Create GRUB configuration from template # Create GRUB configuration from template
sed "s/@ROOT_LABEL@/$ROOT_LABEL/g" /build/config/grub.cfg.in > /staging/esp/boot/grub/grub.cfg sed "s/@ROOT_LABEL@/$ROOT_LABEL/g" /build/config/grub.cfg.in > /staging/esp/boot/grub/grub.cfg
@@ -110,9 +118,7 @@ mmd -i /tmp/esp.img ::/boot
mmd -i /tmp/esp.img ::/boot/grub mmd -i /tmp/esp.img ::/boot/grub
mcopy -i /tmp/esp.img /staging/esp/EFI/BOOT/BOOTX64.EFI ::/EFI/BOOT/ mcopy -i /tmp/esp.img /staging/esp/EFI/BOOT/BOOTX64.EFI ::/EFI/BOOT/
mcopy -i /tmp/esp.img /staging/esp/boot/vmlinuz ::/boot/ mcopy -i /tmp/esp.img /staging/esp/boot/vmlinuz ::/boot/
if [ -f "/staging/esp/boot/initrd.img" ]; then mcopy -i /tmp/esp.img /staging/esp/boot/initrd.img ::/boot/
mcopy -i /tmp/esp.img /staging/esp/boot/initrd.img ::/boot/
fi
mcopy -i /tmp/esp.img /staging/esp/boot/grub/grub.cfg ::/boot/grub/ mcopy -i /tmp/esp.img /staging/esp/boot/grub/grub.cfg ::/boot/grub/
# Format root partition (ext4) with directory contents (no mount needed!) # Format root partition (ext4) with directory contents (no mount needed!)