summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init15
-rw-r--r--remote/rootfs/rootfs-stage31/rootfs-stage31.conf1
2 files changed, 13 insertions, 3 deletions
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" <<HEREEND
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index 47f77c0a..18b5d9c8 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -58,4 +58,5 @@ REQUIRED_FIRMWARE=" 3com/
REQUIRED_FILES="
/etc/protocols
/etc/services
+ /etc/localtime
"