diff options
| author | Eun-Ju KIm <eukim@redhat.com> | 2008-05-09 03:16:09 +0000 |
|---|---|---|
| committer | Eun-Ju KIm <eukim@redhat.com> | 2008-05-09 03:16:09 +0000 |
| commit | 20ae37592f30516cb23d138ff2d60cdc3f490723 (patch) | |
| tree | 7a062d877a43e57a1d26bb737e0dadb6a51f6b3f /rc.d/rc.sysinit | |
| parent | 1bd1096da0802b74cf738c7dab22667abf951c97 (diff) | |
| parent | 73a91036b96450f976c5e45d3478d4b6f905c79a (diff) | |
| download | initscripts-20ae37592f30516cb23d138ff2d60cdc3f490723.tar.gz initscripts-20ae37592f30516cb23d138ff2d60cdc3f490723.tar.xz initscripts-20ae37592f30516cb23d138ff2d60cdc3f490723.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/initscripts
Diffstat (limited to 'rc.d/rc.sysinit')
| -rwxr-xr-x | rc.d/rc.sysinit | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 0f0a238b..5c0328ea 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -362,6 +362,13 @@ if [ -c /dev/mapper/control ]; then fi fi +if [ -f /etc/crypttab ]; then + s=$"Starting disk encryption:" + echo "$s" + init_crypto 0 && success "$s" || failure "$s" + echo +fi + if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then fastboot=yes fi @@ -420,7 +427,6 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then mount_dirs() { if [ -e "$1" ]; then mkdir -p "$RW_MOUNT$1" - # fixme: find is bad find "$1" -type d -print0 | cpio -p -0vd "$RW_MOUNT" &>/dev/null mount -n --bind "$RW_MOUNT$1" "$1" fi @@ -744,24 +750,9 @@ rm -f /fastboot /fsckoptions /forcefsck /.autofsck /forcequotacheck /halt \ _NEED_XFILES= [ -f /var/run/utmpx -o -f /var/log/wtmpx ] && _NEED_XFILES=1 -# Clean up /var. I'd use find, but /usr may not be mounted. -for afile in /var/lock/* /var/run/* ; do - if [ -d "$afile" ]; then - case "$afile" in - */news|*/mon) ;; - */sudo) rm -f $afile/*/* ;; - */vmware) rm -rf $afile/*/* ;; - */samba) rm -rf $afile/*/* ;; - */screen) rm -rf $afile/* ;; - */cvs) rm -rf $afile/* ;; - */dovecot) rm -f $afile/*/* ;; - */cups) rm -f $afile/*/* ;; - *) rm -f $afile/* ;; - esac - else - rm -f $afile - fi -done +# Clean up /var. +rm -rf /var/lock/cvs/* /var/run/screen/* +find -L /var/lock /var/run ! -type d -exec rm -f {} \; rm -f /var/lib/rpm/__db* &> /dev/null rm -f /var/gdm/.gdmfifo &> /dev/null |