diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/initramfs-tools.dirs | 1 | ||||
| -rwxr-xr-x | mkinitramfs | 9 |
3 files changed, 15 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index cb49ebf..499d316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -initramfs-tools (0.91) UNRELEASED; urgency=low +initramfs-tools (0.91) unstable; urgency=low * udev_helper: Axe the modprobe ide-generic should no longer be needed for kernel since Etch. @@ -24,10 +24,11 @@ initramfs-tools (0.91) UNRELEASED; urgency=low Thanks Michael Prokop <mika@grml.org> for the patches. * hook-functions: MODULES=dep fix I2O detection. Add sys_walk_modalias() to catch old style IDE. - * mkinitramfs: Export MODULES, allows hook script to act accordingly. - (closes: #421658) + * mkinitramfs: Export MODULES, allows hook scripts to act accordingly. + (closes: #421658) Add /usr/share/initramfs-tools/conf-hooks.d for hooks + options on mkinitramfs run. Do not land in initramfs. - -- maximilian attems <maks@debian.org> Sat, 08 Sep 2007 23:28:37 +0200 + -- maximilian attems <maks@debian.org> Sun, 09 Sep 2007 12:26:16 +0200 initramfs-tools (0.90a) unstable; urgency=high diff --git a/debian/initramfs-tools.dirs b/debian/initramfs-tools.dirs index 2c6a83a..a11bf32 100644 --- a/debian/initramfs-tools.dirs +++ b/debian/initramfs-tools.dirs @@ -10,5 +10,6 @@ etc/initramfs-tools/scripts/nfs-top etc/initramfs-tools/hooks etc/initramfs-tools/conf.d usr/share/initramfs-tools/conf.d +usr/share/initramfs-tools/hooksconf.d usr/share/initramfs-tools/modules.d /var/lib/initramfs-tools 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 |