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

Fix Docker image build by avoiding loop devices and installing udev

Browse Source 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-12-29 19:39:56 +00:00
parent e2a3a2a862
commit dfa5b2f414
3 changed files with 232 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
scripts/docker-image-create-uefi-old.sh Executable file
View File

@@ -0,0 +1,156 @@
#!/bin/bash
# Create UEFI-bootable SparkOS image with GPT partition table
set -e
mkdir -p /output /staging/esp /staging/root
echo "=== Creating UEFI-bootable SparkOS image with GRUB ==="
# Create 1GB disk image (larger for kernel + bootloader)
dd if=/dev/zero of=/output/sparkos.img bs=1M count=1024
# Create GPT partition table
echo "Creating GPT partition table..."
parted -s /output/sparkos.img mklabel gpt
# Create EFI System Partition (ESP) - 200MB, FAT32
echo "Creating EFI System Partition..."
parted -s /output/sparkos.img mkpart ESP fat32 1MiB 201MiB
parted -s /output/sparkos.img set 1 esp on
# Create root partition - remaining space, ext4
echo "Creating root partition..."
parted -s /output/sparkos.img mkpart primary ext4 201MiB 100%
# Use libguestfs to format and populate partitions without loop devices
echo "Formatting partitions using guestfish..."
guestfish -a /output/sparkos.img <<'EOF'
run
mkfs vfat /dev/sda1 label:SPARKOSEFI
mkfs ext4 /dev/sda2 label:SparkOS
mount /dev/sda2 /
mkdir-p /boot
EOF
# Prepare ESP contents
echo "Preparing ESP contents..."
# Prepare ESP contents
echo "Preparing ESP contents..."
mkdir -p /staging/esp/EFI/BOOT
mkdir -p /staging/esp/boot/grub
# Create GRUB EFI binary using grub-mkstandalone
grub-mkstandalone \
--format=x86_64-efi \
--output=/staging/esp/EFI/BOOT/BOOTX64.EFI \
--locales="" \
--fonts="" \
"boot/grub/grub.cfg=/dev/null"
# Find the kernel
KERNEL_PATH=$(find /kernel/boot -name "vmlinuz-*" | head -1)
KERNEL_VERSION=$(basename $KERNEL_PATH | sed 's/vmlinuz-//')
INITRD_PATH=$(find /kernel/boot -name "initrd.img-*" | head -1)
# Copy kernel and initrd to staging
echo "Copying kernel to staging..."
cp $KERNEL_PATH /staging/esp/boot/vmlinuz
if [ -f "$INITRD_PATH" ]; then cp $INITRD_PATH /staging/esp/boot/initrd.img; fi
# Create GRUB configuration
printf '%s\n' \
'set timeout=3' \
'set default=0' \
'' \
'menuentry "SparkOS" {' \
' linux /boot/vmlinuz root=LABEL=SparkOS rw init=/sbin/init console=tty1 quiet' \
'}' \
> /staging/esp/boot/grub/grub.cfg
# Prepare root filesystem contents
echo "Preparing root filesystem..."
mkdir -p /staging/root/{bin,sbin,etc,proc,sys,dev,tmp,usr/{bin,sbin,lib,lib64},var/{log,run},root,home/spark,boot}
# Install SparkOS init
cp /build/init /staging/root/sbin/init
chmod 755 /staging/root/sbin/init
# Install busybox
echo "Installing busybox..."
cp /bin/busybox /staging/root/bin/busybox
chmod 755 /staging/root/bin/busybox
# Create busybox symlinks for essential commands
for cmd in sh ls cat echo mount umount mkdir rm cp mv chmod chown ln ps kill; do
ln -sf busybox /staging/root/bin/$cmd
done
# Create system configuration files
echo "sparkos" > /staging/root/etc/hostname
echo "127.0.0.1 localhost" > /staging/root/etc/hosts
echo "127.0.1.1 sparkos" >> /staging/root/etc/hosts
echo "root:x:0:0:root:/root:/bin/sh" > /staging/root/etc/passwd
echo "spark:x:1000:1000:SparkOS User:/home/spark:/bin/sh" >> /staging/root/etc/passwd
echo "root:x:0:" > /staging/root/etc/group
echo "spark:x:1000:" >> /staging/root/etc/group
# Copy README to root partition
cp /build/config/image-readme.txt /staging/root/README.txt
# Copy ESP contents to the image
echo "Populating EFI System Partition..."
guestfish -a /output/sparkos.img <<'EOF'
run
mount /dev/sda1 /
mkdir-p /EFI
mkdir-p /EFI/BOOT
mkdir-p /boot
mkdir-p /boot/grub
EOF
# Copy files using guestfish
echo "Copying bootloader files..."
guestfish -a /output/sparkos.img -m /dev/sda1 <<EOF
copy-in /staging/esp/EFI/BOOT/BOOTX64.EFI /EFI/BOOT/
copy-in /staging/esp/boot/vmlinuz /boot/
EOF
if [ -f "/staging/esp/boot/initrd.img" ]; then
guestfish -a /output/sparkos.img -m /dev/sda1 copy-in /staging/esp/boot/initrd.img /boot/
fi
guestfish -a /output/sparkos.img -m /dev/sda1 <<EOF
copy-in /staging/esp/boot/grub/grub.cfg /boot/grub/
EOF
# Copy root filesystem contents to the image
echo "Populating root filesystem..."
guestfish -a /output/sparkos.img -m /dev/sda2 <<'EOF'
copy-in /staging/root/bin /
copy-in /staging/root/sbin /
copy-in /staging/root/etc /
copy-in /staging/root/usr /
copy-in /staging/root/var /
copy-in /staging/root/root /
copy-in /staging/root/home /
copy-in /staging/root/README.txt /
mkdir-p /proc
mkdir-p /sys
mkdir-p /dev
mkdir-p /tmp
mkdir-p /boot
chmod 0755 /tmp
chmod 0755 /sbin/init
chmod 0755 /bin/busybox
EOF
# Finalize
echo "Finalizing image..."
sync
# Compress the image
echo "Compressing image..."
gzip -9 /output/sparkos.img
echo "UEFI-bootable image created: /output/sparkos.img.gz"

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

@@ -1,55 +1,22 @@
#!/bin/bash #!/bin/bash
# Create UEFI-bootable SparkOS image with GPT partition table # Create UEFI-bootable SparkOS image with GPT partition table
# This version uses mtools and mke2fs to avoid needing loop devices
set -e set -e
mkdir -p /output /mnt/esp /mnt/root mkdir -p /output /staging/esp /staging/root
echo "=== Creating UEFI-bootable SparkOS image with GRUB ===" echo "=== Creating UEFI-bootable SparkOS image with GRUB ==="
# Create 1GB disk image (larger for kernel + bootloader) # Prepare ESP contents first
dd if=/dev/zero of=/output/sparkos.img bs=1M count=1024 echo "Preparing ESP contents..."
mkdir -p /staging/esp/EFI/BOOT
# Create GPT partition table mkdir -p /staging/esp/boot/grub
echo "Creating GPT partition table..."
parted -s /output/sparkos.img mklabel gpt
# Create EFI System Partition (ESP) - 200MB, FAT32
echo "Creating EFI System Partition..."
parted -s /output/sparkos.img mkpart ESP fat32 1MiB 201MiB
parted -s /output/sparkos.img set 1 esp on
# Create root partition - remaining space, ext4
echo "Creating root partition..."
parted -s /output/sparkos.img mkpart primary ext4 201MiB 100%
# Set up loop device for the image
LOOP_DEV=$(losetup -f)
losetup -P $LOOP_DEV /output/sparkos.img
# Wait for partition devices
sleep 1
# Format partitions
echo "Formatting EFI System Partition (FAT32)..."
mkfs.vfat -F 32 -n "SPARKOSEFI" ${LOOP_DEV}p1
echo "Formatting root partition (ext4)..."
mkfs.ext4 -L "SparkOS" ${LOOP_DEV}p2
# Mount ESP
echo "Mounting partitions..."
mount ${LOOP_DEV}p1 /mnt/esp
mount ${LOOP_DEV}p2 /mnt/root
# Install GRUB to ESP
echo "Installing GRUB bootloader..."
mkdir -p /mnt/esp/EFI/BOOT
# Create GRUB EFI binary using grub-mkstandalone # Create GRUB EFI binary using grub-mkstandalone
grub-mkstandalone \ grub-mkstandalone \
--format=x86_64-efi \ --format=x86_64-efi \
--output=/mnt/esp/EFI/BOOT/BOOTX64.EFI \ --output=/staging/esp/EFI/BOOT/BOOTX64.EFI \
--locales="" \ --locales="" \
--fonts="" \ --fonts="" \
"boot/grub/grub.cfg=/dev/null" "boot/grub/grub.cfg=/dev/null"
@@ -59,14 +26,12 @@ KERNEL_PATH=$(find /kernel/boot -name "vmlinuz-*" | head -1)
KERNEL_VERSION=$(basename $KERNEL_PATH | sed 's/vmlinuz-//') KERNEL_VERSION=$(basename $KERNEL_PATH | sed 's/vmlinuz-//')
INITRD_PATH=$(find /kernel/boot -name "initrd.img-*" | head -1) INITRD_PATH=$(find /kernel/boot -name "initrd.img-*" | head -1)
# Copy kernel and initrd to ESP # Copy kernel and initrd to staging
echo "Installing kernel..." echo "Copying kernel to staging..."
mkdir -p /mnt/esp/boot cp $KERNEL_PATH /staging/esp/boot/vmlinuz
cp $KERNEL_PATH /mnt/esp/boot/vmlinuz if [ -f "$INITRD_PATH" ]; then cp $INITRD_PATH /staging/esp/boot/initrd.img; fi
if [ -f "$INITRD_PATH" ]; then cp $INITRD_PATH /mnt/esp/boot/initrd.img; fi
# Create GRUB configuration # Create GRUB configuration
mkdir -p /mnt/esp/boot/grub
printf '%s\n' \ printf '%s\n' \
'set timeout=3' \ 'set timeout=3' \
'set default=0' \ 'set default=0' \
@@ -74,44 +39,86 @@ 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' \
'}' \ '}' \
> /mnt/esp/boot/grub/grub.cfg > /staging/esp/boot/grub/grub.cfg
# Set up root filesystem # Prepare root filesystem contents
echo "Setting up root filesystem..." echo "Preparing root filesystem..."
mkdir -p /mnt/root/{bin,sbin,etc,proc,sys,dev,tmp,usr/{bin,sbin,lib,lib64},var/{log,run},root,home/spark,boot} mkdir -p /staging/root/{bin,sbin,etc,proc,sys,dev,tmp,usr/{bin,sbin,lib,lib64},var/{log,run},root,home/spark,boot}
# Install SparkOS init # Install SparkOS init
cp /build/init /mnt/root/sbin/init cp /build/init /staging/root/sbin/init
chmod 755 /mnt/root/sbin/init chmod 755 /staging/root/sbin/init
# Install busybox # Install busybox
echo "Installing busybox..." echo "Installing busybox..."
cp /bin/busybox /mnt/root/bin/busybox cp /bin/busybox /staging/root/bin/busybox
chmod 755 /mnt/root/bin/busybox chmod 755 /staging/root/bin/busybox
# Create busybox symlinks for essential commands # Create busybox symlinks for essential commands
for cmd in sh ls cat echo mount umount mkdir rm cp mv chmod chown ln ps kill; do for cmd in sh ls cat echo mount umount mkdir rm cp mv chmod chown ln ps kill; do
ln -sf busybox /mnt/root/bin/$cmd ln -sf busybox /staging/root/bin/$cmd
done done
# Create system configuration files # Create system configuration files
echo "sparkos" > /mnt/root/etc/hostname echo "sparkos" > /staging/root/etc/hostname
echo "127.0.0.1 localhost" > /mnt/root/etc/hosts echo "127.0.0.1 localhost" > /staging/root/etc/hosts
echo "127.0.1.1 sparkos" >> /mnt/root/etc/hosts echo "127.0.1.1 sparkos" >> /staging/root/etc/hosts
echo "root:x:0:0:root:/root:/bin/sh" > /mnt/root/etc/passwd echo "root:x:0:0:root:/root:/bin/sh" > /staging/root/etc/passwd
echo "spark:x:1000:1000:SparkOS User:/home/spark:/bin/sh" >> /mnt/root/etc/passwd echo "spark:x:1000:1000:SparkOS User:/home/spark:/bin/sh" >> /staging/root/etc/passwd
echo "root:x:0:" > /mnt/root/etc/group echo "root:x:0:" > /staging/root/etc/group
echo "spark:x:1000:" >> /mnt/root/etc/group echo "spark:x:1000:" >> /staging/root/etc/group
# Copy README to root partition # Copy README to root partition
cp /build/config/image-readme.txt /mnt/root/README.txt cp /build/config/image-readme.txt /staging/root/README.txt
# Sync and unmount # Create 1GB disk image
echo "Creating disk image..."
dd if=/dev/zero of=/output/sparkos.img bs=1M count=1024
# Create GPT partition table using sgdisk
echo "Creating GPT partition table..."
sgdisk -Z /output/sparkos.img 2>/dev/null || true
sgdisk -n 1:2048:411647 -t 1:ef00 -c 1:"EFI System" /output/sparkos.img
sgdisk -n 2:411648:0 -t 2:8300 -c 2:"Linux filesystem" /output/sparkos.img
# Extract partition regions using dd
echo "Extracting partition regions..."
dd if=/output/sparkos.img of=/tmp/esp.img bs=512 skip=2048 count=409600 2>/dev/null
dd if=/output/sparkos.img of=/tmp/root.img bs=512 skip=411648 2>/dev/null
# Format ESP partition (FAT32)
echo "Formatting EFI System Partition (FAT32)..."
mkfs.vfat -F 32 -n "SPARKOSEFI" /tmp/esp.img >/dev/null
# Populate ESP using mtools (no mount needed!)
echo "Populating ESP with bootloader and kernel..."
export MTOOLS_SKIP_CHECK=1
mmd -i /tmp/esp.img ::/EFI
mmd -i /tmp/esp.img ::/EFI/BOOT
mmd -i /tmp/esp.img ::/boot
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/boot/vmlinuz ::/boot/
if [ -f "/staging/esp/boot/initrd.img" ]; then
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/
# Format root partition (ext4) with directory contents (no mount needed!)
echo "Formatting root partition (ext4) and populating..."
mke2fs -t ext4 -L "SparkOS" -d /staging/root /tmp/root.img >/dev/null 2>&1
# Write partitions back to image
echo "Writing partitions to image..."
dd if=/tmp/esp.img of=/output/sparkos.img bs=512 seek=2048 count=409600 conv=notrunc 2>/dev/null
dd if=/tmp/root.img of=/output/sparkos.img bs=512 seek=411648 conv=notrunc 2>/dev/null
# Clean up temporary files
rm -f /tmp/esp.img /tmp/root.img
# Finalize
echo "Finalizing image..." echo "Finalizing image..."
sync sync
umount /mnt/esp
umount /mnt/root
losetup -d $LOOP_DEV
# Compress the image # Compress the image
echo "Compressing image..." echo "Compressing image..."

3
scripts/docker-image-install-tools.sh
View File

@@ -16,5 +16,6 @@ apt-get install -y \
grub-common \ grub-common \
wget \ wget \
busybox-static \ busybox-static \
kmod kmod \
udev
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*