diff options
| author | maximilian attems <maks@debian.org> | 2009-04-02 12:41:17 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2009-04-02 12:41:17 +0200 |
| commit | 97f26c6e0d61a4ff700b8f79c61a41320f317e2e (patch) | |
| tree | f08c2aae6500eb4bdb281bc64d7d496eac8c1455 | |
| parent | f3049298fec182252dc76c75202454bb324bc682 (diff) | |
| download | initramfs-tools-97f26c6e0d61a4ff700b8f79c61a41320f317e2e.tar.gz initramfs-tools-97f26c6e0d61a4ff700b8f79c61a41320f317e2e.zip | |
mkinitramfs: Allow dots in boot and script filenames.
the regex was overly severe not allowing dots althoug they are
useful as word ending.
based on a patch in launchpad, that didn't get all occurences right,
but was a good start.
(LP: #305837)
| -rwxr-xr-x | mkinitramfs | 4 | ||||
| -rw-r--r-- | scripts/functions | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkinitramfs b/mkinitramfs index 5d38f16..8f8e428 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -208,14 +208,14 @@ cp -p /usr/share/initramfs-tools/init ${DESTDIR}/init # add existant boot scripts for b in $(cd /usr/share/initramfs-tools/scripts/ && find . \ - -regextype posix-extended -regex '.*/[[:alnum:]_]+$' -type f); do + -regextype posix-extended -regex '.*/[[:alnum:]_.]+$' -type f); do [ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \ || mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")" cp -p "/usr/share/initramfs-tools/scripts/${b}" \ "${DESTDIR}/scripts/$(dirname "${b}")/" done for b in $(cd "${CONFDIR}/scripts" && find . \ - -regextype posix-extended -regex '.*/[[:alnum:]_]+$' -type f); do + -regextype posix-extended -regex '.*/[[:alnum:]_.]+$' -type f); do [ -d "${DESTDIR}/scripts/$(dirname "${b}")" ] \ || mkdir -p "${DESTDIR}/scripts/$(dirname "${b}")" cp -p "${CONFDIR}/scripts/${b}" "${DESTDIR}/scripts/$(dirname "${b}")/" diff --git a/scripts/functions b/scripts/functions index c024eeb..b813529 100644 --- a/scripts/functions +++ b/scripts/functions @@ -74,7 +74,7 @@ set_initlist() # only allow variable name chars case ${si_x#${initdir}/} in - *[![:alnum:]_]*) + *[![:alnum:]_.]*) [ "${verbose}" = "y" ] \ && echo "$si_x ignored: not alphanumeric or '_' file" continue @@ -106,7 +106,7 @@ reduce_satisfied() for rs_y in ${deplist}; do # only allow variable name chars case ${rs_y} in - *[![:alnum:]_]*) + *[![:alnum:]_.]*) continue ;; esac |