From 69bd31ca5e652942465995e320b7852fc5cf2a06 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 12 Nov 2007 11:16:34 +0100 Subject: [PATCH] Support kernel upgrades via according /etc/kernel-img.conf configuration --- debian/changelog | 1 + etc/grml/fai/config/hooks/instsoft.GRMLBASE | 9 ++++++++- etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build | 9 ++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e0001fc..bcee289 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ grml-live (0.0.9) unstable; urgency=low * Disable apt-listbugs in [soft]update. * Fix 'dependency problems' handling in buildd functions. * Add buildd/remove_isos.sh to remove generated ISOs. + * Support kernel upgrades via according /etc/kernel-img.conf configuration. * Add new packages to GRML_FULL: - hdapsd - hdaps-utils diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 15093e4..ac85fd9 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mon Nov 05 22:48:02 CET 2007 [mika] +# Latest change: Mon Nov 12 11:14:32 CET 2007 [mika] ################################################################################ set -u @@ -44,6 +44,13 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then //DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2"; EOF + # make sure we can handle kernel upgrades: + if [ -r $target/etc/kernel-img.conf ] ; then + if ! grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then + echo "silent_modules = Yes" >> $target/etc/kernel-img.conf + fi + fi + if [ -r /etc/grml/fai/apt/sources.list ] ; then if [ -L $target/etc/apt/sources.list ] ; then rm $target/etc/apt/sources.list diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build index 505abd1..9f0ae40 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build +++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Nov 04 22:28:54 CET 2007 [mika] +# Latest change: Mon Nov 12 11:15:56 CET 2007 [mika] ################################################################################ set -u @@ -22,6 +22,13 @@ if [ -r $target/etc/policy-rc.d.conf ] ; then sed -i "s/EXITSTATUS='101'/EXITSTATUS='0'/" $target/etc/policy-rc.d.conf fi +# Restore usual behaviour: +if [ -r $target/etc/kernel-img.conf ] ; then + if grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then + sed -i "s/silent_modules = Yes/# &/" $target/etc/kernel-img.conf + fi +fi + # remove an existing /etc/debian_chroot file: if [ -r $target/etc/debian_chroot ] ; then rm -f $target/etc/debian_chroot -- 2.1.4