[debian-edu-commits] debian-edu/ 01/01: Fix cf/cf.grub:

[Wolfgang Schweer]

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

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

commit ef010ab2ef62ca8a61c0319bec9768ae71299e4c
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Oct 20 14:30:00 2016 +0200

    Fix cf/cf.grub:
    
    - Use two editfiles sections to avoid syntax error.
    - Replace non existent group 'ltsp-client' with 'ltspclient'.
    - Adjust kernel command line settings to match groups correctly.
    - Use absolute path name for plymouth command as this is required.
---
 cf/cf.grub       | 16 +++++++++-------
 debian/changelog |  8 ++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/cf/cf.grub b/cf/cf.grub
index 0d6ad92..52c9985 100644
--- a/cf/cf.grub
+++ b/cf/cf.grub
@@ -7,23 +7,25 @@
 editfiles:
     debian.installation.!roaming.!standalone::
       { /etc/default/grub
-        BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet splash"'
+        BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet"'
           HashCommentLinesStarting 'GRUB_CMDLINE_LINUX_DEFAULT'
           LocateLineMatching '#.*GRUB_CMDLINE_LINUX_DEFAULT.*'
-          InsertLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet splash"'
+          InsertLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet"'
         EndGroup
       }
-    debian.installation.!server.!ltsp-client::
+
+editfiles:
+    debian.installation.!server.!ltspclient::
       { /etc/default/grub
-        BeginGroupIfNoSuchLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet"'
+        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"'
+          InsertLine 'GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 quiet splash"'
         EndGroup
       }
 
 shellcommands:
     debian.installation::
         "/usr/sbin/update-grub"
-    debian.installation.!server.!ltsp-client::
-        "plymouth-set-default-theme lines"
+    debian.installation.!server.!ltspclient::
+        "/usr/sbin/plymouth-set-default-theme lines"
diff --git a/debian/changelog b/debian/changelog
index 858ef0a..45f8288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
 debian-edu-config (1.916) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * cf.grub: configure plymouth on all installations except servers and LTSP
     clients to show a nice bootsplash. (Closes: #582571)
 
+  [ Wolfgang Schweer ]
+  * Fix cf/cf.grub:
+    - Use two editfiles sections to avoid syntax error.
+    - Replace non existent group 'ltsp-client' with 'ltspclient'.
+    - Adjust kernel command line settings to match groups correctly.
+    - Use absolute path name for plymouth command as this is required.
+
  -- 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