summaryrefslogtreecommitdiff
path: root/scripts/live-bottom
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 14:46:40 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:05 +0100
commit833abaa35c3a77075dd57f3f1a3633d79109a5b4 (patch)
tree7ff85c4f46c17b2045a8b042d341220e9574ecac /scripts/live-bottom
parentf92e88f44e35a6e103b607a06d9fe69b9c20a53d (diff)
downloadlive-boot-833abaa35c3a77075dd57f3f1a3633d79109a5b4.tar.gz
live-boot-833abaa35c3a77075dd57f3f1a3633d79109a5b4.zip
Adding live-initramfs 1.91.6-1.
Diffstat (limited to 'scripts/live-bottom')
-rwxr-xr-xscripts/live-bottom/01integrity_check5
-rwxr-xr-xscripts/live-bottom/02_timezone7
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/live-bottom/01integrity_check b/scripts/live-bottom/01integrity_check
index b855b62..4ac847f 100755
--- a/scripts/live-bottom/01integrity_check
+++ b/scripts/live-bottom/01integrity_check
@@ -20,4 +20,7 @@ esac
# live-initramfs script
-grep integrity-check /proc/cmdline && live-md5check /live/image /live/image/md5sum.txt < /dev/tty8
+grep -qs integrity-check /proc/cmdline || exit 0
+
+cd /live/image
+md5sum -c md5sum.txt < /dev/tty8
diff --git a/scripts/live-bottom/02_timezone b/scripts/live-bottom/02_timezone
index 10b634e..dad3cad 100755
--- a/scripts/live-bottom/02_timezone
+++ b/scripts/live-bottom/02_timezone
@@ -40,6 +40,11 @@ set tzdata/Areas Etc
set tzdata/Zones/Etc UTC
EOF
cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
-fi
+fi
+
+if [ -n "${UTC}" ]
+then
+ sed -i -e "s/UTC=.*/UTC=${UTC}/" /root/etc/default/rcS
+fi
log_end_msg