[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 4 commits: ldap-tools/mkslapdcert: Remove obsolete (random-seed related) workaround.

WolfgangSchweer gitlab at salsa.debian.org
Mon Oct 1 12:53:24 BST 2018


WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
02bff9ec by Wolfgang Schweer at 2018-10-01T11:29:42Z
ldap-tools/mkslapdcert: Remove obsolete (random-seed related) workaround.

- - - - -
18e3129b by Wolfgang Schweer at 2018-10-01T11:30:20Z
cf3/edu.cf: Add class definition for profile 'Minimal'.

- - - - -
d0d24602 by Wolfgang Schweer at 2018-10-01T11:30:56Z
cf3/cf.grub: Adjust configuration for systems with profile 'Minimal'.

Keep legacy interface names to ensure easier configuration as a gateway.
Don't run 'plymouth-set-default-theme', plymouth isn't used on a minimal system.

- - - - -
56dbd3a5 by Wolfgang Schweer at 2018-10-01T11:32:33Z
Document last commits in d/changelog.

- - - - -


4 changed files:

- cf3/cf.grub
- cf3/edu.cf
- debian/changelog
- ldap-tools/mkslapdcert


Changes:

=====================================
cf3/cf.grub
=====================================
@@ -17,7 +17,7 @@ files:
     "/etc/default/grub"
       edit_line => grub_conf2;
 
-  debian.server.installation::
+  debian.(server|minimal).installation::
 
     "/etc/default/grub"
       edit_line => grub_conf3;
@@ -29,7 +29,7 @@ commands:
     "/usr/sbin/update-grub"
       contain => in_shell;
 
-  debian.!server.!ltspclient.installation::
+  debian.!server.!minimal.!ltspclient.installation::
 
     "/usr/sbin/plymouth-set-default-theme lines"
       contain => in_shell;


=====================================
cf3/edu.cf
=====================================
@@ -21,6 +21,7 @@ bundle common edu
     "workstation"    and => { fileexists("/etc/desktop-profiles/debian-edu-menus.listing"), fileexists("/usr/bin/ntpq") };
     "roaming"	     expression => returnszero("/bin/grep  'Roaming-Workstation' /etc/debian-edu/config","noshell");
     "standalone"     expression => not( fileexists("/usr/bin/ntpq") );
+    "minimal"	     expression => returnszero("/bin/grep 'Minimal' /etc/debian-edu/config","noshell");
     "ltspclient"     expression => fileexists("/usr/bin/getltscfg");
     "installation"   expression => fileexists("/sbin/start-stop-daemon.REAL");
     "testinstall"    expression => returnszero("/bin/grep 'TESTINSTALL=\"true\"' /etc/debian-edu/config","noshell");


=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+debian-edu-config (2.10.39) UNRELEASED; urgency=medium
+
+  * ldap-tools/mkslapdcert: Remove obsolete (random-seed related) workaround.
+  * cf3/edu.cf: Add class definition for profile 'Minimal'.
+  * cf3/cf.grub: Adjust configuration for systems with profile 'Minimal'. Keep
+    legacy interface names to ensure easier configuration as a gateway; don't
+    run 'plymouth-set-default-theme', plymouth isn't used on a minimal system.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 30 Sep 2018 23:35:05 +0200
+
 debian-edu-config (2.10.38) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
ldap-tools/mkslapdcert
=====================================
@@ -28,13 +28,6 @@ if [ ! -f $certconf ] ; then
     echo "warning: missing certificate configuration file $certconf." 1>&2
 fi
 
-## Somtimes the installer stops when creating the certificate (#630970).
-if [ ! -f /var/lib/urandom/random-seed ] ; then
-    echo "/var/lib/urandom/random-seed not found, invoking /etc/init.d/urandom." 1>&2
-    mkdir -p /var/lib/urandom
-    /etc/init.d/urandom start
-fi
-
 mkdir -p /etc/ldap/ssl
 chmod 751 /etc/ldap/ssl
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/d7f75897248c6326d12717c9ae7e7952c8878dc6...56dbd3a5aaba7b60088717bafcfa13f13d49de85

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/d7f75897248c6326d12717c9ae7e7952c8878dc6...56dbd3a5aaba7b60088717bafcfa13f13d49de85
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181001/617c7d2b/attachment-0001.html>


More information about the debian-edu-commits mailing list