summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-12 11:43:39 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:02 +0200
commit0ad3b01c96072db50e562bf975cca75473b7a5d1 (patch)
treeb9e474318dd372f8e5497de939a1ab1a6640e862
parent5e75d12e6deb23013ac8d0293620bf60f6050788 (diff)
downloadvyos-live-build-0ad3b01c96072db50e562bf975cca75473b7a5d1.tar.gz
vyos-live-build-0ad3b01c96072db50e562bf975cca75473b7a5d1.zip
Adding default hook to remove mdadm configuration.
mdadm creates a /etc/mdadm/mdadm.conf configuration file on package installation which contains array information from the build system.
-rwxr-xr-xfunctions/defaults.sh6
-rwxr-xr-xshare/hooks/0110-remove-mdadm-configuration.chroot7
2 files changed, 11 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 7b33bbd30..e6fe7c5c6 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -609,7 +609,8 @@ Set_defaults ()
remove-openssh-server-host-keys \
remove-python-py \
remove-udev-persistent-rules \
- remove-linux-image-backups}"
+ remove-linux-image-backups \
+ remove-mdadm-configuration}"
;;
kubuntu)
@@ -621,7 +622,8 @@ Set_defaults ()
remove-openssh-server-host-keys \
remove-python-py \
remove-udev-persistent-rules \
- remove-linux-image-backups}"
+ remove-linux-image-backups \
+ remove-mdadm-configuration}"
;;
esac
diff --git a/share/hooks/0110-remove-mdadm-configuration.chroot b/share/hooks/0110-remove-mdadm-configuration.chroot
new file mode 100755
index 000000000..206b494da
--- /dev/null
+++ b/share/hooks/0110-remove-mdadm-configuration.chroot
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+# Remove generated files
+
+rm -f /etc/mdadm/mdadm.conf