diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/rules.real | 2 | ||||
| -rw-r--r-- | debian/templates/image.plain.bug/script | 20 |
3 files changed, 23 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 909a28f9a608..eddbcfe5ce39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -160,6 +160,8 @@ linux (3.16.7-1) UNRELEASED; urgency=medium architectures (Closes: #766635) * [hppa] udeb: Add many more module packages (Closes: #766793) * iwlwifi: Backport firmware monitor from 3.17 (Closes: #767088) + * bug script: Warn if the running kernel matches the ABI name of the + package but is not the installed version [ Mauricio Faria de Oliveira ] * [ppc64el] Disable CONFIG_CMDLINE{,_BOOL} usage for setting consoles diff --git a/debian/rules.real b/debian/rules.real index bb90e5e1651d..201d3992fe71 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -395,7 +395,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug: dh_installdirs usr/share/bug/$(PACKAGE_NAME) dh_install debian/templates/image.plain.bug/* usr/share/bug/$(PACKAGE_NAME) chmod 755 $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/script - echo "RELEASE='$(ABI_VERSION)'" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info + printf "RELEASE='$(ABI_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\n" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION) install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): ABI_VERSION = $(ABINAME_INTERNAL)$(LOCALVERSION) diff --git a/debian/templates/image.plain.bug/script b/debian/templates/image.plain.bug/script index 9374b2fc49c4..3926d8f666b2 100644 --- a/debian/templates/image.plain.bug/script +++ b/debian/templates/image.plain.bug/script @@ -14,6 +14,26 @@ for file in "$dir"/include-*; do done if [ "$RELEASE" == "$(uname -r)" ]; then + running_ver="$(uname -v)" + running_ver="${running_ver#* $DISTRIBUTOR }" + running_ver="${running_ver%% *}" + if [ "$running_ver" != "$SOURCEVERSION" ]; then + cat <<EOF +You have installed version $SOURCEVERSION of +linux-image-$RELEASE, but version $running_ver is currently +running. + +You should reboot to complete the upgrade. Until you do this, some +modules may fail to load. This is NOT a bug. + +If you have already rebooted, check your boot loader configuration. + +EOF + yesno "Do you still want to report a bug? " nop + if [ "$REPLY" = nop ]; then + exit 1 + fi + fi for hook in ${hooks[@]}; do add_$hook done |