X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F02etc_live_conf;h=815e37971ae629efb8fd951c8a349c81a93ea4ed;hb=ad5f39fff408a174a5b86194bf4fb7553dc212a1;hp=e52d913ce206c2c7a355e19abaecd29d8c6ecda9;hpb=ccea277caf476cdfef4c0f953df5a97062d8be42;p=live-boot-grml.git

diff --git a/scripts/live-bottom/02etc_live_conf b/scripts/live-bottom/02etc_live_conf
index e52d913..815e379 100755
--- a/scripts/live-bottom/02etc_live_conf
+++ b/scripts/live-bottom/02etc_live_conf
@@ -22,24 +22,28 @@ esac
 
 . /scripts/live-functions
 
-log_begin_msg "Copying config on real root fs..."
+log_begin_msg "Copying config on real root fs"
 
 # live-initramfs 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
-
+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 <<EOF >/root/etc/live.conf
-export USERNAME="$USERNAME"
-export USERFULLNAME="$USERFULLNAME"
-export HOSTNAME="$HOSTNAME"
+
+cat > /root/etc/live.conf << EOF
+export USERNAME="${USERNAME}"
+export USERFULLNAME="${USERFULLNAME}"
+export HOSTNAME="${HOSTNAME}"
 EOF
 
 fi