[debian-edu-commits] r80475 - trunk/src/debian-edu-config/debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-09 22:39:24 +0000 (Sun, 09 Jun 2013)
New Revision: 80475

Modified:
   trunk/src/debian-edu-config/debian/debian-edu-config.postinst
Log:
Shortercode.

Modified: trunk/src/debian-edu-config/debian/debian-edu-config.postinst
===================================================================
--- trunk/src/debian-edu-config/debian/debian-edu-config.postinst	2013-06-09 22:23:20 UTC (rev 80474)
+++ trunk/src/debian-edu-config/debian/debian-edu-config.postinst	2013-06-09 22:39:24 UTC (rev 80475)
@@ -27,7 +27,7 @@
 	    clearpwd=true
 	fi
     done
-    if $clearpwd ; then
+    wipepwdsfromdebconf() {
 	cat <<EOF
 debian-edu-config debian-edu-config/kdc-password password
 debian-edu-config debian-edu-config/kdc-password-again password
@@ -36,14 +36,10 @@
 debian-edu-config debian-edu-config/first-user-password password
 EOF
 	) | debconf-set-selections
-	cat <<EOF
-debian-edu-config debian-edu-config/kdc-password password
-debian-edu-config debian-edu-config/kdc-password-again password
-debian-edu-config debian-edu-config/ldap-password password
-debian-edu-config debian-edu-config/ldap-password-again password
-debian-edu-config debian-edu-config/first-user-password password
-EOF
-	) | debconf-set-selections
+    }
+    if $clearpwd ; then
+	wipepwdsfromdebconf
+	wipepwdsfromdebconf
     fi
 fi