[kernel] r22032 - in dists/sid/linux/debian: . templates/image.plain.bug

[Ben Hutchings]

Author: benh
Date: Tue Nov  4 01:22:49 2014
New Revision: 22032

Log:
bug script: Warn if the running kernel matches the ABI name of the package but is not the installed version

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/rules.real
   dists/sid/linux/debian/templates/image.plain.bug/script

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Tue Nov  4 00:31:44 2014	(r22031)
+++ dists/sid/linux/debian/changelog	Tue Nov  4 01:22:49 2014	(r22032)
@@ -160,6 +160,8 @@
     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

Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real	Tue Nov  4 00:31:44 2014	(r22031)
+++ dists/sid/linux/debian/rules.real	Tue Nov  4 01:22:49 2014	(r22032)
@@ -395,7 +395,7 @@
 	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)

Modified: dists/sid/linux/debian/templates/image.plain.bug/script
==============================================================================
--- dists/sid/linux/debian/templates/image.plain.bug/script	Tue Nov  4 00:31:44 2014	(r22031)
+++ dists/sid/linux/debian/templates/image.plain.bug/script	Tue Nov  4 01:22:49 2014	(r22032)
@@ -14,6 +14,26 @@
 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