[debian-edu-commits] r82664 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-11-21 20:54:33 +0000 (Thu, 21 Nov 2013)
New Revision: 82664

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
Log:
Set SUDO_FORCE_REMOVE=yes in debian-edu-bless to allow it to
automatically replace sudo with sudo-ldap on Raspbian and others
like it.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-11-21 20:54:15 UTC (rev 82663)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-11-21 20:54:33 UTC (rev 82664)
@@ -10,6 +10,9 @@
   * Document in debian-edu-bless that xfce is a desktop option.
   * Make debian-edu-bless abort if the current locale is not working,
     instead of asking ldap and autofs to use a bogus LDAP server.
+  * Set SUDO_FORCE_REMOVE=yes in debian-edu-bless to allow it to
+    automatically replace sudo with sudo-ldap on Raspbian and others
+    like it.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 18 Sep 2013 14:35:10 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-11-21 20:54:15 UTC (rev 82663)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/debian-edu-bless	2013-11-21 20:54:33 UTC (rev 82664)
@@ -26,6 +26,11 @@
     exit 1
 fi
 
+# Allow sudo to be replaced by sudo-ldap in the tasksel step, even if
+# no root password is set.  This fixes a installation problem on
+# Raspbian.
+export SUDO_FORCE_REMOVE=yes
+
 # Set up this (or these) profile(s)
 # Possible values, can be combined using comma
 #   Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server,