Clean up initialization in dracut.
The source keyword is deprecated, and kernel / outfile are more legible as
conditional lists.
---
dracut | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/dracut b/dracut
index 82cf9e5..bd592d0 100755
--- a/dracut
+++ b/dracut
@@ -23,29 +23,22 @@ while (($# > 0)); do
shift
done
-if [ -n "$2" ]; then
- kernel=$2
-else
- kernel=$(uname -r)
-fi
-if [ -n "$1" ]; then
- outfile=$(readlink -f $1)
-else
+[[ $2 ]] && kernel=$2 || kernel=$(uname -r)
+[[ $1 ]] && outfile=$(readlink -f $1) || \
outfile="/boot/initrd-$kernel.img"
-fi
-if [ -f "$outfile" -a -z "$force" ]; then
+if [[ -f $outfile && ! $force ]]; then
echo "Will not override existing initramfs ($outfile) without --force"
exit 1
fi
-if [ -n "$allowlocal" -a -f ./init ]; then
- source ./dracut-functions
+if [[ $allowlocal && -f ./init ]]; then
+ . ./dracut-functions
initfile=./init
switchroot=./switch_root
rulesdir=./rules.d
else
- source /usr/libexec/dracut/functions
+ . /usr/libexec/dracut/functions
initfile=/usr/libexec/dracut/init
switchroot=/usr/libexec/dracut/switch_root
rulesdir=/usr/libexec/dracut/rules.d
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
