diff options
author | Thomas Bächler <thomas@archlinux.org> | 2006-12-17 12:53:22 +0000 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2006-12-17 12:53:22 +0000 |
commit | 4b00503d2d25e40b0e962df08005d749cf3a4c87 (patch) | |
tree | 5e6f4577f33e8bd5070a7f1031abd9e4e73a03b2 /rc.sysinit | |
parent | 779bd2abb1b67431b6e353eaba569779fb718833 (diff) | |
download | initscripts-4b00503d2d25e40b0e962df08005d749cf3a4c87.tar.xz |
added stat_append to functions, fixed fsck bugs when clock is not set
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-x | rc.sysinit | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -103,7 +103,7 @@ fi # Set up non-root encrypted partition mappings if [ -f /etc/crypttab -a -n "$(grep -v ^# /etc/crypttab | grep -v ^$)" ]; then - stat_busy "Unlocking encrypted volumes" + stat_busy "Unlocking encrypted volumes:" csfailed=0 CS=/sbin/cryptsetup.static do_crypt() { @@ -113,6 +113,7 @@ if [ -f /etc/crypttab -a -n "$(grep -v ^# /etc/crypttab | grep -v ^$)" ]; then cpass="$3" shift 3 copts="$*" + stat_append "${cname}.." if [ "${cpass:0:1}" != "/" ]; then # For some fun reason, the parameter ordering varies for # LUKS and non-LUKS devices. Joy. @@ -128,7 +129,12 @@ if [ -f /etc/crypttab -a -n "$(grep -v ^# /etc/crypttab | grep -v ^$)" ]; then $CS -d $cpass $copts create $cname $csrc >/dev/null fi fi - [ $? -ne 0 ] && csfailed=1 + if [ $? -ne 0 ]; then + csfailed=1 + stat_append "failed " + else + stat_append "ok " + fi fi } while read line; do @@ -143,6 +149,16 @@ fi status "Mounting Root Read-only" /bin/mount -n -o remount,ro / +# Set clock early to fix some bugs with filesystem checks +# Clock is set again later to match rc.conf +if [ -f /etc/localtime ]; then + if [ "$HARDWARECLOCK" = "UTC" ]; then + /sbin/hwclock --directisa --utc --hctosys + else + /sbin/hwclock --directisa --localtime --hctosys + fi +fi + FORCEFSCK= [ -f /forcefsck ] && FORCEFSCK="-- -f" NETFS="nonfs,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,nousbfs,noshfs,nofuse" |