summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-17 00:15:45 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:02 +0200
commit798e68096a8a5368b290f3b79b81c0574660d73b (patch)
tree68dc66f7556bbb9f560a2cdf37e7cba43cde8c9f /share
parent4908d4d6c14d61f5889bafafc20d0e1749cccd85 (diff)
downloadvyos-live-build-798e68096a8a5368b290f3b79b81c0574660d73b.tar.gz
vyos-live-build-798e68096a8a5368b290f3b79b81c0574660d73b.zip
Merging remove-linux-image-backups into remove-backup-files hook.
Diffstat (limited to 'share')
-rwxr-xr-xshare/hooks/0100-remove-linux-image-backups.chroot8
-rwxr-xr-xshare/hooks/0140-remove-backup-files.chroot3
2 files changed, 3 insertions, 8 deletions
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-