[SCM] live-initramfs branch, debian-next, updated. debian/1.236.2-1-4-ga1978e1

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit a1978e1a89d082d18e0bf071a785a401631025d5
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri May 21 15:06:04 2010 +0200

    Removing hostname live-bottom script, moved to live-config.

diff --git a/scripts/live b/scripts/live
index a27abd1..8996e91 100755
--- a/scripts/live
+++ b/scripts/live
@@ -120,12 +120,6 @@ Arguments ()
 				export HTTPFS
 				;;
 
-			hostname=*)
-				HOSTNAME="${ARGUMENT#hostname=}"
-				LIVECONF="changed"
-				export HOSTNAME LIVECONF
-				;;
-
 			isofrom=*|fromiso=*)
 				FROMISO="${ARGUMENT#*=}"
 				export FROMISO
@@ -1836,15 +1830,4 @@ mountroot ()
 	then
 		cp /etc/live.conf "${rootmnt}/etc/"
 	fi
-
-	# Temporary hacks until live-config is cleaned up to deal with these
-	# things on its own
-	mkdir -p "${rootmnt}/etc/live"
-
-cat >> "${rootmnt}/etc/live/config.conf" << EOF
-USERNAME="${USERNAME}"
-USERFULLNAME="${USERFULLNAME}"
-HOSTNAME="${HOSTNAME}"
-EOF
-
 }
diff --git a/scripts/live-bottom/06hostname b/scripts/live-bottom/06hostname
deleted file mode 100755
index b14703a..0000000
--- a/scripts/live-bottom/06hostname
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-if [ -n "${NOHOSTS}" ]
-then
-        exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Setting hostname"
-
-# live-initramfs script
-
-# Change hostname only if it is not set
-if [ ! -f /root/etc/hostname ] || grep -qs localhost\.localdomain /root/etc/hostname
-then
-	echo "${HOSTNAME}" > /root/etc/hostname
-else
-	HOSTNAME="$(cat /root/etc/hostname)"
-	really_export HOSTNAME
-fi
-
-# Create /etc/hosts only if it is not present or empty
-if [ ! -s /root/etc/hosts ]
-then
-	cat > /root/etc/hosts << EOF
-127.0.0.1 localhost
-127.0.1.1 ${HOSTNAME}
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-fi
-
-hostname "${HOSTNAME}"
-
-log_end_msg

-- 
live-initramfs