[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-server/hooks: fix: When using `rm` do not use `--force` when not required

Philip Roche null at kde.org
Mon Feb 5 10:40:28 GMT 2024


Git commit 6ad70d64a5bf728cd13c1f255b1335a095b22340 by Philip Roche.
Committed on 22/01/2024 at 13:27.
Pushed by jriddell into branch 'Neon/release'.

fix: When using `rm` do not use `--force` when not required

`--force` implies that we wish not to fail `rm` even if the file is not present.

This was not our intention and as such can be removed.

Also use short option `-v` for verbose output as per the test of the code base.

M  +1    -1    live-build/ubuntu-server/hooks/01-unminimize.chroot_early

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/6ad70d64a5bf728cd13c1f255b1335a095b22340

diff --git a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
index 9ec78a82..cefc73c7 100755
--- a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
+++ b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
@@ -27,5 +27,5 @@ else
     yes | /usr/local/sbin/unminimize
     # as the lxd-installer package was not installed and thus not removed by `unminimize`
     # the mock /usr/sbin/lxd will still be present, so we need to remove it
-    rm --verbose --force /usr/sbin/lxd
+    rm -v /usr/sbin/lxd
 fi
\ No newline at end of file



More information about the Neon-commits mailing list