summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2019-05-17 16:50:28 +0000
committerPMR <pmr@pmr-lander>2019-05-17 16:50:28 +0000
commitacd71a3ca8fc47d2ff75f3e8e00cd0dcb63497f6 (patch)
tree84afaf377f5a1f91214aa1730f9e5cf64fdc865b
parentaeb4b79512e0ee8c4c1184bef8b60dea3318b094 (diff)
parent9343438b143bb2afeb80e8bf3a93c74b061ddf9b (diff)
Merge #367580 from ~bladernr/plainbox-provider-checkbox:1829538-get-netplan-config
-rwxr-xr-xbin/network_configs16
-rw-r--r--units/info/jobs.pxu7
-rw-r--r--units/info/test-plan.pxu1
3 files changed, 24 insertions, 0 deletions
diff --git a/bin/network_configs b/bin/network_configs
new file mode 100755
index 0000000..b2fcc99
--- /dev/null
+++ b/bin/network_configs
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if `grep -q "replaced by netplan" /etc/network/interfaces`; then
+ # Get our configs from netplan
+ for directory in "etc" "run" "lib"; do
+ for configfile in `find /$directory/netplan -type f -name *.yaml`; do
+ echo "Config File $configfile:"
+ cat $configfile
+ echo ""
+ done
+ done
+else
+ # get configs from Network Manager instead
+ echo "Network Manager:"
+ nmcli device show
+fi
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index 93ccd92..2e1b120 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -452,3 +452,10 @@ command:
lstopo $PLAINBOX_SESSION_SHARE/lstopo_visual.png; \
[ -e "$PLAINBOX_SESSION_SHARE/lstopo_visual.png" ] && \
cat "$PLAINBOX_SESSION_SHARE/lstopo_visual.png"
+
+id: info/network-config
+plugin: attachment
+category_id: com.canonical.plainbox::info
+estimated_duration: 0.2
+_summary: attach network configuration
+command: network_configs
diff --git a/units/info/test-plan.pxu b/units/info/test-plan.pxu
index d293954..6e59a73 100644
--- a/units/info/test-plan.pxu
+++ b/units/info/test-plan.pxu
@@ -70,6 +70,7 @@ include:
efi_attachment
info/disk_partitions
info/hdparm_.*.txt
+ info/network-config
installer_debug.gz
kernel_cmdline_attachment
lsblk_attachment