[debian-edu-commits] debian-edu/ 01/01: cf.grub: configure plymouth on all installations except servers and LTSP client to show a nice bootsplash. (Closes: #582571)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit 4a477bebfc070209311fedf2085d9be1845e142e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Oct 19 19:18:47 2016 +0200

    cf.grub: configure plymouth on all installations except servers and LTSP client to show a nice bootsplash. (Closes: #582571)
---
 cf/cf.grub       | 18 +++++++++++++++---
 debian/changelog |  7 +++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/cf/cf.grub b/cf/cf.grub
index a3ac8c2..0d6ad92 100644
--- a/cf/cf.grub
+++ b/cf/cf.grub
@@ -1,10 +1,20 @@
 #
-# Handle the network interface setup (keep old device names) for
-# networked systems.
+# Configure GRUB:
+# - for plymouth (everywhere except on servers and ltsp-clients)
+# - handle the network interface setup (keep old device names) for networked
+#   systems (everywhere except on roaming machines and standalone)
 
 editfiles:
     debian.installation.!roaming.!standalone::
       { /etc/default/grub
+        BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet splash"'
+          HashCommentLinesStarting 'GRUB_CMDLINE_LINUX_DEFAULT'
+          LocateLineMatching '#.*GRUB_CMDLINE_LINUX_DEFAULT.*'
+          InsertLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet splash"'
+        EndGroup
+      }
+    debian.installation.!server.!ltsp-client::
+      { /etc/default/grub
         BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet"'
           HashCommentLinesStarting 'GRUB_CMDLINE_LINUX_DEFAULT'
           LocateLineMatching '#.*GRUB_CMDLINE_LINUX_DEFAULT.*'
@@ -13,5 +23,7 @@ editfiles:
       }
 
 shellcommands:
-    debian.installation.!roaming.!standalone::
+    debian.installation::
         "/usr/sbin/update-grub"
+    debian.installation.!server.!ltsp-client::
+        "plymouth-set-default-theme lines"
diff --git a/debian/changelog b/debian/changelog
index ded02f3..201839e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-config (1.916) UNRELEASED; urgency=medium
+
+  * cf.grub: configure plymouth on all installations except servers and LTSP
+    client to show a nice bootsplash. (Closes: #582571)
+
+ -- Holger Levsen <holger at debian.org>  Wed, 19 Oct 2016 19:17:21 +0200
+
 debian-edu-config (1.915) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git