diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-21 15:06:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-21 15:06:40 -0300 |
| commit | 2fb1be996d4d8d459f4b4953a84af63f981b0bf0 (patch) | |
| tree | f168040a0fc7e8e61c93197354938d95454e12a9 /rc.sysinit | |
| parent | abbce1c6720dc3836c1df1337a49768158dff62b (diff) | |
| parent | 7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.08.21
Conflicts:
Makefile
Diffstat (limited to 'rc.sysinit')
| -rwxr-xr-x | rc.sysinit | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -80,7 +80,7 @@ activate_vgs if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then read_crypttab do_unlock # Maybe someone has LVM on an encrypted block device - (( $? )) && activate_vgs + activate_vgs fi # Check filesystems @@ -139,7 +139,7 @@ stat_busy "Saving dmesg log" (( $? == 0 )) && stat_done || stat_fail if [[ -f /etc/adjtime ]]; then - ( read ; read ; read ADJTIME) < /etc/adjtime + { read ; read ; read ADJTIME; } < /etc/adjtime if [[ $ADJTIME == 'LOCAL' ]]; then if [[ $HARDWARECLOCK == 'UTC' ]]; then |