From: Ben Pfaff <blp@nicira.com>
Date: Fri, 13 Mar 2009 00:22:38 +0000 (-0700)
Subject: debian: Fix confusion between dp0 and of0.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20221c5003f2b4ed092ae492e39964f6a930bd5;p=openvswitch

debian: Fix confusion between dp0 and of0.

Earlier, 'nl:0' was changed to read 'dp0' in the Debian init script, but
this didn't take into account that this would also change the name of the
"local port" for the datapath from 'of0' to 'dp0'.

The "cleanest" fix would probably be to change all the instances of of0
to dp0, but this would also require changing the names of files in the
file system (e.g. /etc/openflow-switch/of0-cert.pem), so it's easier to
just change the dp0 instances to of0.  Thanks to Reid for suggesting this
simpler fix.

Fixes bug #1056.
---

diff --git a/debian/openflow-switch.init b/debian/openflow-switch.init
index 4fb27afe..e676bfef 100755
--- a/debian/openflow-switch.init
+++ b/debian/openflow-switch.init
@@ -265,7 +265,7 @@ case "$1" in
             check_op "Removing IP address from $netdev" ifconfig $netdev 0.0.0.0
         done
 
-        must_succeed "Creating datapath" dpctl adddp dp0 $NETDEVS
+        must_succeed "Creating datapath" dpctl adddp of0 $NETDEVS
 
         xx='[0-9abcdefABCDEF][0-9abcdefABCDEF]'
         case $DATAPATH_ID in
@@ -351,7 +351,7 @@ case "$1" in
         if test "$MODE" = out-of-band; then
             set -- "$@" --out-of-band
         fi
-        set -- "$@" dp0 "$CONTROLLER"
+        set -- "$@" of0 "$CONTROLLER"
 	echo -n "Starting $DESC: "
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
 	    --exec $DAEMON -- "$@"
@@ -385,7 +385,7 @@ case "$1" in
 	    --exec $DAEMON
 	echo "$NAME."
 
-        check_op "Deleting datapath" dpctl deldp dp0
+        check_op "Deleting datapath" dpctl deldp of0
         check_op "Unloading kernel module" modprobe -r openflow_mod
 	;;
     force-stop)