[linux-base] 02/05: read_kernelimg_conf(): Quietly ignore settings used only by kernel-package

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux-base.

commit 8d6e75e941187f1d2e2c238df2774bbfe03ec9e0
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jun 5 22:48:11 2016 +0100

    read_kernelimg_conf(): Quietly ignore settings used only by kernel-package
---
 debian/changelog   | 1 +
 lib/DebianLinux.pm | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f41c24f..cfe66e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ linux-base (4.2) UNRELEASED; urgency=medium
   * Change source format to 3.0 (native) so that .git directory is excluded
     by default
   * Add manual page for linux-update-symlinks
+  * read_kernelimg_conf(): Quietly ignore settings used only by kernel-package
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 05 Jun 2016 02:21:25 +0100
 
diff --git a/lib/DebianLinux.pm b/lib/DebianLinux.pm
index cf162dd..473da42 100644
--- a/lib/DebianLinux.pm
+++ b/lib/DebianLinux.pm
@@ -102,6 +102,11 @@ sub read_kernelimg_conf {
     # These are still set in the jessie installer even though they
     # have no effect.  Ignore them quietly.
     my @quiet_param = qw(do_bootloader do_initrd);
+    # These are used only by kernel-package, and are not relevant to
+    # anything that linux-base does.  Ignore them quietly.
+    push @quiet_param, qw(clobber_modules force_build_link
+                          relink_build_link relink_src_link
+                          silent_modules warn_reboot);
 
     # Initialise configuration to defaults
     my $conf = {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-base.git