From 24de4c5ffb531f3fbcc64012423651a30145dc95 Mon Sep 17 00:00:00 2001 From: Karl Date: Sat, 19 Jul 2025 08:24:30 +0100 Subject: [PATCH] rewrok for bookworm --- build_raspberry_pi.sh | 18 ++++++++---------- raspberry_pi_skeleton/boot/cmdline.txt | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build_raspberry_pi.sh b/build_raspberry_pi.sh index cedc5af..dd11c8c 100755 --- a/build_raspberry_pi.sh +++ b/build_raspberry_pi.sh @@ -55,9 +55,10 @@ echo -n "AnotterKiosk Raspberry Pi version: " > "${BUILD_DIR}/version-info" git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info" # Mount system partitions (from the build host) -sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/" -sudo mount sys -t sysfs -o nosuid,noexec,nodev,ro "${BUILD_DIR}/sys/" -sudo mount devpts -t devtmpfs -o mode=0755,nosuid "${BUILD_DIR}/dev/" +sudo mount -t proc proc "${BUILD_DIR}/proc" +sudo mount -t sysfs sysfs "${BUILD_DIR}/sys" +sudo mount -o bind /dev "${BUILD_DIR}/dev" +sudo mount -o bind /dev/pts "${BUILD_DIR}/dev/pts" # Install everything. sudo chroot "${BUILD_DIR}" /kiosk_skeleton/build.sh @@ -66,13 +67,10 @@ sudo rm -r "${BUILD_DIR}/kiosk_skeleton" cp "${BUILD_DIR}/version-info" version-info -sudo umount -fl "${BUILD_DIR}/proc" -sudo umount -fl "${BUILD_DIR}/sys" -sudo umount -fl "${BUILD_DIR}/dev" - -sudo umount "${BUILD_DIR}/proc" -sudo umount "${BUILD_DIR}/sys" -sudo umount "${BUILD_DIR}/dev" +sudo umount -fl "${BUILD_DIR}/dev/pts" || true +sudo umount -fl "${BUILD_DIR}/dev" || true +sudo umount -fl "${BUILD_DIR}/proc" || true +sudo umount -fl "${BUILD_DIR}/sys" || true sudo umount "${BUILD_DIR}/boot" sudo umount "${BUILD_DIR}" diff --git a/raspberry_pi_skeleton/boot/cmdline.txt b/raspberry_pi_skeleton/boot/cmdline.txt index d80f0d6..27e719e 100644 --- a/raspberry_pi_skeleton/boot/cmdline.txt +++ b/raspberry_pi_skeleton/boot/cmdline.txt @@ -1 +1 @@ -console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 ro rootwait logo.nologo consoleblank=0 loglevel=0 quiet init=/bin/bash \ No newline at end of file +console=serial0,115200 console=tty1 root=PARTUUID=544c6228-02 rootfstype=ext4 ro rootwait logo.nologo consoleblank=0 loglevel=0 quiet \ No newline at end of file