[debian-edu-commits] r79744 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/d-i

[pere at alioth.debian.org]

Author: pere
Date: 2013-04-23 19:11:16 +0000 (Tue, 23 Apr 2013)
New Revision: 79744

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install
Log:
Change finish-install for d-i to not try to submit to sitesummary
when installing a Main-Server.  It will become its own collector
after installation.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-23 06:00:19 UTC (rev 79743)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-23 19:11:16 UTC (rev 79744)
@@ -2,6 +2,9 @@
 
   * Correct rdp-server testsuite check to only run on Thin Client
     Servers, not Main Servers.  I used the wrong condition originally.
+  * Change finish-install for d-i to not try to submit to sitesummary
+    when installing a Main-Server.  It will become its own collector
+    after installation.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 23 Apr 2013 07:59:51 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install	2013-04-23 06:00:19 UTC (rev 79743)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/d-i/finish-install	2013-04-23 19:11:16 UTC (rev 79744)
@@ -46,6 +46,9 @@
     fi
 }
 
+db_get debian-edu-install/profile
+PROFILE="$RET"
+
 # Register changes before and after cfengine is executed, to make it
 # easier to track our changes
 edu-etcvcs commit
@@ -90,10 +93,13 @@
 
 edu-etcvcs commit
 
-# Try to submit to sitesummary at the end of the installation, to try
-# to avoid one extra boot to update hostname from DNS after updating
-# GOsa.
-if [ -x /target/usr/sbin/sitesummary-client ] ; then
+# For non-Main-Server profiles, try to submit to sitesummary at the
+# end of the installation, to try to avoid one extra boot to update
+# hostname from DNS after updating GOsa.  Main-Server will become its
+# own collector, so no need to try to submit here.
+if echo $PROFILE | grep -q Main-Server ; then
+    :
+elif [ -x /target/usr/sbin/sitesummary-client ] ; then
     in-target /usr/sbin/sitesummary-client || true
 fi