← Back to team overview

curtin-dev team mailing list archive

[Merge] ~mwhudson/curtin:bye-route-hello-ip into curtin:master

 

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:bye-route-hello-ip into curtin:master.

Commit message:
tools/find-tgt: use 'ip route' instead of 'route'

route(8) is (a) ancient (b) apparently not installed on some CI hosts



Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/427468
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:bye-route-hello-ip into curtin:master.
diff --git a/tools/find-tgt b/tools/find-tgt
index 435dde2..14aba4d 100755
--- a/tools/find-tgt
+++ b/tools/find-tgt
@@ -29,7 +29,12 @@ EOF
 find_ipv4addr() {
     # tgtd/tgtadmin end up using a suffix from here of the control port
     local dev="" addr=""
-    dev=$(route -n | awk '$1 == "0.0.0.0" { print $8 }')
+    dev=$(ip -json route show  | python3 -c 'import json, sys
+for r in json.load(sys.stdin):
+ if r["dst"] == "default":
+  print(r["dev"])
+  break
+')
     [ -n "$dev" ] || { error "failed to find ipv4 device"; return 1; }
     addr=$(ip addr show dev "$dev" |
         awk '$1 == "inet" {gsub(/\/.*/,"", $2); print $2; exit}')

Follow ups