X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F02etc_live_conf;h=48b12d1405fa7876036e76a90b95cb4a9b50b024;hb=059a6646dbeb52812379a684033b499d75f73b6c;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..48b12d1 100755
--- a/scripts/live-bottom/02etc_live_conf
+++ b/scripts/live-bottom/02etc_live_conf
@@ -26,17 +26,21 @@ 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
+
+cat > /root/etc/live.conf << EOF
 export USERNAME="$USERNAME"
 export USERFULLNAME="$USERFULLNAME"
 export HOSTNAME="$HOSTNAME"