[SCM] live-boot branch, debian, updated. debian/2.0_a4-1-11-g4836a17

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit e528c59c651210acd0d8f60d076afa5442a2ffb6
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jun 4 09:39:37 2010 +0200

    Dropping /etc/live.conf, replaced mostly by /etc/live/config.conf of live-config.

diff --git a/Makefile b/Makefile
index 7b15560..85b8909 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,6 @@ build:
 install:
 	# (FIXME)
 	# Installing configuration
-	install -D -m 0644 conf/live.conf $(DESTDIR)/etc/live.conf
 	install -D -m 0644 conf/compcache $(DESTDIR)/usr/share/initramfs-tools/conf.d/compcache
 
 	# Installing executables
@@ -79,10 +78,6 @@ install:
 	done
 
 uninstall:
-	# (FIXME)
-	# Uninstalling configuration
-	rm -f $(DESTDIR)/etc/live.conf
-
 	# Uninstalling executables
 	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
 	rm -rf $(DESTDIR)/usr/share/live-boot
diff --git a/bin/live-snapshot b/bin/live-snapshot
index 1e080c3..08e5fd6 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -40,7 +40,11 @@ fi
 . /usr/share/initramfs-tools/scripts/live-helpers
 
 LIVE_CONF="/etc/live.conf"
-. "${LIVE_CONF}"
+
+if [ -r "${LIVE_CONF}" ]
+then
+	. "${LIVE_CONF}"
+fi
 
 export USERNAME USERFULLNAME HOSTNAME
 
diff --git a/conf/live.conf b/conf/live.conf
deleted file mode 100644
index 93bf41d..0000000
--- a/conf/live.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/live.conf - configuration file for live-boot(7)
-
-USERNAME="user"
-USERFULLNAME="Debian Live user"
-HOSTNAME="debian"
-
-export USERNAME USERFULLNAME HOSTNAME
diff --git a/hooks/live b/hooks/live
index 645b168..adadab3 100755
--- a/hooks/live
+++ b/hooks/live
@@ -27,14 +27,6 @@ esac
 # Handling live-boot
 
 # Configuration
-if [ -r /etc/live.conf ]
-then
-	. /etc/live.conf
-
-	mkdir -p "${DESTDIR}"/etc
-	cp /etc/live.conf "${DESTDIR}"/etc
-fi
-
 mkdir -p "${DESTDIR}"/usr/share/live-boot
 cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
 
diff --git a/scripts/live b/scripts/live
index 5c6a82e..4eaf3a6 100755
--- a/scripts/live
+++ b/scripts/live
@@ -34,9 +34,6 @@ then
 	touch /etc/mtab
 fi
 
-[ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOSTNAME
-
 . /scripts/live-helpers
 
 if [ ! -f /live.vars ]
@@ -1829,8 +1826,4 @@ mountroot ()
 	exec 2>&7 7>&-
 	kill ${tailpid}
 	[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
-	if [ -f /etc/live.conf ]
-	then
-		cp /etc/live.conf "${rootmnt}/etc/"
-	fi
 }
diff --git a/scripts/live-bottom/02etc_live_conf b/scripts/live-bottom/02etc_live_conf
deleted file mode 100755
index 8309a15..0000000
--- a/scripts/live-bottom/02etc_live_conf
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-boot header
-
-. /scripts/live-functions
-
-log_begin_msg "Copying config on real root fs"
-
-# live-boot script
-
-if [ -f /etc/live.conf ]
-then
-	if [ ! -z "${LIVECONF}" ]
-	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
-
-log_end_msg
diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index a84eb75..b82d2aa 100755
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -28,6 +28,8 @@ log_begin_msg "Setting up init"
 
 # Arrange for shells on virtual consoles, rather than login prompts
 
+USERNAME="user"
+
 if [ -z "${NOAUTOLOGIN}" ] && [ -n "${USERNAME}" ]
 then
 	if [ ! -z "${LIVE_GETTY}" ]

-- 
live-boot