From d4dcda87d0db4d06af5ea3d1abd44bbb5823f754 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Mon, 1 Mar 2010 12:34:41 +0100
Subject: [PATCH] grml-hostname: address xauth issue.

---
 debian/changelog       |  9 +++++++++
 usr_sbin/grml-hostname | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 747d2c8..803a5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-scripts (1.2.10) unstable; urgency=low
+
+  * grml-hostname: address xauth issue when changing hostname
+    within running X session. Now we can also set the hostname
+    directly within grml-hostname, no need to execute
+    /etc/init.d/hostname.sh manually afterwards any longer.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 01 Mar 2010 12:33:17 +0100
+
 grml-scripts (1.2.9) unstable; urgency=low
 
   * caps-ctrl: using $(...) instead of backticks and do not load
diff --git a/usr_sbin/grml-hostname b/usr_sbin/grml-hostname
index 1c958a0..d512823 100755
--- a/usr_sbin/grml-hostname
+++ b/usr_sbin/grml-hostname
@@ -10,6 +10,8 @@
 
 check4root || exit 1
 
+[ -n "$SUDO_USER" ] && RUNASUSER=$SUDO_USER || RUNASUSER=grml
+
 PN='grml-hostname'
 OLDHOSTNAME="$(hostname)"
 
@@ -47,6 +49,14 @@ case $retval in
        sed -i "s/^myhostname = .*/myhostname = $NEW_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
+     if [ -n "$DISPLAY" ] ; then
+       if sudo -u $RUNASUSER xauth add $(xauth -n list | grep "${OLDHOSTNAME}/unix:0" | sed "s|${OLDHOSTNAME}/unix:0|${NEW_HOSTNAME}/unix:0|") ; then
+	  sudo -u $RUNASUSER xauth remove "${OLDHOSTNAME}/unix:0"
+       fi
+     fi
+
+     /etc/init.d/hostname.sh
+
      if [ -z "$NONINTERACTIVE" ] ; then
         dialog --stdout --title "${PN}" --msgbox "Setting hostname to $NEW_HOSTNAME was successful.$POSTFIX" 0 0
      else
-- 
2.1.4