diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-17 00:15:38 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-17 00:15:38 +0100 |
| commit | 9d9e343f952f1a4058b060b52bca40a11b64a63c (patch) | |
| tree | 8893597bab171ba76c291a3a40f4ee06a545a180 | |
| parent | 50c2839b1b341cc6f1526ee3c467597bb2cc8166 (diff) | |
| download | vyos-live-build-9d9e343f952f1a4058b060b52bca40a11b64a63c.tar.gz vyos-live-build-9d9e343f952f1a4058b060b52bca40a11b64a63c.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 165506fa8..07b8e0590 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -630,7 +630,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 \ @@ -650,7 +649,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- |