From f0f91453e0e65af0ce3cf5467642929317330d51 Mon Sep 17 00:00:00 2001 From: XECDesign Date: Fri, 5 Sep 2025 12:25:40 +0100 Subject: [PATCH 1/7] Add missing dependency to README and switch from apt-get to apt Fixes #869 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71e5325..a4e361b 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ below. To install the required dependencies for `pi-gen` you should run: ```bash -apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \ +apt install coreutils quilt parted qemu-user-static debootstrap zerofree zip \ dosfstools e2fsprogs libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc \ -gpg pigz xxd arch-test bmap-tools +gpg pigz xxd arch-test bmap-tools kmod ``` The file `depends` contains a list of tools needed. The format of this From 3bfeac64245f249f75e80dd596279165ea558755 Mon Sep 17 00:00:00 2001 From: XECDesign Date: Fri, 5 Sep 2025 12:28:59 +0100 Subject: [PATCH 2/7] stage0: Change 'Arch' to 'Architectures' in raspbian.sources Fixes #867 --- stage0/00-configure-apt/files/raspbian.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage0/00-configure-apt/files/raspbian.sources b/stage0/00-configure-apt/files/raspbian.sources index 0f2e26f..5947190 100644 --- a/stage0/00-configure-apt/files/raspbian.sources +++ b/stage0/00-configure-apt/files/raspbian.sources @@ -1,6 +1,6 @@ Types: deb URIs: http://raspbian.raspberrypi.com/raspbian/ -Arch: armhf +Architectures: armhf Suites: RELEASE Components: main contrib non-free rpi Signed-By: /usr/share/keyrings/raspbian-archive-keyring.gpg From c3848a3a37464e3cf484349f67b558fbedb97230 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 3 Sep 2025 20:51:10 +0100 Subject: [PATCH 3/7] README.md: mention first run wizard in FIRST_USER_NAME documentation --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a4e361b..4f7002e 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,8 @@ The following environment variables are supported: a name chosen by the final user. This security feature is designed to prevent shipping images with a default username and help prevent malicious actors from taking over your devices. + If the FIRST_USER_NAME is set to `pi` and no `FIRST_USER_PASS` is set, the setup wizard will be launched on first boot to allow the user to set the password. + * `FIRST_USER_PASS` (Default: unset) Password for the first user. If unset, the account is locked. From 05071a97eaf515e57a694206608346b30fdf236b Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 3 Sep 2025 20:53:07 +0100 Subject: [PATCH 4/7] build.sh: log skipped non-executable run.sh files --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index 23f9585..98cece8 100755 --- a/build.sh +++ b/build.sh @@ -68,6 +68,8 @@ EOF log "Begin ${SUB_STAGE_DIR}/${i}-run.sh" ./${i}-run.sh log "End ${SUB_STAGE_DIR}/${i}-run.sh" + elif [ -f ${i}-run.sh ]; then + log "Skip ${SUB_STAGE_DIR}/${i}-run.sh (not executable)" fi if [ -f ${i}-run-chroot.sh ]; then log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot.sh" From 7f6d20cae166e21e7a9d158e773ffb7e087d943e Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Wed, 3 Sep 2025 20:53:37 +0100 Subject: [PATCH 5/7] Whitespace fixes --- stage1/01-sys-tweaks/00-run.sh | 2 -- stage2/01-sys-tweaks/01-run.sh | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index e024701..b7e5b5e 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/stage1/01-sys-tweaks/00-run.sh @@ -12,5 +12,3 @@ if [ -n "${FIRST_USER_PASS}" ]; then fi echo "root:root" | chpasswd EOF - - diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 93bc36d..be0e8cd 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -30,6 +30,7 @@ on_chroot < Date: Thu, 4 Sep 2025 19:11:34 +0100 Subject: [PATCH 6/7] stage4: Disable wayvnc --- stage4/01-disable-wayvnc/00-run.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 stage4/01-disable-wayvnc/00-run.sh diff --git a/stage4/01-disable-wayvnc/00-run.sh b/stage4/01-disable-wayvnc/00-run.sh new file mode 100755 index 0000000..059efca --- /dev/null +++ b/stage4/01-disable-wayvnc/00-run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -e + +on_chroot <<- EOF + SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_vnc 1 +EOF From 734e1a634912d73d31f407b3668ed00e5f2e7609 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 5 Sep 2025 13:56:59 +0100 Subject: [PATCH 7/7] Revert "stage5: Remove scratch3, since it wasn't provided for Trixie" This reverts commit d4cd8f9a57bc6afda5077a3f4b1778f81edd5e02. --- stage5/00-install-extras/00-packages | 1 + 1 file changed, 1 insertion(+) diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index 4ecebb7..dd5fbe4 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -1,4 +1,5 @@ mu-editor +scratch3 claws-mail code-the-classics code-the-classics-2 kicad