[debian-edu-commits] debian-edu/ 01/01: cf/cf.grub: use three editfiles sections to make sure roaming and standalone get plymouth splash but no legacy device names. Thanks to Wolfgang for yet another patch!

[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 4ca144e93af1542f3e775bcdd76285f2d2f0b005
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 22 10:30:19 2016 +0200

    cf/cf.grub: use three editfiles sections to make sure roaming and standalone get plymouth splash but no legacy device names. Thanks to Wolfgang for yet another patch!
---
 cf/cf.grub       | 12 +++++++++++-
 debian/changelog |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/cf/cf.grub b/cf/cf.grub
index 52c9985..58f6b18 100644
--- a/cf/cf.grub
+++ b/cf/cf.grub
@@ -5,6 +5,16 @@
 #   systems (everywhere except on roaming machines and standalone)
 
 editfiles:
+    debian.installation.(standalone|roaming)::
+      { /etc/default/grub
+        BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"'
+          HashCommentLinesStarting 'GRUB_CMDLINE_LINUX_DEFAULT'
+          LocateLineMatching '#.*GRUB_CMDLINE_LINUX_DEFAULT.*'
+          InsertLine 'GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"'
+        EndGroup
+      }
+
+editfiles:
     debian.installation.!roaming.!standalone::
       { /etc/default/grub
         BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet"'
@@ -15,7 +25,7 @@ editfiles:
       }
 
 editfiles:
-    debian.installation.!server.!ltspclient::
+    debian.installation.!server.!ltspclient.!roaming.!standalone::
       { /etc/default/grub
         BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet splash"'
           HashCommentLinesStarting 'GRUB_CMDLINE_LINUX_DEFAULT'
diff --git a/debian/changelog b/debian/changelog
index 45f8288..efb5d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ debian-edu-config (1.916) UNRELEASED; urgency=medium
     - Adjust kernel command line settings to match groups correctly.
     - Use absolute path name for plymouth command as this is required.
 
+  [ Holger Levsen ]
+  * cf/cf.grub: use three editfiles sections to make sure roaming and
+    standalone get plymouth splash but no legacy device names. Thanks to
+    Wolfgang for yet another patch!
+
  -- Holger Levsen <holger at debian.org>  Wed, 19 Oct 2016 19:17:21 +0200
 
 debian-edu-config (1.915) unstable; urgency=medium

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