Index: /tools/config-node.sh
===================================================================
--- /tools/config-node.sh	(revision 4987)
+++ /tools/config-node.sh	(revision 4988)
@@ -68,5 +68,5 @@
 			;;
 		-d)	
-			DO_CMD=do_diff
+			CMD=do_diff
   			dir=${TMPDIR}
 			;;
@@ -95,26 +95,4 @@
 done
 
-echo Config Node -- Version: $VERSION '$Rev$'
-
-# Make sure we clean up our mess when needed.
-trap "rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
-
-if [ ${PRETEND} != 'yes' ]; then
-	if mount | grep "on / " | grep -q read-only; then
-		if [ ${FORCE} = "yes" ]; then
-			echo Forcing read-only disk into rw.
-			fsck / || exit 2
-			mount -o noatime -u -w / || exit 2 || exit 1
-			trap "mount -u -r /; rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
-			FORCE=rw
-		else
-			echo ERROR - disk / is mounted read only. Aborting.
-			exit 1
-		fi
-	fi
-fi
-
-export HTTP_USER_AGENT
-export TMPDIR
 
 
@@ -291,4 +269,26 @@
 }
 
+log Config Node -- Version: $VERSION '$Rev$'
+
+# Make sure we clean up our mess when needed.
+trap "rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
+
+if [ ${PRETEND} != 'yes' ]; then
+	if mount | grep "on / " | grep -q read-only; then
+		if [ ${FORCE} = "yes" ]; then
+			echo Forcing read-only disk into rw.
+			fsck / || exit 2
+			mount -o noatime -u -w / || exit 2 || exit 1
+			trap "mount -u -r /; rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
+			FORCE=rw
+		else
+			echo ERROR - disk / is mounted read only. Aborting.
+			exit 1
+		fi
+	fi
+fi
+
+export HTTP_USER_AGENT
+export TMPDIR
 
 
@@ -310,5 +310,4 @@
 fi
 
-
 if [ -r ${lcd}/myname ]; then
     default=`cat ${lcd}/myname`
@@ -316,4 +315,8 @@
     default=`hostname -s`
     test -z $default && default=none
+fi
+
+if [ ! -z ${QUIET} -a -z ${nodename} ]; then
+	nodename=${default}
 fi