From 6beb1ef368a7a03bc64346ae8ca3b105d12f3bd5 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 28 Jun 2013 15:33:28 +0200 Subject: Try to properly set the system time in stage31 already --- remote/rootfs/rootfs-stage31/data/init | 15 ++++++++++++--- remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'remote') diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 3a1087df..346ccc13 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -107,10 +107,19 @@ mount -n --move /dev/shm/uniontmp /mnt/uniontmp || drop_shell "Problem moving un [ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after aufs'ing." # Download config if available -( -sleep 1 /mnt/opt/openslx/bin/activate-sysconfig /mnt -) & +if [ ! -e /mnt/opt/openslx/config ]; then + sleep 0.5 + /mnt/opt/openslx/bin/activate-sysconfig /mnt +fi +if [ -e /mnt/opt/openslx/config ]; then + . /mnt/opt/openslx/config + if [ "x$SLX_BIOS_CLOCK" == "xlocal" ]; then + hwclock -s -l + elif [ "x$SLX_BIOS_CLOCK" == "xutc" ]; then + hwclock -s -u + fi +fi # create udev rule for nic we booted from cat > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" <