From: Richard Jones <rjones@redhat.com>
Date: Mon, 12 Apr 2010 15:34:57 +0000 (+0100)
Subject: Fix time and timezone to be correct within the appliance.
X-Git-Tag: 1.3.3~4
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=508f1ee87e816bf6b6fc8e629ccbb2d61a971169

Fix time and timezone to be correct within the appliance.
---

diff --git a/appliance/init b/appliance/init
index f399916..15dab61 100755
--- a/appliance/init
+++ b/appliance/init
@@ -47,12 +47,17 @@ if grep -sq selinux=1 /proc/cmdline; then
   mount -t selinuxfs none /selinux
 fi
 
-modprobe dm_mod ||:
+# Update the system clock.
+hwclock -u -s
 
+# Set up the network.
 ifconfig lo 127.0.0.1
 ifconfig eth0 10.0.2.10
 route add default gw 10.0.2.2
 
+# Scan for LVM.
+modprobe dm_mod ||:
+
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure
 
@@ -68,6 +73,8 @@ lvm lvs
 ifconfig
 netstat -rn
 lsmod
+#hwclock -r
+date
 #ping -n -v -c 5 10.0.2.2
 #ping -n -v -c 5 10.0.2.4
 
diff --git a/appliance/supermin-split.sh.in b/appliance/supermin-split.sh.in
index edb6c41..44cfe21 100755
--- a/appliance/supermin-split.sh.in
+++ b/appliance/supermin-split.sh.in
@@ -73,6 +73,10 @@ for path in $(find -not -name fakeroot.log); do
     if [ "$path" = "./init" -o "$file" = "guestfsd" ]; then
         echo "$path" >&5
 
+    # Get timezone configuration from local system.
+    elif [ "$path" = "./etc/localtime" ]; then
+        echo "$path" >&6
+
     elif [[ "$path" =~ $p_etc || "$path" =~ $p_dev || "$path" =~ $p_var ]]
     then
         echo "$path" >&5