diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-17 00:15:45 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-17 00:15:45 +0100 |
| commit | 52c72ea0422c98d686c399ed1c6466f22e9a579a (patch) | |
| tree | 68dc66f7556bbb9f560a2cdf37e7cba43cde8c9f | |
| parent | 6ca1504312728b9864aebe1b53b1b6207aaa10d6 (diff) | |
| download | vyos-live-build-52c72ea0422c98d686c399ed1c6466f22e9a579a.tar.gz vyos-live-build-52c72ea0422c98d686c399ed1c6466f22e9a579a.zip | |
Merging remove-linux-image-backups into remove-backup-files hook.
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | share/hooks/0100-remove-linux-image-backups.chroot | 8 | ||||
| -rwxr-xr-x | share/hooks/0140-remove-backup-files.chroot | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 814b1fed9..f4863b6ee 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -609,7 +609,6 @@ Set_defaults () remove-openssh-server-host-keys \ remove-python-py \ remove-udev-persistent-rules \ - remove-linux-image-backups \ remove-mdadm-configuration \ remote-adjtime-configuration \ disable-kexec-tools \ @@ -629,7 +628,6 @@ Set_defaults () remove-openssh-server-host-keys \ remove-python-py \ remove-udev-persistent-rules \ - remove-linux-image-backups \ remove-mdadm-configuration \ remove-adjtime-configuration \ disable-kexec-tools \ diff --git a/share/hooks/0100-remove-linux-image-backups.chroot b/share/hooks/0100-remove-linux-image-backups.chroot deleted file mode 100755 index 1302d6c93..000000000 --- a/share/hooks/0100-remove-linux-image-backups.chroot +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -# Remove backup files - -rm -f /boot/*.bak -rm -f /boot/*.old-dkms diff --git a/share/hooks/0140-remove-backup-files.chroot b/share/hooks/0140-remove-backup-files.chroot index 6058f1eb2..6e0a69055 100755 --- a/share/hooks/0140-remove-backup-files.chroot +++ b/share/hooks/0140-remove-backup-files.chroot @@ -3,6 +3,9 @@ set -e # Remove backup files +rm -f /boot/*.bak +rm -f /boot/*.old-dkms + rm -f /etc/apt/trusted.gpg~ rm -f /etc/passwd- |