From: Harald Hoyer <harald@redhat.com>
Date: Thu, 8 Oct 2009 12:17:48 +0000 (+0200)
Subject: dracut: exit traps with original exitcode
X-Git-Tag: 003~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5af0cf0ce6facd92e3d7e13ffbee94a021bc28b6;p=thirdparty%2Fdracut.git

dracut: exit traps with original exitcode
---

diff --git a/dracut b/dracut
index 3b7792a05..5c538b823 100755
--- a/dracut
+++ b/dracut
@@ -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"