Scrub /etc/network/interfaces whether or not the running kernel matches

svn path=/dists/sid/linux-2.6/; revision=15406

debian/changelog

@@ -76,6 +76,8 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
     - ata_piix, pata_oldpiix, pata_mpiix mostly replace piix
     - ata_generic, pata_ns87410, pata_netcell replace ide-pci-generic
   * linux-base: Add libata transition script
+  * Hide sensitive information when including network configuration in bug
+    reports and running a different kernel version
 
   [ Martin Michlmayr ]
   * Add some ARM patches from git:

debian/templates/image.plain.bug/include-network

@@ -1,7 +1,4 @@
-add_network() {
-  yesno "Include network configuration and status from this computer? " nop
-  test $REPLY = yep || return 0
-
+_add_etc_network_interfaces() {
   echo '** Network interface configuration:' >&3
   # Hide passwords/keys
   awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); }
@@ -9,6 +6,13 @@ add_network() {
        !/^[[:space:]]*\#/ { print; }
       ' </etc/network/interfaces >&3
   echo >&3
+}
+
+add_network() {
+  yesno "Include network configuration and status from this computer? " nop
+  test $REPLY = yep || return 0
+
+  _add_etc_network_interfaces
   echo '** Network status:' >&3
   if command -v ip >/dev/null; then
     echo '*** IP interfaces and addresses:' >&3
@@ -36,7 +40,5 @@ ask_network() {
   yesno "Include network configuration from this computer? " nop
   test $REPLY = yep || return 0
 
-  echo '** Network interface configuration:' >&3
-  cat /etc/network/interfaces >&3
-  echo >&3
+  _add_etc_network_interfaces
 }