diff options
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rwxr-xr-x | mkinitramfs | 17 | ||||
| -rw-r--r-- | mkinitramfs.8 | 8 |
3 files changed, 30 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index d930d08..3dec716 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,20 @@ -initramfs-tools (0.73d) unstable; urgency=low +initramfs-tools (0.73d) unstable; urgency=high * scripts/local-top/mdraid: Fix path of expected mdadm config file. Thanks Daniel Dickinson <cshore@wightman.ca> for report. (closes: 382602) - -- maximilian attems <maks@sternwelten.at> Sat, 12 Aug 2006 09:02:10 +0200 + * mkinitramfs: Treat /usr/share/initramfs-tools/conf.d config snippets as + the configuration files in /etc/initramfs-tools/conf.d. A configuration + file with the same name will override the first. (closes: 381315) + Thanks Vagrant Cascadian <vagrant+bugs@freegeek.org> for the patch. + + * mkinitramfs.8: Document conf.d existence. + + * hooks/lvm: Really remove it, logic is in mkinitramfs. + + * urgency high for the mdraid bug fix, rest is trivial. + + -- maximilian attems <maks@sternwelten.at> Sat, 12 Aug 2006 09:43:55 +0200 initramfs-tools (0.73c) unstable; urgency=low diff --git a/mkinitramfs b/mkinitramfs index 799b77e..1f0a736 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -83,15 +83,14 @@ fi . "${CONFDIR}/initramfs.conf" EXTRA_CONF='' -for i in ${CONFDIR}/conf.d/*; do +for i in /usr/share/initramfs-tools/conf.d/* ${CONFDIR}/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 - . ${CONFDIR}/conf.d/${i} -done -for i in /usr/share/initramfs-tools/conf.d/*; do - if [ -e $i ]; then - . ${i} + if [ -e ${CONFDIR}/conf.d/${i} ]; then + . ${CONFDIR}/conf.d/${i} + elif [ -e /usr/share/initramfs-tools/conf.d/${i} ]; then + . /usr/share/initramfs-tools/conf.d/${i} fi done @@ -204,7 +203,11 @@ done echo "DPKG_ARCH=${DPKG_ARCH}" > ${DESTDIR}/conf/arch.conf copy_exec "${CONFDIR}/initramfs.conf" /conf for i in ${EXTRA_CONF}; do - copy_exec "${CONFDIR}/conf.d/${i}" /conf/conf.d + if [ -e "${CONFDIR}/conf.d/${i}" /conf/conf.d ]; then + copy_exec "${CONFDIR}/conf.d/${i}" /conf/conf.d + elif [ -e "/usr/share/initramfs-tools/conf.d/${i}" ]; then + copy_exec "/usr/share/initramfs-tools/conf.d/${i}" /conf/conf.d + fi done echo "ROOT=${ROOT}" > ${DESTDIR}/conf/conf.d/root diff --git a/mkinitramfs.8 b/mkinitramfs.8 index 65f6203..9041ba6 100644 --- a/mkinitramfs.8 +++ b/mkinitramfs.8 @@ -1,4 +1,4 @@ -.TH MKINITRAMFS 8 "$Date: 2006/02/17 $" "" "mkinitramfs manual" +.TH MKINITRAMFS 8 "$Date: 2006/08/12 $" "" "mkinitramfs manual" .SH NAME mkinitramfs \- generate an initramfs image @@ -83,6 +83,12 @@ which is described in .BR modules (5). .TP +.I /etc/initramfs-tools/conf.d +The conf.d directory allows to hardcode bootargs at initramfs build time +via config snippets. This allows to set ROOT or RESUME. +This is especially useful for bootloaders, which do not pass an root bootarg. + +.TP .I /etc/initramfs-tools/DSDT.aml If this file exists, it will be appended to the initramfs in a way that causes it to be loaded by ACPI. |