[SCM] live-config branch, debian, updated. debian/3.0_a43-1

Daniel Baumann daniel at debian.org
Thu Jul 12 18:08:51 UTC 2012


The following commit has been merged in the debian branch:
commit 5d65c57a088961ac26b2cc21a6d66cbb2df6f147
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 9 18:12:38 2012 +0200

    Adding /etc/os-release support to hostname debconf script.

diff --git a/backends/debconf/0010-hostname b/backends/debconf/0010-hostname
index 5364b1a..c25b34b 100755
--- a/backends/debconf/0010-hostname
+++ b/backends/debconf/0010-hostname
@@ -11,6 +11,10 @@ Defaults ()
 		if [ -n "$(cat /etc/hostname 2> /dev/null)" ]
 		then
 			_HOSTNAME="$(cat /etc/hostname)"
+		elif [ -e /etc/os-release ]
+		then
+			. /etc/os-release
+			_HOSTNAME="${ID:-debian}"
 		elif [ -x /usr/bin/lsb_release ]
 		then
 			_HOSTNAME="$(lsb_release -is | tr [A-Z] [a-z])"

-- 
live-config



More information about the debian-live-changes mailing list