From 9dea3087a59ada8a7595a8d8d9777c1f55d1b55e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 17 Dec 2006 17:48:00 +0100 Subject: [PATCH] grml-hostname: do not execute hostname command itself --- debian/changelog | 7 +++++++ usr_sbin/grml-hostname | 20 ++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index fcb51cc..cf9798a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-scripts (0.9.9) unstable; urgency=low + + * grml-hostname: do not execute 'hostname $NEWHOSTNAME', the + initscript should handle that for us. + + -- Michael Prokop Sun, 17 Dec 2006 17:47:27 +0100 + grml-scripts (0.9.8) unstable; urgency=low * grml-setlang: use utf8 as default. Get iso stuff via $LANG-iso, diff --git a/usr_sbin/grml-hostname b/usr_sbin/grml-hostname index 6e0c840..b48449e 100755 --- a/usr_sbin/grml-hostname +++ b/usr_sbin/grml-hostname @@ -4,7 +4,7 @@ # Authors: (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Sep 30 12:36:24 CEST 2006 [mika] +# Latest change: Son Dez 17 16:23:34 CET 2006 [mika] ################################################################################ if [ $UID != 0 ] ; then @@ -38,19 +38,15 @@ retval=$? case $retval in 0) - if hostname "$HOSTNAME" 1>/dev/null 2>${TMP} ; then - echo "$HOSTNAME" > /etc/hostname - sed -i "s/^127.0.0.1[ \t]*$OLDHOSTNAME[ \t]*localhost/127.0.0.1 $HOSTNAME localhost/" /etc/hosts - sed -i "s/^::1[ \t]*ip6-localhost ip6-loopback[ \t]*$OLDHOSTNAME/::1 ip6-localhost ip6-loopback $HOSTNAME/" /etc/hosts - POSTFIX='' - if [ -r /etc/postfix/main.cf ] ; then - sed -i "s/^myhostname = .*/myhostname = $HOSTNAME/" /etc/postfix/main.cf && POSTFIX=' + echo "$HOSTNAME" > /etc/hostname + sed -i "s/^127.0.0.1[ \t]*$OLDHOSTNAME[ \t]*localhost/127.0.0.1 $HOSTNAME localhost/" /etc/hosts + sed -i "s/^::1[ \t]*ip6-localhost ip6-loopback[ \t]*$OLDHOSTNAME/::1 ip6-localhost ip6-loopback $HOSTNAME/" /etc/hosts + POSTFIX='' + if [ -r /etc/postfix/main.cf ] ; then + sed -i "s/^myhostname = .*/myhostname = $HOSTNAME/" /etc/postfix/main.cf && POSTFIX=' Configuration of myhostname in /etc/postfix/main.cf has been adjusted as well. Do not forget to restart postfix if necessary.' - fi - dialog --stdout --title "${PN}" --msgbox "Setting hostname to $HOSTNAME was successful.$POSTFIX" 0 0 - else - dialog --stdout --title "${PN}" --msgbox "Error when setting hostname to $HOSTNAME: `cat $TMP`" 0 0 fi + dialog --stdout --title "${PN}" --msgbox "Setting hostname to $HOSTNAME was successful.$POSTFIX" 0 0 ;; 1) echo "Cancel pressed." -- 2.1.4