Merge pull request #177 from KwadFan/fix/#176

fix: fixes build error in base module
guysoft · Sep 9, 2022 · 1602fff · 1602fff
2 parents f812d6b + 96c9980
commit 1602fff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 32 deletions.
diff --git a/src/modules/base/filesystem/patches/fix-163-autologin-console.patch b/src/modules/base/filesystem/patches/fix-163-autologin-console.patch
diff --git a/src/modules/base/start_chroot_script b/src/modules/base/start_chroot_script
@@ -58,11 +58,13 @@ if [ "${BASE_ADD_USER}" == "yes" ]; then
 
                 # Patch cancel-rename due to https://github.com/RPi-Distro/userconf-pi/issues/2
                 # And https://github.com/guysoft/CustomPiOS/issues/163
-                unpack /filesystem/patches /patches root
-                pushd /usr/bin
-                    patch -p1 < /patches/fix-163-autologin-console.patch
-                popd
-                rm -rf /patches
+                # Since the new version has changed an lead to Error described in
+                # https://github.com/guysoft/CustomPiOS/issues/176
+                # use a more generic way to patch the script.
+                if [[ -f "/usr/bin/cancel-rename" ]]; then
+                    sed -i 's|do_boot_behaviour B2|do_boot_behaviour B1|g' /usr/bin/cancel-rename
+                fi
+
             else
                 echo_red "First user name and password not set! [FAILED]"
                 exit 1