Rename switchmon to switchui.

diff --git a/INSTALL b/INSTALL
index cbc2e45ec92783969655dea5e231d28797394826..e4e2f31e8c677012a01b7c37e22a7278f805f412 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -192,7 +192,7 @@ distribution in the ordinary way using "configure" and "make".
         ext/ezio/ezio-term.
 
       - Switch monitoring UI for small text displays:
-        ext/ezio/ofp-switchmon.
+        ext/ezio/ofp-switchui.
 
    If you passed --with-l26 to configure, "make" will also build the
    following kernel modules:

diff --git a/debian/.gitignore b/debian/.gitignore
index e99c95ebaf3656b29bc4129c34ab6256ebd77f00..bfe60c9319134900820bdbe56f41b660cb6547d1 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -20,12 +20,12 @@
 /openflow-switch
 /openflow-switch-config
 /openflow-switch.copyright
-/openflow-switchmon
-/openflow-switchmon.copyright
-/openflow-switchmon.default
-/openflow-switchmon.dirs
-/openflow-switchmon.init
-/openflow-switchmon.install
+/openflow-switchui
+/openflow-switchui.copyright
+/openflow-switchui.default
+/openflow-switchui.dirs
+/openflow-switchui.init
+/openflow-switchui.install
 /openflow-wdt
 /openflow-wdt.copyright
 /openflow-wdt.default

diff --git a/debian/openflow-switch.default b/debian/openflow-switch.default
index f8c3159f7e3de06f8459baa72f053f39aa54266f..f0ef4e051e8b79ab222f0248059b5ffb05559c0d 100644 (file)
--- a/debian/openflow-switch.default
+++ b/debian/openflow-switch.default
@@ -97,9 +97,9 @@ SWITCH_IP=dhcp
 
 # MGMT_VCONNS: List of vconns (space-separated) on which secchan
 # should listen for management connections from dpctl, etc.
-# openflow-switchmon by default connects to
+# openflow-switchui by default connects to
 # unix:/var/run/secchan.socket, so do not disable this if you want to
-# use openflow-switchmon.
+# use openflow-switchui.
 MGMT_VCONNS="punix:/var/run/secchan.socket"
 
 # COMMANDS: Access control list for the commands that can be executed

diff --git a/secchan/commands/reboot b/secchan/commands/reboot
index ba21db9fce871743709e8bc1cacf8d263f60057a..4d5145cdf3fd0563446bcb64e7d14e44784a7c26 100755 (executable)
--- a/secchan/commands/reboot
+++ b/secchan/commands/reboot
@@ -1,3 +1,3 @@
 #! /bin/sh
-ofp-kill --force --signal=USR1 ofp-switchmon.pid
+ofp-kill --force --signal=USR1 ofp-switchui.pid
 reboot