diff options
author | maximilian attems <maks@debian.org> | 2006-08-13 10:24:04 +0200 |
---|---|---|
committer | maximilian attems <maks@debian.org> | 2006-08-13 10:24:04 +0200 |
commit | a84613ae7742190e50cc619eee462cc0cd17f6c8 (patch) | |
tree | bc8c40463e25ba64366eddf16212972ed64d17ef | |
parent | 659764e8cdb1dbffd4860348c113a5834ed4e09b (diff) | |
download | initramfs-tools-a84613ae7742190e50cc619eee462cc0cd17f6c8.tar.gz initramfs-tools-a84613ae7742190e50cc619eee462cc0cd17f6c8.zip |
- conf.d configuration test was bogus, fixes:
/usr/sbin/mkinitramfs: line 206: [: /etc/initramfs-tools/conf.d/resume: binary operator expected
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | mkinitramfs | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3dec716..1686466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +initramfs-tools (0.73e) unstable; urgency=high + + * mkinitramfs: Fix if statement for conf.d. (closes: 382740) + + -- maximilian attems <maks@sternwelten.at> Sun, 13 Aug 2006 10:05:10 +0200 + initramfs-tools (0.73d) unstable; urgency=high * scripts/local-top/mdraid: Fix path of expected mdadm config file. diff --git a/mkinitramfs b/mkinitramfs index 1f0a736..3df30ec 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -203,7 +203,7 @@ done echo "DPKG_ARCH=${DPKG_ARCH}" > ${DESTDIR}/conf/arch.conf copy_exec "${CONFDIR}/initramfs.conf" /conf for i in ${EXTRA_CONF}; do - if [ -e "${CONFDIR}/conf.d/${i}" /conf/conf.d ]; then + if [ -e "${CONFDIR}/conf.d/${i}" ]; 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 |