diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-06-04 09:39:37 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:53:26 +0100 |
| commit | 8b3bea69df843fa1642ef836f2cfa80e80da0f7c (patch) | |
| tree | 1a933943caa8ba549317ab6248df95cbb6536050 /scripts | |
| parent | d4943aab270a6e43662d63220e4c9e3315b01987 (diff) | |
| download | live-boot-8b3bea69df843fa1642ef836f2cfa80e80da0f7c.tar.gz live-boot-8b3bea69df843fa1642ef836f2cfa80e80da0f7c.zip | |
Dropping /etc/live.conf, replaced mostly by /etc/live/config.conf of live-config.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/02etc_live_conf | 51 | ||||
| -rwxr-xr-x | scripts/live-bottom/25configure_init | 2 |
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}" ] |