6 Commits

Author SHA1 Message Date
Philip Roche
8f8415e1dc fix: Always use dpkg-divert instead of altering files maintained by packages
Altering a file maintained by a package can lead to unexpected behaviou expecially in
this case where packages are being removed and added.

Instead use `dpkg-divert` to allow us to mock `lxd` to `true` to allow `unminimize` to work
without error and to avoid installing of the `lxd` snap.
2024-01-22 13:27:12 +00:00
Philip Roche
6ad70d64a5 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.
2024-01-22 13:27:12 +00:00
Philip Roche
d97514cba0 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
2024-01-22 13:27:12 +00:00
Philip Roche
c09d4c1652 fix: Only use single brackets for if statements
Double brackets are not required and do not follow the uses elsewhere in this code base
2024-01-22 13:27:12 +00:00
Philip Roche
34dea62ef0 fix: Fix calls to unminimize if lxd-installer package not present (LP: #2049723)
The unminimize script will try to install the lxd snap using the shim script
`/usr/sbin/lxd` from the lxd-installer package.

Previously `unminimize` was using `snap`
to install `lxd` directly which was being diverted by diverting the `snap` command.

This is no longer the case so we can remove `/usr/sbin/lxd` from the lxd-installer package
if it exists and then redirect any calls to `/usr/sbin/lxd` to `/bin/true`.
2024-01-22 13:27:12 +00:00
Michael Hudson-Doyle
5fda0bb2aa apply dpkg minimizations to minimal layer, and undo them for full layer 2021-08-03 16:36:02 +12:00