scripts/funtions: run_scripts() on verbose mode add error messages

* add the error messages
* fix double call to set_initlist
* skip empty dirs at start
This commit is contained in:
maximilian attems 2007-08-08 19:04:49 +02:00
parent 89bff5c412
commit a951e89170
2 changed files with 17 additions and 2 deletions

6
debian/changelog vendored
View File

@ -10,11 +10,15 @@ initramfs-tools (0.90~beta1) UNRELEASED; urgency=low
(closes: #426917, #429237, #426446)
* debian/scripts: Add /etc/crypttab to reportbug script. Add /sys/block
list for MODULES=dep to reportbug script.
* scripts/functions: Add error message on verbose mode about ignored files
in boot/hooks dir. Thanks Kornilios Kourtis <kkourt@cslab.ece.ntua.gr>
for the initial patch. Fixes a double set_initlist call too. Ignore empty
dirs earlier too. (closes: #433459)
[ David Härdeman ]
* hook-functions: Protect all variable with local, plus coding style fixes.
-- maximilian attems <maks@debian.org> Wed, 08 Aug 2007 01:22:00 +0200
-- maximilian attems <maks@debian.org> Wed, 08 Aug 2007 18:57:20 +0200
initramfs-tools (0.89) unstable; urgency=low

View File

@ -88,20 +88,32 @@ set_initlist()
{
unset initlist
for si_x in ${initdir}/*; do
# skip empty dirs without warning
[ "${si_x}" = "${initdir}/*" ] && return
# only allow variable name chars
case ${si_x#${initdir}/} in
*[![:alnum:]_]*)
[ "${verbose}" = "y" ] \
&& echo "$si_x ignored: not alphanumeric or '_' file"
continue
;;
esac
# skip non executable scripts
if [ ! -x ${si_x} ]; then
[ "${verbose}" = "y" ] \
&& echo "$si_x ignored: not executable"
continue
fi
# skip directories
if [ -d ${si_x} ]; then
[ "${verbose}" = "y" ] \
&& echo "$si_x ignored: a directory"
continue
fi
initlist="${initlist} ${si_x#${initdir}/}"
done
}
@ -171,7 +183,6 @@ pop_list_item()
reduce_prereqs()
{
unset runlist
set_initlist
set -- ${initlist}
i=$#
# Loop until there's no more in the queue to loop through