--- /root/opt-sge-inst_sge	2013-05-17 15:01:04.000000000 +1200
+++ sge/inst_sge	2013-07-26 13:59:05.260573206 +1200
@@ -52,7 +52,7 @@
 
 # Easy way to prevent clearing of screen
 #
-CLEAR=clear
+CLEAR=echo
 
 # The same as clear!
 #
@@ -386,7 +386,13 @@
    ErrUsage
 fi
 
-PreInstallCheck
+$INFOTEXT "Exporting AUTO %s, QMASTER %s, EXECD %s" $AUTO $QMASTER $EXECD
+export AUTO
+export QMASTER
+export EXECD
+
+#PreInstallCheck
+PreInstallCheckExecd
 
 #checking the autoinstall configuration file at this point of installation,
 #because the commandline switches are completely parsed and we know the selected options.
@@ -910,7 +916,86 @@
     Stdout2Log
     LogResolvedHostLists
 
+    if [ -f "$SGE_ROOT/$CELL_NAME/common/settings.sh" ]; then
     . "$SGE_ROOT/$CELL_NAME/common/settings.sh"
+    else
+# Sanity check: don't overwite anything
+       $INFOTEXT -log "KMB: No settings.sh\n"
+       if [ -d "$SGE_ROOT/$CELL_NAME/common" ]; then
+           $INFOTEXT -log "KMB: There's a common directory! Not overwriting\n"
+           exit 4
+       else
+           $INFOTEXT -log "KMB: Creating and populating common directory\n"
+           SGE_ROOT_VAL=$SGE_ROOT
+           SGE_CELL_VAL=$SGE_CELL
+           COMMONDIR=$SGE_CELL/common
+           GetAdminUser
+# Some these come direct from the Template file rather than create copies
+#  of routines that only exist in the install_qmaster.sh
+#
+# Dupl     SelectHostNameResolving()
+           IGNORE_FQDN_DEFAULT=$HOSTNAME_RESOLVING
+           $INFOTEXT -log "Using >%s< as IGNORE_FQDN_DEFAULT." "$IGNORE_FQDN_DEFAULT"
+           $INFOTEXT -log "If it is >true<, the domain name will be ignored."
+
+           if [ "$IGNORE_FQDN_DEFAULT" = "false" ]; then
+#              GetDefaultDomain()
+               $INFOTEXT -log "Using >%s< as default domain." $DEFAULT_DOMAIN
+               CFG_DEFAULT_DOMAIN=$DEFAULT_DOMAIN
+           else
+               CFG_DEFAULT_DOMAIN=none
+           fi
+# Dpul End
+# Dupl     SetSpoolingOptionsDynamic()
+           case $SPOOLING_METHOD in 
+              classic)
+#                SetSpoolingOptionsClassic()
+                 SPOOLING_LIB=libspoolc
+                 SPOOLING_ARGS="$SGE_ROOT_VAL/$COMMONDIR;$QMDIR"
+                 ;;
+              berkeleydb)
+#                SetSpoolingOptionsBerkeleyDB()
+                 SPOOLING_LIB=libspoolb
+                 SPOOLING_DIR="$DB_SPOOLING_DIR"
+                 SPOOLING_ARGS="$SPOOLING_DIR"
+                 ;;
+              *)
+                 $INFOTEXT "\nUnknown spooling method. Exit."
+                 $INFOTEXT -log "\nUnknown spooling method. Exit."
+                 MoveLog
+                 exit 1
+                 ;;
+           esac
+# Dpul End
+# Dupl    GetQmasterSpoolDir()
+           QMDIR="$QMASTER_SPOOL_DIR"
+           $INFOTEXT -log "Using >%s< as QMASTER_SPOOL_DIR." "$QMDIR"
+# Dpul End
+           SetProductModeExecd
+           MakeDirsExecd
+           AddBootstrapExecd
+           if [ -z $QMASTER_HOSTNAME ]; then
+               $INFOTEXT -log "No QMASTER_HOSTNAME defined. Exit"
+               exit 3
+           else
+               $INFOTEXT -log "Using >%s< as qmaster" $QMASTER_HOSTNAME
+           fi
+           AddActQmasterExecd
+           AddCommonFilesExecd
+           $INFOTEXT -log "Exporting ROOT %s,  CELL %s, MPORT %s, EPORT %s, CNAME %s" $SGE_ROOT $SGE_CELL $SGE_QMASTER_PORT $SGE_EXECD_PORT $SGE_CLUSTER_NAME
+           export SGE_ROOT
+           export SGE_CELL
+           export SGE_QMASTER_PORT
+           export SGE_EXECD_PORT
+           export SGE_CLUSTER_NAME
+           ProcessSGEClusterNameExecd execd
+           CreateSettingsFileExecd
+           GetLocalExecdSpoolDirExecd
+           CreateSGEStartUpScripts 0 true execd
+           AddSGEStartUpScript $euid execd
+           exit 2
+      fi
+    fi
     GetAdminUser
 
     if [ -f "$SGE_ROOT/$SGE_CELL/common/bootstrap" ]; then