[Pkg-sysvinit-commits] r153 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-19 10:21:27 +0000 (Sat, 19 Nov 2005)
New Revision: 153

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh
Log:
  * Print message when hostname is set.  Use default 'localhost' if no
    hostname is set in /etc/hostname, and no current hostname is set.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-19 08:24:25 UTC (rev 152)
+++ sysvinit/trunk/debian/changelog	2005-11-19 10:21:27 UTC (rev 153)
@@ -13,6 +13,8 @@
   * Make sure checkroot.sh calls mountvirtfs with argument 'start', to
     avoid usage message and making sure it is executed as it
     should. (Closes: #338966, #339351)
+  * Print message when hostname is set.  Use default 'localhost' if no
+    hostname is set in /etc/hostname, and no current hostname is set.
 
   [ Thomas Hood ]
   * Improve update-rc.d man page text.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh	2005-11-19 08:24:25 UTC (rev 152)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh	2005-11-19 10:21:27 UTC (rev 153)
@@ -12,11 +12,20 @@
 # Version:	@(#)hostname.sh  1.10  26-Feb-2001  miquels at cistron.nl
 #
 
+. /lib/lsb/init-functions
+
 do_start () {
-	if [ -f /etc/hostname ]
-	then
-		hostname --file /etc/hostname
-	fi
+	[ -f /etc/hostname ] && HOSTNAME=`cat /etc/hostname`
+
+	# Keep current name if /etc/hostname is missing.
+	[ -z "$HOSTNAME" ] && HOSTNAME=`hostname`
+
+	# And set it to 'localhost' if no setting was found
+	[ -z "$HOSTNAME" ] && HOSTNAME=localhost
+
+	log_action_begin_msg "Setting hostname '$HOSTNAME'"
+	hostname "$HOSTNAME"
+	log_action_end_msg $?
 }
 
 case "$1" in