[PATCH 0/2] Use expand-on-first-boot for RPi targets

[PATCH 0/2] Use expand-on-first-boot for RPi targets

[Uladzimir Bely]

This patchset enables the `expand-on-first-boot` recipe for RPi targets,
replacing currently used solution taken from official 'raspios' distro.

Uladzimir Bely (2):
  Revert "raspios: resize rootfs on first boot"
  Install expand-on-first-boot for RPi targets by default.

 meta-isar/conf/distro/raspios-configscript.sh | 23 +------------------
 meta-isar/conf/machine/rpi-common.conf        |  2 ++
 2 files changed, 3 insertions(+), 22 deletions(-)

-- 
2.20.1

[PATCH 1/2] Revert "raspios: resize rootfs on first boot"

[Uladzimir Bely]

This reverts commit fef55de879ddda56b8987c104792c447bb5244bb.

Stop using current raspios-like approach of rootfs resize in favour
of expand-on-first-boot recipe from Isar.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta-isar/conf/distro/raspios-configscript.sh | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/meta-isar/conf/distro/raspios-configscript.sh b/meta-isar/conf/distro/raspios-configscript.sh
index 9a7c43e6..6120a379 100644
--- a/meta-isar/conf/distro/raspios-configscript.sh
+++ b/meta-isar/conf/distro/raspios-configscript.sh
@@ -19,7 +19,7 @@ EOF
 cat > /boot/cmdline.txt << EOF
 console=${MACHINE_SERIAL},${BAUDRATE_TTY} console=tty1 \
 root=/dev/mmcblk0p2 rootfstype=ext4 fsck.repair=yes \
-rootwait quiet init=/usr/lib/raspi-config/init_resize.sh
+rootwait quiet
 EOF
 
 cat > /etc/fstab << EOF
@@ -27,24 +27,3 @@ proc            /proc           proc    defaults          0       0
 /dev/mmcblk0p1  /boot           vfat    defaults          0       2
 /dev/mmcblk0p2  /               ext4    defaults,noatime  0       1
 EOF
-
-cat > /etc/init.d/resize2fs_once << EOF
-#!/bin/sh
-. /lib/lsb/init-functions
-case "\$1" in
-  start)
-    log_daemon_msg "Starting resize2fs_once"
-    ROOT_DEV=\$(findmnt / -o source -n) &&
-    resize2fs \$ROOT_DEV &&
-    update-rc.d resize2fs_once remove &&
-    rm /etc/init.d/resize2fs_once &&
-    log_end_msg \$?
-    ;;
-  *)
-    echo "Usage: \$0 start" >&2
-    exit 3
-    ;;
-esac
-EOF
-chmod +x /etc/init.d/resize2fs_once
-ln -s ../init.d/resize2fs_once /etc/rc3.d/S01resize2fs_once
-- 
2.20.1

[PATCH 2/2] Install expand-on-first-boot for RPi targets by default.

[Uladzimir Bely]

The `expand-on-first-boot` recipe was not used by any distro in Isar.
So, it didn't even take part in CI builds. At the same time it is used
by downstreams.

Here we enable it by default for RPi targets thus including it to CI.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta-isar/conf/machine/rpi-common.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
index bb0b939c..ff73e092 100644
--- a/meta-isar/conf/machine/rpi-common.conf
+++ b/meta-isar/conf/machine/rpi-common.conf
@@ -20,3 +20,5 @@ IMAGE_PREINSTALL += " \
     raspi-config \
     systemd-sysv \
     "
+
+IMAGE_INSTALL += "expand-on-first-boot"
-- 
2.20.1

Re: [PATCH 0/2] Use expand-on-first-boot for RPi targets

[Anton Mikanovich]

08.02.2022 12:39, Uladzimir Bely wrote:
> This patchset enables the `expand-on-first-boot` recipe for RPi targets,
> replacing currently used solution taken from official 'raspios' distro.
>
> Uladzimir Bely (2):
>    Revert "raspios: resize rootfs on first boot"
>    Install expand-on-first-boot for RPi targets by default.
>
>   meta-isar/conf/distro/raspios-configscript.sh | 23 +------------------
>   meta-isar/conf/machine/rpi-common.conf        |  2 ++
>   2 files changed, 3 insertions(+), 22 deletions(-)

Applied to next, thanks.