summaryrefslogtreecommitdiff
path: root/mkinitramfs
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-07-02 18:57:07 +0200
committermaximilian attems <maks@debian.org>2006-07-02 18:57:07 +0200
commit0d341b8d32810844ce035e89a9e60fb7a7dde4b6 (patch)
tree55a7b2d2fe9e9cde049c1e7962b3baef00107c5b /mkinitramfs
parent09276c4c9f7deb9a46cf162747b5749f94738c2b (diff)
downloadinitramfs-tools-0d341b8d32810844ce035e89a9e60fb7a7dde4b6.tar.gz
initramfs-tools-0d341b8d32810844ce035e89a9e60fb7a7dde4b6.zip
woow pile of stuff turned up:
- cleanup of activate_vg() in lvm boot script - use less of busybox utilities - conf.d for BUSYBOX=y usage for the packages - don't poke on conffile for RESUME - use printf instead of expr (ooh ash and dash are *fun*) - fix update-initramfs to use current_version when no other version exists around
Diffstat (limited to 'mkinitramfs')
-rwxr-xr-xmkinitramfs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkinitramfs b/mkinitramfs
index 5fcc1fd..f0ba606 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -61,7 +61,7 @@ done
. "${CONFDIR}/initramfs.conf"
EXTRA_CONF=''
-for i in ${CONFDIR}/conf.d/*; do
+for i in ${CONFDIR}/conf.d/* /usr/share/initramfs-tools/conf.d/*; do
EXTRA_CONF="${EXTRA_CONF} $(basename $i | grep '^[a-z0-9][a-z0-9\._-]*$' | grep -v '\.dpkg-.*$')";
done
for i in ${EXTRA_CONF}; do