diff options
| author | maximilian attems <maks@debian.org> | 2005-12-06 01:19:57 +0100 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2005-12-06 01:19:57 +0100 |
| commit | de53fe8336d09076a1330b7d5793689e587bcd1c (patch) | |
| tree | d38bf22920aff931ebaae8edeca2dd61216efc51 | |
| parent | 94cdc6efb0303ed4d3db0c7ebd15d08dd935957c (diff) | |
| download | initramfs-tools-de53fe8336d09076a1330b7d5793689e587bcd1c.tar.gz initramfs-tools-de53fe8336d09076a1330b7d5793689e587bcd1c.zip | |
fix hooks/kernelextras not include current dir with wildcard.
break out of loop on the '*' case.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | hooks/kernelextras | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 48fd54b..6a87941 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,10 @@ initramfs-tools (0.43) unstable; urgency=low * local-top/lvm: Activate all lvm groups for future support of lvm-crypt roots. (Closes: #339087) - -- maximilian attems <maks@sternwelten.at> Mon, 5 Dec 2005 17:49:43 +0100 + * hooks/kernelextras: Really fix #335505. + Don't expand wildcase to current dir. (Closes: #342153) + + -- maximilian attems <maks@sternwelten.at> Tue, 6 Dec 2005 01:16:41 +0100 initramfs-tools (0.42) unstable; urgency=low diff --git a/hooks/kernelextras b/hooks/kernelextras index df38884..33e6cb0 100755 --- a/hooks/kernelextras +++ b/hooks/kernelextras @@ -19,16 +19,16 @@ esac . /usr/share/initramfs-tools/hook-functions -if [ ! -d ${MODULESDIR}/initrd ]; then - exit 0 -fi - fbcon=n +set -x for x in ${MODULESDIR}/initrd/*; do x=${x##*/} x=${x%.*} case ${x} in + '*') + break + ;; *fb) fbcon=y ;; |