diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-07-31 15:55:13 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-07-31 15:55:22 +0200 |
| commit | d27cd4dfdd51c7f5178c5f4cb8f5bf4668228995 (patch) | |
| tree | 8e49338db8f261a7dbfd3eaea8111807f68a3918 | |
| parent | 030b00b8a5499a1d2150730ae412a356f40ca5a4 (diff) | |
| download | dracut-d27cd4dfdd51c7f5178c5f4cb8f5bf4668228995.tar.gz dracut-d27cd4dfdd51c7f5178c5f4cb8f5bf4668228995.tar.bz2 dracut-d27cd4dfdd51c7f5178c5f4cb8f5bf4668228995.zip | |
Revert "base: setup correct system time and time zone in initrd"
This reverts commit 77364fd6bb01ea184db73b1a5ad05da984752293.
Too many problems with adjtime in the initramfs
https://bugzilla.redhat.com/show_bug.cgi?id=981617
| -rwxr-xr-x | modules.d/99base/init.sh | 9 | ||||
| -rwxr-xr-x | modules.d/99base/module-setup.sh | 11 |
2 files changed, 0 insertions, 20 deletions
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh index 0e4cac55..ae73fd2c 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -48,15 +48,6 @@ if ! ismounted /dev; then exit 1 fi -# setup system time -if [ -f /etc/adjtime ]; then - if strstr "$(cat /etc/adjtime)" LOCAL; then - hwclock --hctosys --localtime - else - hwclock --hctosys --utc - fi -fi - # prepare the /dev directory [ ! -h /dev/fd ] && ln -s /proc/self/fd /dev/fd >/dev/null 2>&1 [ ! -h /dev/stdin ] && ln -s /proc/self/fd/0 /dev/stdin >/dev/null 2>&1 diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh index c9ee8388..842dde66 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -29,17 +29,6 @@ install() { egrep '^root:' "$initdir/etc/passwd" 2>/dev/null || echo 'root:x:0:0::/root:/bin/sh' >> "$initdir/etc/passwd" egrep '^nobody:' /etc/passwd >> "$initdir/etc/passwd" - # install /etc/adjtime and time zone data - if [[ $hostonly ]]; then - dracut_install -o /etc/adjtime \ - /etc/localtime - - # Our init.sh script needs hwclock to set system time - if ! dracut_module_included "systemd"; then - dracut_install -o hwclock - fi - fi - # install our scripts and hooks inst_script "$moddir/init.sh" "/init" inst_script "$moddir/initqueue.sh" "/sbin/initqueue" |