Scrub /etc/network/interfaces whether or not the running kernel matches
svn path=/dists/sid/linux-2.6/; revision=15406
This commit is contained in:
parent
c1d1882cfe
commit
bff850f9b2
|
@ -76,6 +76,8 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
|
||||||
- ata_piix, pata_oldpiix, pata_mpiix mostly replace piix
|
- ata_piix, pata_oldpiix, pata_mpiix mostly replace piix
|
||||||
- ata_generic, pata_ns87410, pata_netcell replace ide-pci-generic
|
- ata_generic, pata_ns87410, pata_netcell replace ide-pci-generic
|
||||||
* linux-base: Add libata transition script
|
* linux-base: Add libata transition script
|
||||||
|
* Hide sensitive information when including network configuration in bug
|
||||||
|
reports and running a different kernel version
|
||||||
|
|
||||||
[ Martin Michlmayr ]
|
[ Martin Michlmayr ]
|
||||||
* Add some ARM patches from git:
|
* Add some ARM patches from git:
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
add_network() {
|
_add_etc_network_interfaces() {
|
||||||
yesno "Include network configuration and status from this computer? " nop
|
|
||||||
test $REPLY = yep || return 0
|
|
||||||
|
|
||||||
echo '** Network interface configuration:' >&3
|
echo '** Network interface configuration:' >&3
|
||||||
# Hide passwords/keys
|
# Hide passwords/keys
|
||||||
awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); }
|
awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); }
|
||||||
|
@ -9,6 +6,13 @@ add_network() {
|
||||||
!/^[[:space:]]*\#/ { print; }
|
!/^[[:space:]]*\#/ { print; }
|
||||||
' </etc/network/interfaces >&3
|
' </etc/network/interfaces >&3
|
||||||
echo >&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
|
echo '** Network status:' >&3
|
||||||
if command -v ip >/dev/null; then
|
if command -v ip >/dev/null; then
|
||||||
echo '*** IP interfaces and addresses:' >&3
|
echo '*** IP interfaces and addresses:' >&3
|
||||||
|
@ -36,7 +40,5 @@ ask_network() {
|
||||||
yesno "Include network configuration from this computer? " nop
|
yesno "Include network configuration from this computer? " nop
|
||||||
test $REPLY = yep || return 0
|
test $REPLY = yep || return 0
|
||||||
|
|
||||||
echo '** Network interface configuration:' >&3
|
_add_etc_network_interfaces
|
||||||
cat /etc/network/interfaces >&3
|
|
||||||
echo >&3
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue