From 750dde158aaff6c31331217b68edb433496b25bf Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Tue, 1 Feb 2022 16:01:44 +0000
Subject: [PATCH] raspi-config: pass -f flag to rm

---
 debian/changelog |  6 ++++++
 raspi-config     | 12 ++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a57cf8..0a705db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20220201) UNRELEASED; urgency=medium
+
+  * pass -f flag to rm
+
+ -- Serge Schneider <serge@raspberrypi.com>  Tue, 01 Feb 2022 16:02:27 +0000
+
 raspi-config (20220126) bullseye; urgency=medium
 
   * Modify overlay functions to match format of other nonint calls
diff --git a/raspi-config b/raspi-config
index 4773375..796c925 100755
--- a/raspi-config
+++ b/raspi-config
@@ -1357,7 +1357,7 @@ do_boot_behaviour() {
       B1*)
         systemctl set-default multi-user.target
         ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
-        rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
+        rm -f /etc/systemd/system/getty@tty1.service.d/autologin.conf
         ;;
       B2*)
         systemctl set-default multi-user.target
@@ -1372,7 +1372,7 @@ EOF
         if [ -e /etc/init.d/lightdm ]; then
           systemctl set-default graphical.target
           ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
-          rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
+          rm -f /etc/systemd/system/getty@tty1.service.d/autologin.conf
           sed /etc/lightdm/lightdm.conf -i -e "s/^autologin-user=.*/#autologin-user=/"
           disable_raspi_config_at_boot
         else
@@ -1943,9 +1943,7 @@ Exec=/usr/lib/raspi-config/cmstart.sh
 EOF
     STATUS=enabled
   elif [ $RET -eq 1 ]; then
-    if [ -e /etc/xdg/autostart/xcompmgr.desktop ]; then
-      rm /etc/xdg/autostart/xcompmgr.desktop
-    fi
+    rm -f /etc/xdg/autostart/xcompmgr.desktop
     STATUS=disabled
   else
     return $RET
@@ -1974,9 +1972,7 @@ do_glamor() {
   if [ $RET -eq 0 ]; then
     systemctl disable glamor-test.service
     systemctl stop glamor-test.service
-    if [ -e /usr/share/X11/xorg.conf.d/20-noglamor.conf ] ; then
-      rm /usr/share/X11/xorg.conf.d/20-noglamor.conf
-    fi
+    rm -f /usr/share/X11/xorg.conf.d/20-noglamor.conf
     STATUS=enabled
   elif [ $RET -eq 1 ]; then
     systemctl enable glamor-test.service &&