[Debian-live-changes] r1334 - in dists/trunk/live-initramfs: doc scripts/live-bottom

Daniel Baumann daniel at alioth.debian.org
Sun May 6 16:52:20 UTC 2007


Author: daniel
Date: 2007-05-06 16:52:20 +0000 (Sun, 06 May 2007)
New Revision: 1334

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf
Removed:
   dists/trunk/live-initramfs/scripts/live-bottom/02etc_casper_conf
Modified:
   dists/trunk/live-initramfs/doc/ChangeLog
Log:


Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 16:50:59 UTC (rev 1333)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 16:52:20 UTC (rev 1334)
@@ -23,6 +23,8 @@
 	  - Added patch fo add function for loading keymaps.
 	* scripts/live-bottom/01integrity_check:
 	  - Added patch to change /cdrom to more generic /live_media.
+	* scripts/live-bottom/01etch_live_conf:
+	  - Added patch to add script updating live.conf file.
 
 2007-05-06  Daniel Baumann  <daniel at debian.org>
 

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

Copied: dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf (from rev 1333, dists/trunk/live-initramfs/scripts/live-bottom/02etc_casper_conf)
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02etc_casper_conf	2007-05-06 16:50:59 UTC (rev 1333)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02etc_live_conf	2007-05-06 16:52:20 UTC (rev 1334)
@@ -0,0 +1,39 @@
+#!/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




More information about the Debian-live-changes mailing list