[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] postinst: use 'rm -f' instead 'rm -rf' where appropriate.

[Holger Levsen]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-config


Commits:
e213da38 by Holger Levsen at 2021-01-18T18:53:48+01:00
postinst: use 'rm -f' instead 'rm -rf' where appropriate.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- debian/changelog
- debian/debian-edu-config.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
 debian-edu-config (2.11.45) UNRELEASED; urgency=medium
 
+  [ Wolfgang Schweer ]
   * Cope with issues found during a Buster main server upgrade.
     - cf3/cf.squid: Copy additional configuration file instead of symlinking it.
-    - debian/debian.postinst: Add code to remove symlinks that point to already
-      removed files (previously used for workarounds).
+    - postinst: Add code to remove symlinks that point to already removed files
+      (previously used for workarounds).
+
+  [ Holger Levsen ]
+  * postinst: use 'rm -f' instead 'rm -rf' where appropriate.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 18 Jan 2021 16:40:22 +0100
 


=====================================
debian/debian-edu-config.postinst
=====================================
@@ -220,23 +220,23 @@ configure)
     fi
     # Remove no longer used freeradius setup template files.
     if dpkg --compare-versions "$2" le "2.11.44" ; then
-        rm -rf /usr/share/debian-edu-config/freeradius-eap.conf
-        rm -rf /usr/share/debian-edu-config/freeradius-mschap.conf
-        rm -rf /usr/share/debian-edu-config/freeradius-authorize
-        rm -rf /usr/share/debian-edu-config/freeradius-clients.conf
+        rm -f /usr/share/debian-edu-config/freeradius-eap.conf
+        rm -f /usr/share/debian-edu-config/freeradius-mschap.conf
+        rm -f /usr/share/debian-edu-config/freeradius-authorize
+        rm -f /usr/share/debian-edu-config/freeradius-clients.conf
     fi
     # Remove symlink for additional squid file to avoid a permission pitfall.
     # Instead, cf3/cf.squid is used to copy the file.
     # Remove some other leftover symlinks now pointing nowhere.
     if dpkg --compare-versions "$2" le "2.11.45" ; then
         if [ -h /etc/squid/conf.d/debian-edu.conf ] ; then
-            rm -rf /etc/squid/conf.d/debian-edu.conf
+            rm -f /etc/squid/conf.d/debian-edu.conf
         fi
         if [ -h /etc/X11/Xsession.d/55xfce4-session-debian-edu ] ; then
-            rm -rf /etc/X11/Xsession.d/55xfce4-session-debian-edu
+            rm -f /etc/X11/Xsession.d/55xfce4-session-debian-edu
         fi
         if [ -h /etc/X11/Xsession.d/99edu-firefox-nfs ] ; then
-            rm -rf /etc/X11/Xsession.d/99edu-firefox-nfs
+            rm -f /etc/X11/Xsession.d/99edu-firefox-nfs
         fi
     fi
     ;;



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e213da381424d7fa38edb085cffc80e8d876e647

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/e213da381424d7fa38edb085cffc80e8d876e647
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210118/fa6ea50e/attachment-0001.html>