X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;ds=sidebyside;f=mkit.sh;h=437a5f40e087c20e9e50ee99fce3899686ed6481;hb=22c4d3b601c68d1f6aaa6e256d3c520720f83843;hp=710a123ccde82e2fd7bb8e9efc78475f4aeceffc;hpb=4cacdc777c1fa8f8ddae16f3f100de6a3829cab7;p=rrq%2Ftiniest.git

diff --git a/mkit.sh b/mkit.sh
index 710a123..437a5f4 100755
--- a/mkit.sh
+++ b/mkit.sh
@@ -62,7 +62,7 @@ echo $KERNEL
 # later pivoting onto a "full" filesystem.
 
 echo "# Create initrd filesystem"
-rm -r initrd
+rm -fr initrd
 
 echo "# Install busybox, and fluff it up"
 fakechroot fakeroot \
@@ -87,6 +87,7 @@ if [ ! -d kernel ] ; then
     debextract kernel $(debfile syslinux-common)
     debextract kernel $(debfile syslinux-efi)
     debextract kernel $(debfile syslinux-utils)
+    debextract kernel $(debfile isolinux)
 fi
 
 echo "# Include some kernel modules in the initrd"
@@ -94,7 +95,11 @@ MODULES=(
     # disk
     scsi_common scsi_mod libata ata_piix ata_generic cdrom sr_mod
     crc32-pclmul crct10dif_common crc-t10dif crc64 crc64-rocksoft
-    t10-pi sd_mod sg nls_cp437 nls_ascii fat vfat ext4 isofs
+    t10-pi sd_mod sg
+    nls_cp437 nls_ascii fat vfat
+    crc32c_generic jbd2 mbcache crc16 ext4
+    isofs
+    overlay
     # input
     psmouse evdev
     # network
@@ -159,7 +164,7 @@ IMG="-i bootimage.raw@@$((2048*512))"
 
 # Add an ext2 filesystem at offset 61440*512
 # Copy initrd.gz and kernel into the fat filesystem root
-mke2fs -E offset=$((61440*512)) -F bootimage.raw
+mke2fs -t ext4 -E offset=$((34816*512)) -F bootimage.raw
 
 mcopy $IMG initrd.gz ::
 mcopy $IMG kernel/boot/vm* ::/vmlinuz