X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F02etc_live_conf;h=1623de8a266a95081b48476e4bcafec439ebb2ca;hb=845dee811a0159b75422eb7e4cfb6c860d39690b;hp=f0bbd9656cb4886d1d0e937978adf4bfa55d2ae4;hpb=0a854a1e9307affdeaf96cb3ec0c864b171d66ca;p=live-boot-grml.git

diff --git a/scripts/live-bottom/02etc_live_conf b/scripts/live-bottom/02etc_live_conf
index f0bbd96..1623de8 100755
--- a/scripts/live-bottom/02etc_live_conf
+++ b/scripts/live-bottom/02etc_live_conf
@@ -1,39 +1,51 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Copying config on real root fs..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+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
+
+log_end_msg