summaryrefslogtreecommitdiff
path: root/mkinitramfs
diff options
context:
space:
mode:
authormaximilian attems <max@stro.at>2007-09-09 12:34:44 +0200
committermaximilian attems <max@stro.at>2007-09-09 12:34:44 +0200
commit475b09a738d329624e34e5f82e01ebaf3c16a708 (patch)
tree58b02273fe6cf0f9b57d24da542a69b6cd8930ae /mkinitramfs
parentc09f8e45cb6740561f1a4f657acc591fa7ceb16e (diff)
downloadinitramfs-tools-475b09a738d329624e34e5f82e01ebaf3c16a708.tar.gz
initramfs-tools-475b09a738d329624e34e5f82e01ebaf3c16a708.zip
mkinitramfs: Add /usr/share/initramfs-tools/conf-hooks.d
this allows to seperate conf files which needs to land on initramfs and those that should only be run on mkinitramfs.
Diffstat (limited to 'mkinitramfs')
-rwxr-xr-xmkinitramfs9
1 files changed, 9 insertions, 0 deletions
diff --git a/mkinitramfs b/mkinitramfs
index 0064963..06d2149 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -88,6 +88,8 @@ for i in /usr/share/initramfs-tools/conf.d/* ${CONFDIR}/conf.d/*; do
EXTRA_CONF="${EXTRA_CONF} $(basename $i \
| grep '^[[:alnum:]][[:alnum:]\._-]*$' | grep -v '\.dpkg-.*$')";
done
+# FIXME: deprecated those settings on mkinitramfs run
+# these conf dirs are for boot scripts and land on initramfs
for i in ${EXTRA_CONF}; do
if [ -e ${CONFDIR}/conf.d/${i} ]; then
. ${CONFDIR}/conf.d/${i}
@@ -96,6 +98,13 @@ for i in ${EXTRA_CONF}; do
fi
done
+# source package confs
+for i in /usr/share/initramfs-tools/conf-hooks.d/*; do
+ if [ -e "${i}" ]; then
+ . "${i}"
+ fi
+done
+
if [ -n "${UMASK}" ]; then
umask "${UMASK}"
fi