38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
|
From d008b6b89f69772a119da779c9e934e9bdd426ec Mon Sep 17 00:00:00 2001
|
||
|
|
From: Harald Hoyer <harald@redhat.com>
|
||
|
|
Date: Sat, 9 Mar 2013 15:30:44 +0100
|
||
|
|
Subject: [PATCH] dracut.sh: move cleanup trap, just after mktemp
|
||
|
|
|
||
|
|
---
|
||
|
|
dracut.sh | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dracut.sh b/dracut.sh
|
||
|
|
index 8f3e5d2..860cfb5 100755
|
||
|
|
--- a/dracut.sh
|
||
|
|
+++ b/dracut.sh
|
||
|
|
@@ -623,6 +623,11 @@ readonly initdir=$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)
|
||
|
|
exit 1
|
||
|
|
}
|
||
|
|
|
||
|
|
+# clean up after ourselves no matter how we die.
|
||
|
|
+trap 'ret=$?;[[ $keep ]] && echo "Not removing $initdir." >&2 || { [[ $initdir ]] && rm -rf "$initdir";exit $ret; };' EXIT
|
||
|
|
+# clean up after ourselves no matter how we die.
|
||
|
|
+trap 'exit 1;' SIGINT
|
||
|
|
+
|
||
|
|
export DRACUT_KERNEL_LAZY="1"
|
||
|
|
export DRACUT_RESOLVE_LAZY="1"
|
||
|
|
|
||
|
|
@@ -742,11 +747,6 @@ elif [[ -f "$outfile" && ! -w "$outfile" ]]; then
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
|
||
|
|
-# clean up after ourselves no matter how we die.
|
||
|
|
-trap 'ret=$?;[[ $keep ]] && echo "Not removing $initdir." >&2 || rm -rf "$initdir";exit $ret;' EXIT
|
||
|
|
-# clean up after ourselves no matter how we die.
|
||
|
|
-trap 'exit 1;' SIGINT
|
||
|
|
-
|
||
|
|
# Need to be able to have non-root users read stuff (rpcbind etc)
|
||
|
|
chmod 755 "$initdir"
|
||
|
|
|