diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-12-16 09:56:01 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-12-16 10:06:21 -0500 |
| commit | 40b4429ef259fd93f0cbcbcd8fd76bdf1c417bdc (patch) | |
| tree | bf3530483def40c9201bd82c7270646f3d26ffca | |
| parent | bb64b8dcb0da89de3e870e24504b816c8ef3e977 (diff) | |
| download | initscripts-40b4429ef259fd93f0cbcbcd8fd76bdf1c417bdc.tar initscripts-40b4429ef259fd93f0cbcbcd8fd76bdf1c417bdc.tar.gz initscripts-40b4429ef259fd93f0cbcbcd8fd76bdf1c417bdc.tar.bz2 initscripts-40b4429ef259fd93f0cbcbcd8fd76bdf1c417bdc.tar.xz initscripts-40b4429ef259fd93f0cbcbcd8fd76bdf1c417bdc.zip | |
Remove /.suspended as well on boot (#270861)
| -rwxr-xr-x | rc.d/rc.sysinit | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index df911805..65dc467f 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -230,8 +230,9 @@ init_crypto() { plymouth ask-for-password --prompt "$prompt" --command="/sbin/cryptsetup luksOpen -T1 $src $dst" <&1 fi else - plymouth --hide-splash + [ -z "$key" ] && plymouth --hide-splash /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1 2>/dev/null && success || failure + [ -z "$key" ] && plymouth --show-splash fi rc=$? if [ $rc -ne 0 ]; then @@ -741,7 +742,7 @@ fi # Clean out /. rm -f /fastboot /fsckoptions /forcefsck /.autofsck /forcequotacheck /halt \ - /poweroff &> /dev/null + /poweroff /.suspended &> /dev/null # Do we need (w|u)tmpx files? We don't set them up, but the sysadmin might... _NEED_XFILES= |