dracut: exit traps with original exitcode

16 years ago · 5af0cf0ce6
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -167,7 +167,8 @@ fi
				@@ -167,7 +167,8 @@ fi
 hookdirs="cmdline pre-udev pre-trigger netroot pre-mount pre-pivot mount emergency"

 readonly initdir=$(mktemp -d -t initramfs.XXXXXX)
-trap 'rm -rf "$initdir"' 0 # clean up after ourselves no matter how we die.
+trap 'ret=$?;rm -rf "$initdir";exit $ret;' EXIT # clean up after ourselves no matter how we die.
+trap 'exit 1;' SIGINT # clean up after ourselves no matter how we die.

 # Need to be able to have non-root users read stuff (rpcbind etc)
 chmod 755 "$initdir"