[Debian-live-changes] r1453 - dists/trunk/live-initramfs/scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-11 10:15:54 +0000 (Fri, 11 May 2007)
New Revision: 1453

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check
   dists/trunk/live-initramfs/scripts/live-bottom/01live.conf
   dists/trunk/live-initramfs/scripts/live-bottom/02timezone
Removed:
   dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
   dists/trunk/live-initramfs/scripts/live-bottom/02_timezone
   dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
Log:


Copied: dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check (from rev 1447, dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check)
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check	2007-05-10 17:02:33 UTC (rev 1447)
+++ dists/trunk/live-initramfs/scripts/live-bottom/00integrity-check	2007-05-11 10:15:54 UTC (rev 1453)
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+grep integrity-check /proc/cmdline && live-md5check /live_media /live_media/md5sum.txt < /dev/tty8

Deleted: dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check	2007-05-11 10:04:51 UTC (rev 1452)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check	2007-05-11 10:15:54 UTC (rev 1453)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-grep integrity-check /proc/cmdline && live-md5check /live_media /live_media/md5sum.txt < /dev/tty8

Copied: dists/trunk/live-initramfs/scripts/live-bottom/01live.conf (from rev 1447, dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf)
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf	2007-05-10 17:02:33 UTC (rev 1447)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01live.conf	2007-05-11 10:15:54 UTC (rev 1453)
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+
+DESCRIPTION="Copying config on real root fs..."
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+. /scripts/live-functions
+
+log_begin_msg "${DESCRIPTION}"
+
+if [ -f /etc/live.conf ]
+then
+	if [ -n "${CASPERCONF}" ]
+	then
+		# Updating live.conf
+		sed -i	-e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \
+			-e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \
+			-e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' \
+		/etc/live.conf
+	fi
+
+	cp -p /etc/live.conf /root/etc/live.conf
+else
+
+cat > /root/etc/live.conf << EOF
+export USERNAME="$USERNAME"
+export USERFULLNAME="$USERFULLNAME"
+export HOSTNAME="$HOSTNAME"
+EOF
+
+fi

Deleted: dists/trunk/live-initramfs/scripts/live-bottom/02_timezone
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02_timezone	2007-05-11 10:04:51 UTC (rev 1452)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02_timezone	2007-05-11 10:15:54 UTC (rev 1453)
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-PREREQ=""
-DESCRIPTION="Setting timezone..."
-
-. /scripts/live-functions
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime

Deleted: dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf	2007-05-11 10:04:51 UTC (rev 1452)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf	2007-05-11 10:15:54 UTC (rev 1453)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Copying config on real root fs..."
-
-. /scripts/live-functions
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-log_begin_msg "$DESCRIPTION"
-
-if [ -f /etc/live.conf ] ; then
-	if [ ! -z "${CASPERCONF}" ]; then
-		# Updating live.conf
-		sed -i -e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \
-		-e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \
-		-e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' /etc/live.conf
-	fi
-	cp -p /etc/live.conf /root/etc/live.conf
-
-else
-	cat <<EOF >/root/etc/live.conf
-export USERNAME="$USERNAME"
-export USERFULLNAME="$USERFULLNAME"
-export HOSTNAME="$HOSTNAME"
-EOF
-
-fi

Copied: dists/trunk/live-initramfs/scripts/live-bottom/02timezone (from rev 1447, dists/trunk/live-initramfs/scripts/live-bottom/02_timezone)