r2665 - in dists/trunk/live-helper: debian docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-04 10:41:17 +0000 (Sat, 04 Aug 2007)
New Revision: 2665

Modified:
   dists/trunk/live-helper/debian/changelog
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_chroot_hostname
Log:


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-08-04 10:36:52 UTC (rev 2664)
+++ dists/trunk/live-helper/debian/changelog	2007-08-04 10:41:17 UTC (rev 2665)
@@ -1,6 +1,7 @@
 live-helper (1.0~a22-1) UNRELEASED; urgency=medium
 
-  * New upstream release.
+  * New upstream release:
+    - Using fake hostname instead of setting it at build-time (Closes: #435699).
 
  -- Daniel Baumann <daniel at debian.org>  Mon,  6 Aug 2007 00:00:00 +0200
 

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-04 10:36:52 UTC (rev 2664)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-04 10:41:17 UTC (rev 2665)
@@ -1,3 +1,9 @@
+2007-08-04  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_hostname:
+	  - Installing fake hostname, less intrusive approach for the build
+	    system (Closes: #435699).
+
 2007-08-03  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_chroot_apt:

Modified: dists/trunk/live-helper/helpers/lh_chroot_hostname
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hostname	2007-08-04 10:36:52 UTC (rev 2664)
+++ dists/trunk/live-helper/helpers/lh_chroot_hostname	2007-08-04 10:41:17 UTC (rev 2665)
@@ -48,18 +48,22 @@
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/etc/hostname ]
-		then
-			# Save hostname file
-			mv chroot/etc/hostname chroot/etc/hostname.orig
-		fi
+		# Save hostname
+		mv chroot/bin/hostname chroot/bin/hostname.orig
 
 		# Create hostname file
 		echo "localhost.localdomain" > chroot/etc/hostname
 
-		# Set hostname
-		Chroot "hostname -F /etc/hostname"
+		# Create hostname program
 
+cat > chroot/bin/hostname << EOF
+#!/bin/sh
+
+echo "localhost.localdomain"
+EOF
+
+		chmod 755 chroot/bin/hostname
+
 		# Creating stage file
 		Create_stagefile .stage/chroot_hostname
 		;;
@@ -73,21 +77,9 @@
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/etc/hostname.orig ]
-		then
-			# Restore hostname file
-			mv chroot/etc/hostname.orig chroot/etc/hostname
-		else
-			# Remove hostname file
-			rm -f chroot/etc/hostname
-		fi
+		# Restore hostname file
+		mv chroot/bin/hostname.orig chroot/bin/hostname
 
-		# Set hostname (somehow this seems to be really needed :/)
-		if [ -f /etc/hostname ]
-		then
-			hostname -F /etc/hostname
-		fi
-
 		# Removing stage file
 		rm -f .stage/chroot_hostname
 		;;