diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-12-16 09:56:01 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-12-16 09:56:01 -0500 |
| commit | 7b8ad9cd0d276da648bb41ffa9fb27f2b123e07f (patch) | |
| tree | 41af81fffb272d7218b3339de1a999629c01da5d /rc.d | |
| parent | 2e47b3e5d979427ca68510f32060cfcbdc299787 (diff) | |
| download | initscripts-7b8ad9cd0d276da648bb41ffa9fb27f2b123e07f.tar initscripts-7b8ad9cd0d276da648bb41ffa9fb27f2b123e07f.tar.gz initscripts-7b8ad9cd0d276da648bb41ffa9fb27f2b123e07f.tar.bz2 initscripts-7b8ad9cd0d276da648bb41ffa9fb27f2b123e07f.tar.xz initscripts-7b8ad9cd0d276da648bb41ffa9fb27f2b123e07f.zip | |
Remove /.suspended as well on boot (#270861)
Diffstat (limited to 'rc.d')
| -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= |