diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:46:42 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | fdd8036ba32ad88e83a61191cc4597ae060355d2 (patch) | |
| tree | fe1bfc2da930128100db011d642be562ed82867e /scripts/live-bottom/02etc_live_conf | |
| parent | 140b179f0ff73f3cc1c081f6e6641417a5a0788d (diff) | |
| download | live-boot-fdd8036ba32ad88e83a61191cc4597ae060355d2.tar.gz live-boot-fdd8036ba32ad88e83a61191cc4597ae060355d2.zip | |
Adding live-initramfs 1.99.2-1.
Diffstat (limited to 'scripts/live-bottom/02etc_live_conf')
| -rwxr-xr-x | scripts/live-bottom/02etc_live_conf | 24 |
1 files changed, 14 insertions, 10 deletions
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" |