3 files changed, 2 insertions, 58 deletions
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}" ]