[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-server/hooks: fix: Improve comments for case when lxd-installer package is not installed
Philip Roche
null at kde.org
Mon Feb 5 10:40:28 GMT 2024
Git commit d97514cba0f3d772d9f2d0ebf33cfa69961bf925 by Philip Roche.
Committed on 22/01/2024 at 13:27.
Pushed by jriddell into branch 'Neon/release'.
fix: Improve comments for case when lxd-installer package is not installed
Improve confusing comments for case when lxd-installer package is not installed.
This was worded confusingly
M +4 -4 live-build/ubuntu-server/hooks/01-unminimize.chroot_early
https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/d97514cba0f3d772d9f2d0ebf33cfa69961bf925
diff --git a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
index 64680be4..9ec78a82 100755
--- a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
+++ b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
@@ -21,11 +21,11 @@ if [ -f "/usr/sbin/lxd" ]; then
# unminimize also uninstalls lxd-installer package
# and also removed `/usr/sbin/lxd` as a result so we don't need to restore
else
- # if /usr/sbin/lxd doesn't exist when lxd-installer package isn't installed so we can mock the command
- # to avoid the unminimize script failing
+ # if /usr/sbin/lxd doesn't exist then lxd-installer package isn't installed.
+ # Instead, we can mock the command to avoid the unminimize script failing
ln -s /bin/true /usr/sbin/lxd
yes | /usr/local/sbin/unminimize
- # as the lxd-installer package was not installed and thus not removed the mock
- # /usr/sbin/lxd will still be present so we need to remove it
+ # 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
fi
\ No newline at end of file
More information about the Neon-commits
mailing list