Index: freenx-0.5.0/nxsetup
===================================================================
--- freenx-0.5.0/nxsetup
+++ freenx-0.5.0/nxsetup	2006-07-12 14:40:08.000000000 +0200
@@ -20,6 +20,7 @@
 CLEAN="no"
 UNINSTALL="no"
 PURGE="no"
+FORCE="no"
 SETUP_SSH2_KEY="no"
 BUILD_KNOWN_HOSTS="yes"
 AUTOMATIC="no"
@@ -40,6 +41,7 @@
 		--clean) CLEAN="yes"; shift ;;
 		--uninstall) UNINSTALL="yes"; shift ;;
 		--purge) PURGE="yes"; shift ;;
+		--force) FORCE="yes"; shift ;;
 		--auto) AUTOMATIC="yes"; shift ;;
 		--) shift ; break ;;
 		*) echo "Invalid flag $1" ; HELP="yes"; shift ; break ;;
@@ -99,6 +101,8 @@
 	echo "  --purge                Remove extra configuration files and ssh keys when"
 	echo "                         performing a \"--uninstall\"."
 	echo "                         Note that node.conf will always be saved."
+	echo "  --force                Force nxsetup script to run, as all the configuration is"
+	echo "                         done by the rpm installation"
 	exit 0
 fi
 #Undocumented
@@ -113,6 +117,13 @@
 	exit 1
 fi
 
+if [ "$FORCE" == "no" ]; then
+	echo "Freenx server configuration is done by the rpm package."
+	echo "You don't need to run this script. If you want to force"
+	echo "running it use --force"
+	exit 1
+fi
+
 if [ "$INSTALL" = "yes" -a "$AUTOMATIC" = "no" -a "$SETUP_NOMACHINE_KEY" = "no" ]
 then
 	echo "------> It is recommended that you use the NoMachine key for"