[debian-edu-commits] r78924 - in branches/wheezy/debian-edu-install: . debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-01-31 21:15:16 +0000 (Thu, 31 Jan 2013)
New Revision: 78924

Modified:
   branches/wheezy/debian-edu-install/debian-edu-profile
   branches/wheezy/debian-edu-install/debian/changelog
   branches/wheezy/debian-edu-install/debian/debian-edu-profile-udeb.templates
Log:
* Merge fixes from version 1.529:
  - Change how the profile question is handled, to not load the
    detected default value if the debconf seen flag is set, to allow
    the value to be preseeded.
  - Make preseeding documentation match the realities, by renaming
    the debian-edu-install/profile-expert template to
    debian-edu-install/profile (and removing the old
    debian-edu-install/profile template, thus concluding the test
    that started 2010-11-05 (Closes: #695107).

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2013-01-31 17:58:30 UTC (rev 78923)
+++ branches/wheezy/debian-edu-install/debian/changelog	2013-01-31 21:15:16 UTC (rev 78924)
@@ -1,3 +1,18 @@
+debian-edu-install (1.703) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Merge fixes from version 1.529:
+    - Change how the profile question is handled, to not load the
+      detected default value if the debconf seen flag is set, to allow
+      the value to be preseeded.
+    - Make preseeding documentation match the realities, by renaming
+      the debian-edu-install/profile-expert template to
+      debian-edu-install/profile (and removing the old
+      debian-edu-install/profile template, thus concluding the test
+      that started 2010-11-05 (Closes: #695107).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 31 Jan 2013 22:12:12 +0100
+
 debian-edu-install (1.702) unstable; urgency=low
 
   [ Holger Levsen ]

Modified: branches/wheezy/debian-edu-install/debian/debian-edu-profile-udeb.templates
===================================================================
--- branches/wheezy/debian-edu-install/debian/debian-edu-profile-udeb.templates	2013-01-31 17:58:30 UTC (rev 78923)
+++ branches/wheezy/debian-edu-install/debian/debian-edu-profile-udeb.templates	2013-01-31 21:15:16 UTC (rev 78924)
@@ -5,27 +5,6 @@
 
 Template: debian-edu-install/profile
 Type: multiselect
-__Choices: Main Server, Workstation, Roaming Workstation, Thin Client Server, Standalone
-Choices-C: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone
-_Description: Profile(s) to apply to this machine:
- Profiles determine how the machine can be used out-of-the-box:
- .
-  - Main Server: reserved for the Debian Edu server. It does not
-                 include any GUI (Graphical User Interface). There
-                 should only be one such server on a Debian Edu 
-                 network.
-  - Workstation: for normal machines on the Debian Edu network.
-  - Roaming Workstation: for single user machines on the Debian Edu
-                 network which some times travel outside the network.
-  - Thin Client Server:
-                 includes 'Workstation' and requires two network
-                 cards.
-  - Standalone:  for machines meant to be used outside the Debian Edu
-                 network. It includes a GUI and conflicts with other
-                 profiles.
-
-Template: debian-edu-install/profile-expert
-Type: multiselect
 #flag:translate!:7
 #__Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 __Choices: Main Server, Workstation, Roaming Workstation, Thin Client Server, Standalone, Minimal

Modified: branches/wheezy/debian-edu-install/debian-edu-profile
===================================================================
--- branches/wheezy/debian-edu-install/debian-edu-profile	2013-01-31 17:58:30 UTC (rev 78923)
+++ branches/wheezy/debian-edu-install/debian-edu-profile	2013-01-31 21:15:16 UTC (rev 78924)
@@ -146,10 +146,6 @@
 fi
 
 template="debian-edu-install/profile"
-# Show minimal profile by default as a test [pere 2010-11-05]
-#if [ true = "$expert" ] ; then
-    template="debian-edu-install/profile-expert"
-#fi
 
 preseedfile=/tmp/debian-edu-preseed.$$
 touch $preseedfile
@@ -186,10 +182,16 @@
     log "several network cards detected, preselecting thin-client-server"
     defaultprofile="$defaultprofile, Thin-Client-Server"
 fi
-db_set "$template" "$defaultprofile"
 
+log "choosing profile"
+
+# Do not load our default if the value was preseeded
+if db_fget "$template" seen && [ "$RET" = "false" ]; then
+    log "Setting default profile to $defaultprofile"
+    db_set "$template" "$defaultprofile"
+fi
+
 #ask profile question
-log "choosing profile"
 log "Debian-edu-expert = $expert"
 
 RET=""