Correct invocation of setup-vif-rules

Jon Ludlam · Jon Ludlam · commit 447713a8bb57 · 2013-09-15T22:52:12.000+01:00
Signed-off-by: Jon Ludlam &lt;jonathan.ludlam@eu.citrix.com&gt;
diff --git a/scripts/vif b/scripts/vif
@@ -167,13 +167,13 @@ add_to_bridge()
     esac
 
     local setup_vif_rules=$(xenstore-read "${PRIVATE}/setup-vif-rules" 2>/dev/null)
-    $setup_vif_rules $XENOPSD_BACKEND $XENBUS_TYPE $DOMUUID $DEVID filter         || logger -t scripts-vif "Failed to setup-vif-rules $XENBUS_TYPE $DOMID $DEVID filter"
+    $setup_vif_rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID filter         || logger -t scripts-vif "Failed to setup-vif-rules $XENOPSD_BACKEND ${dev} $DOMID $DEVID filter"
 }
 
 remove_from_bridge()
 {
     local setup_vif_rules=$(xenstore-read "${PRIVATE}/setup-vif-rules" 2>/dev/null)
-    $setup_vif_rules $XENOPSD_BACKEND $XENBUS_TYPE $DOMUUID $DEVID clear          || logger -t scripts-vif "Failed to setup-vif-rules $XENBUS_TYPE $DOMID $DEVID clear"
+    $setup_vif_rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID clear          || logger -t scripts-vif "Failed to setup-vif-rules $XENOPSD_BACKEND ${dev} $DOMID $DEVID clear"
 
     case $NETWORK_MODE in
     bridge)

Original file line number	Diff line number	Diff line change
`@@ -167,13 +167,13 @@ add_to_bridge()`
`167`	`167`	`esac`
`168`	`168`
`169`	`169`	`local setup_vif_rules=$(xenstore-read "${PRIVATE}/setup-vif-rules" 2>/dev/null)`
`170`		`- $setup_vif_rules $XENOPSD_BACKEND $XENBUS_TYPE $DOMUUID $DEVID filter \|\| logger -t scripts-vif "Failed to setup-vif-rules $XENBUS_TYPE $DOMID $DEVID filter"`
	`170`	`+ $setup_vif_rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID filter \|\| logger -t scripts-vif "Failed to setup-vif-rules $XENOPSD_BACKEND ${dev} $DOMID $DEVID filter"`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`remove_from_bridge()`
`174`	`174`	`{`
`175`	`175`	`local setup_vif_rules=$(xenstore-read "${PRIVATE}/setup-vif-rules" 2>/dev/null)`
`176`		`- $setup_vif_rules $XENOPSD_BACKEND $XENBUS_TYPE $DOMUUID $DEVID clear \|\| logger -t scripts-vif "Failed to setup-vif-rules $XENBUS_TYPE $DOMID $DEVID clear"`
	`176`	`+ $setup_vif_rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID clear \|\| logger -t scripts-vif "Failed to setup-vif-rules $XENOPSD_BACKEND ${dev} $DOMID $DEVID clear"`
`177`	`177`
`178`	`178`	`case $NETWORK_MODE in`
`179`	`179`	`bridge)`