aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Sawdey <acsawdey@linux.ibm.com>2019-06-07 10:16:25 -0500
committerStewart Smith <stewart@linux.ibm.com>2019-06-13 11:32:52 +1000
commit16aa1b111ed0183838acab7c295c198d344016a1 (patch)
tree237b4c3b0100911c4e85cb6b31ab90c0d0a600b9
parentd4f2f77377dab27eaf792aa089090bcdd953a5cc (diff)
downloadskiboot-16aa1b111ed0183838acab7c295c198d344016a1.zip
skiboot-16aa1b111ed0183838acab7c295c198d344016a1.tar.gz
skiboot-16aa1b111ed0183838acab7c295c198d344016a1.tar.bz2
external/mambo: fix tcl startup code for mambo bogus net (repost)
Repost of the same thing with Signed-off-by, and Acked-by from Michael Neuling. This fixes a couple issues with external/mambo/skiboot.tcl so I can use the mambo bogus net. * newer distros (ubuntu 18.04) allow tap device to have a user specified name instead of just tapN so we need to pass in a name not a number. * need some kind of default for net_mac, and need the mconfig for it to be set from an env var. Thanks, Aaron Acked-by: Michael Neuling <mikey at neuling.org> Signed-off-by: Aaron Sawdey <sawdey at linux.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r--external/mambo/skiboot.tcl10
1 files changed, 6 insertions, 4 deletions
diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl
index 9f424dd..292c8c4 100644
--- a/external/mambo/skiboot.tcl
+++ b/external/mambo/skiboot.tcl
@@ -72,8 +72,11 @@ mconfig rootdisk_cow_hash MAMBO_ROOTDISK_COW_HASH 1024
# Net: What type of networking: none, phea, bogus
mconfig net MAMBO_NET none
-# Net: What is the base interface for the tun/tap device
-mconfig tap_base MAMBO_NET_TAP_BASE 0
+# Net: What MAC address to use
+mconfig net_mac MAMBO_NET_MAC 00:11:22:33:44:55
+
+# Net: What is the name of the tap device
+mconfig net_tapdev MAMBO_NET_TAPDEV "tap0"
# Enable (default) or disable the "speculation-policy-favor-security" setting,
# set to 0 to disable. When enabled it causes Linux's RFI flush to be enabled.
@@ -197,8 +200,7 @@ switch $mconf(net) {
puts "No network support selected"
}
bogus - bogusnet {
- set net_tap [format "tap%d" $mconf(tap_base)]
- mysim bogus net init 0 $mconf(net_mac) $net_tap
+ mysim bogus net init 0 $mconf(net_mac) $mconf(net_tapdev)
}
default {
error "Bad net \[none | bogus]: $mconf(net)"