rpi: Write full rootfs size.

brocaar · brocaar · commit fc68ff09e73e · 2025-09-09T10:44:34.000+01:00
This writes the full rootfs partition, instead of only the part containing data. This avoids that OpenWrt might incorrectly detects the loopback device containing the overlayfs and then fails to mount it. Fixes #139.
diff --git a/conf/base_raspberrypi_bcm27xx_bcm2708/patches/image-with-full-rootfs.patch b/conf/base_raspberrypi_bcm27xx_bcm2708/patches/image-with-full-rootfs.patch
@@ -0,0 +1,13 @@
+Index: openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+===================================================================
+--- openwrt.orig/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
++++ openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+@@ -23,6 +23,8 @@ set $(ptgen -o $OUTPUT -h $head -s $sect
+ 
+ BOOTOFFSET="$(($1 / 512))"
+ ROOTFSOFFSET="$(($3 / 512))"
++ROOTFSSIZE="$(($4 / 512))"
+ 
+ dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
++dd bs=512 if=/dev/zero of="$OUTPUT" seek="$((ROOTFSOFFSET+ROOTFSSIZE-1))" count=1 conv=notrunc
+ dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/conf/base_raspberrypi_bcm27xx_bcm2708/patches/series b/conf/base_raspberrypi_bcm27xx_bcm2708/patches/series
@@ -1,2 +1,3 @@
 no-uart-console.patch
 boot-config.patch
+image-with-full-rootfs.patch
diff --git a/conf/base_raspberrypi_bcm27xx_bcm2709/patches/image-with-full-rootfs.patch b/conf/base_raspberrypi_bcm27xx_bcm2709/patches/image-with-full-rootfs.patch
@@ -0,0 +1,13 @@
+Index: openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+===================================================================
+--- openwrt.orig/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
++++ openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+@@ -23,6 +23,8 @@ set $(ptgen -o $OUTPUT -h $head -s $sect
+ 
+ BOOTOFFSET="$(($1 / 512))"
+ ROOTFSOFFSET="$(($3 / 512))"
++ROOTFSSIZE="$(($4 / 512))"
+ 
+ dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
++dd bs=512 if=/dev/zero of="$OUTPUT" seek="$((ROOTFSOFFSET+ROOTFSSIZE-1))" count=1 conv=notrunc
+ dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/conf/base_raspberrypi_bcm27xx_bcm2709/patches/series b/conf/base_raspberrypi_bcm27xx_bcm2709/patches/series
@@ -1,2 +1,3 @@
 no-uart-console.patch
 boot-config.patch
+image-with-full-rootfs.patch
diff --git a/conf/base_raspberrypi_bcm27xx_bcm2712/patches/image-with-full-rootfs.patch b/conf/base_raspberrypi_bcm27xx_bcm2712/patches/image-with-full-rootfs.patch
@@ -0,0 +1,13 @@
+Index: openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+===================================================================
+--- openwrt.orig/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
++++ openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+@@ -23,6 +23,8 @@ set $(ptgen -o $OUTPUT -h $head -s $sect
+ 
+ BOOTOFFSET="$(($1 / 512))"
+ ROOTFSOFFSET="$(($3 / 512))"
++ROOTFSSIZE="$(($4 / 512))"
+ 
+ dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
++dd bs=512 if=/dev/zero of="$OUTPUT" seek="$((ROOTFSOFFSET+ROOTFSSIZE-1))" count=1 conv=notrunc
+ dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/conf/base_raspberrypi_bcm27xx_bcm2712/patches/series b/conf/base_raspberrypi_bcm27xx_bcm2712/patches/series
@@ -1,3 +1,4 @@
 no-uart-console.patch
 boot-config.patch
 add_designware_spi_kmod.patch
+image-with-full-rootfs.patch
diff --git a/conf/full_raspberrypi_bcm27xx_bcm2708/patches/image-with-full-rootfs.patch b/conf/full_raspberrypi_bcm27xx_bcm2708/patches/image-with-full-rootfs.patch
@@ -0,0 +1,13 @@
+Index: openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+===================================================================
+--- openwrt.orig/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
++++ openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+@@ -23,6 +23,8 @@ set $(ptgen -o $OUTPUT -h $head -s $sect
+ 
+ BOOTOFFSET="$(($1 / 512))"
+ ROOTFSOFFSET="$(($3 / 512))"
++ROOTFSSIZE="$(($4 / 512))"
+ 
+ dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
++dd bs=512 if=/dev/zero of="$OUTPUT" seek="$((ROOTFSOFFSET+ROOTFSSIZE-1))" count=1 conv=notrunc
+ dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/conf/full_raspberrypi_bcm27xx_bcm2708/patches/series b/conf/full_raspberrypi_bcm27xx_bcm2708/patches/series
@@ -1,2 +1,3 @@
 no-uart-console.patch
 boot-config.patch
+image-with-full-rootfs.patch
diff --git a/conf/full_raspberrypi_bcm27xx_bcm2709/patches/image-with-full-rootfs.patch b/conf/full_raspberrypi_bcm27xx_bcm2709/patches/image-with-full-rootfs.patch
@@ -0,0 +1,22 @@
+Index: openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+===================================================================
+--- openwrt.orig/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
++++ openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+@@ -7,6 +7,8 @@ if [ $# -ne 5 ]; then
+     exit 1
+ fi
+ 
++exit 1
++
+ OUTPUT="$1"
+ BOOTFS="$2"
+ ROOTFS="$3"
+@@ -23,6 +25,8 @@ set $(ptgen -o $OUTPUT -h $head -s $sect
+ 
+ BOOTOFFSET="$(($1 / 512))"
+ ROOTFSOFFSET="$(($3 / 512))"
++ROOTFSSIZE="$(($4 / 512))"
+ 
+ dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
++dd bs=512 if=/dev/zero of="$OUTPUT" seek="$((ROOTFSOFFSET+ROOTFSSIZE-1))" count=1 conv=notrunc
+ dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/conf/full_raspberrypi_bcm27xx_bcm2709/patches/series b/conf/full_raspberrypi_bcm27xx_bcm2709/patches/series
@@ -1,2 +1,3 @@
 no-uart-console.patch
 boot-config.patch
+image-with-full-rootfs.patch
diff --git a/conf/full_raspberrypi_bcm27xx_bcm2712/patches/image-with-full-rootfs.patch b/conf/full_raspberrypi_bcm27xx_bcm2712/patches/image-with-full-rootfs.patch
@@ -0,0 +1,13 @@
+Index: openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+===================================================================
+--- openwrt.orig/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
++++ openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+@@ -23,6 +23,8 @@ set $(ptgen -o $OUTPUT -h $head -s $sect
+ 
+ BOOTOFFSET="$(($1 / 512))"
+ ROOTFSOFFSET="$(($3 / 512))"
++ROOTFSSIZE="$(($4 / 512))"
+ 
+ dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
++dd bs=512 if=/dev/zero of="$OUTPUT" seek="$((ROOTFSOFFSET+ROOTFSSIZE-1))" count=1 conv=notrunc
+ dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/conf/full_raspberrypi_bcm27xx_bcm2712/patches/series b/conf/full_raspberrypi_bcm27xx_bcm2712/patches/series
@@ -1,3 +1,4 @@
 no-uart-console.patch
 boot-config.patch
 add_designware_spi_kmod.patch
+image-with-full-rootfs.patch
diff --git a/conf/rak_rak7391/patches/image-with-full-rootfs.patch b/conf/rak_rak7391/patches/image-with-full-rootfs.patch
@@ -0,0 +1,13 @@
+Index: openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+===================================================================
+--- openwrt.orig/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
++++ openwrt/target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh
+@@ -23,6 +23,8 @@ set $(ptgen -o $OUTPUT -h $head -s $sect
+ 
+ BOOTOFFSET="$(($1 / 512))"
+ ROOTFSOFFSET="$(($3 / 512))"
++ROOTFSSIZE="$(($4 / 512))"
+ 
+ dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
++dd bs=512 if=/dev/zero of="$OUTPUT" seek="$((ROOTFSOFFSET+ROOTFSSIZE-1))" count=1 conv=notrunc
+ dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
diff --git a/conf/rak_rak7391/patches/series b/conf/rak_rak7391/patches/series
@@ -1,2 +1,3 @@
 no-uart-console.patch
 boot-config.patch
+image-with-full-rootfs.patch

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`no-uart-console.patch`
`2`	`2`	`boot-config.patch`
	`3`	`+image-with-full-rootfs.patch`