From 8b3bea69df843fa1642ef836f2cfa80e80da0f7c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Fri, 4 Jun 2010 09:39:37 +0200
Subject: Dropping /etc/live.conf, replaced mostly by /etc/live/config.conf of
 live-config.

---
 scripts/live | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'scripts/live')

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
 }
-- 
cgit v1.2.3