From f2037271d1eabaac3bc9d9a4ea6fa8ed046a3f5a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 5 Jan 2014 18:33:11 +0000 Subject: [PATCH] linux-image: Make maintainer scripts less verbose (Closes: #734266) svn path=/dists/sid/linux/; revision=20955 --- debian/changelog | 1 + debian/templates/image.plain.postinst.in | 7 ++----- debian/templates/image.plain.postrm.in | 6 ++---- debian/templates/image.plain.preinst.in | 6 ++---- debian/templates/image.plain.prerm.in | 6 ++---- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index ee6a6b068..f02b67176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ linux (3.12.6-3) UNRELEASED; urgency=low - Enable DEBUG_STACKOVERFLOW - udeb: Build packages for the parisc64-smp flavour instead of the removed parisc flavour (fixes FTBFS) + * linux-image: Make maintainer scripts less verbose (Closes: #734266) -- Ben Hutchings Thu, 02 Jan 2014 01:26:59 +0000 diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in index 020421324..978e4fd73 100755 --- a/debian/templates/image.plain.postinst.in +++ b/debian/templates/image.plain.postinst.in @@ -471,7 +471,6 @@ sub image_magic { ###################################################################### sub do_modules { - print STDERR "Running depmod.\n"; my $ret = system("depmod -a -F $realimageloc/System.map-$version $version"); my $exit_value = $? >> 8; my $signal_num = $? & 127; @@ -585,16 +584,14 @@ if ($postinst_hook) { } if (-d "/etc/kernel/postinst.d") { - print STDERR "Examining /etc/kernel/postinst.d.\n"; - system ("run-parts --verbose --exit-on-error --arg=$version " . + system ("run-parts --report --exit-on-error --arg=$version " . "--arg=$realimageloc$kimage-$version " . "/etc/kernel/postinst.d") && die "Failed to process /etc/kernel/postinst.d"; } if (-d "/etc/kernel/postinst.d/$version") { - print STDERR "Examining /etc/kernel/postinst.d/$version.\n"; - system ("run-parts --verbose --exit-on-error --arg=$version " . + system ("run-parts --report --exit-on-error --arg=$version " . "--arg=$realimageloc$kimage-$version " . "/etc/kernel/postinst.d/$version") && die "Failed to process /etc/kernel/postinst.d/$version"; diff --git a/debian/templates/image.plain.postrm.in b/debian/templates/image.plain.postrm.in index 7a41e73aa..016ba5489 100755 --- a/debian/templates/image.plain.postrm.in +++ b/debian/templates/image.plain.postrm.in @@ -204,15 +204,13 @@ if ($postrm_hook) { &run_hook("postrm", $postrm_hook); } if (-d "/etc/kernel/postrm.d") { - warn "Examining /etc/kernel/postrm.d .\n"; - system ("run-parts --verbose --exit-on-error --arg=$version " . + system ("run-parts --report --exit-on-error --arg=$version " . "--arg=$realimageloc$kimage-$version " . "/etc/kernel/postrm.d") && die "Failed to process /etc/kernel/postrm.d"; } if (-d "/etc/kernel/postrm.d/$version") { - warn "Examining /etc/kernel/postrm.d/$version .\n"; - system ("run-parts --verbose --exit-on-error --arg=$version " . + system ("run-parts --report --exit-on-error --arg=$version " . "--arg=$realimageloc$kimage-$version " . "/etc/kernel/postrm.d/$version") && die "Failed to process /etc/kernel/postrm.d/$version"; diff --git a/debian/templates/image.plain.preinst.in b/debian/templates/image.plain.preinst.in index d98266ecb..608a34c4d 100755 --- a/debian/templates/image.plain.preinst.in +++ b/debian/templates/image.plain.preinst.in @@ -102,15 +102,13 @@ if (-x "$preinst_hook") { &run_hook("preinst", $preinst_hook); } if (-d "/etc/kernel/preinst.d") { - print STDERR "Examining /etc/kernel/preinst.d/\n"; - system ("run-parts --verbose --exit-on-error --arg=$version" . + system ("run-parts --report --exit-on-error --arg=$version" . " --arg=$realimageloc$kimage-$version" . " /etc/kernel/preinst.d") && die "Failed to process /etc/kernel/preinst.d"; } if (-d "/etc/kernel/preinst.d/$version") { - print STDERR "Examining /etc/kernel/preinst.d/$version.\n"; - system ("run-parts --verbose --exit-on-error --arg=$version" . + system ("run-parts --report --exit-on-error --arg=$version" . " --arg=$realimageloc$kimage-$version" . " /etc/kernel/preinst.d/$version") && die "Failed to process /etc/kernel/preinst.d/$version"; diff --git a/debian/templates/image.plain.prerm.in b/debian/templates/image.plain.prerm.in index b831f068e..bedb5037a 100755 --- a/debian/templates/image.plain.prerm.in +++ b/debian/templates/image.plain.prerm.in @@ -143,14 +143,12 @@ if (-x "$prerm_hook") { &run_hook("prerm", $prerm_hook); } if (-d "/etc/kernel/prerm.d") { - print STDERR "Examining /etc/kernel/prerm.d.\n"; - system ("run-parts --verbose --exit-on-error --arg=$version " . + system ("run-parts --report --exit-on-error --arg=$version " . "--arg=$realimageloc$kimage-$version /etc/kernel/prerm.d") && die "Failed to process /etc/kernel/prerm.d"; } if (-d "/etc/kernel/prerm.d/$version") { - print STDERR "Examining /etc/kernel/prerm.d/$version.\n"; - system ("run-parts --verbose --exit-on-error --arg=$version" . + system ("run-parts --report --exit-on-error --arg=$version" . " --arg=$realimageloc$kimage-$version " . "/etc/kernel/prerm.d/$version") && die "Failed to process /etc/kernel/prerm.d/$version";