]> git.pld-linux.org Git - packages/lxd.git/commitdiff
format fixes (tab indent)
authorElan Ruusamäe <glen@delfi.ee>
Sun, 21 Aug 2016 19:40:26 +0000 (22:40 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Sun, 21 Aug 2016 19:40:26 +0000 (22:40 +0300)
lxd.init
lxdbr.init

index 69ad85bab836daeaeeab71fa8888eb222335f609..ec5ee36fe9ac3b31fa34474cf2a084a62971ddd0 100755 (executable)
--- a/lxd.init
+++ b/lxd.init
@@ -52,12 +52,12 @@ start() {
        done
 
        if [ -n "$pid" ]; then
-               touch /var/lock/subsys/lxd
-               ok
-               RETVAL=0
+               touch /var/lock/subsys/lxd
+               ok
+               RETVAL=0
        else
-               fail
-               RETVAL=1
+               fail
+               RETVAL=1
        fi
 }
 
@@ -70,13 +70,13 @@ stop() {
        # Stop daemons.
        msg_stopping "lxd"
        /usr/sbin/lxd shutdown 
-        busy
+       busy
        sleep 1
        if status --pidfile $pidfile lxd lxd >/dev/null; then
                killproc --pidfile $pidfile lxd
        else
                ok
-        fi
+       fi
        rm -f /var/lock/subsys/lxd
 }
 
index a0b2bf237c77460a1dda96c29f45b82935f7bc89..31f88f3fa0194731718acc023f9b378897428fc1 100755 (executable)
@@ -25,48 +25,48 @@ fi
 
 if [ -z "$BRIDGE_DEV" -o -z "$BRIDGE_IPADDR" ]; then
        nls "Please configure BRIDGE_IPADDR in /etc/sysconfig/lxd"
-        exit 1
+       exit 1
 fi
 
 is_bridge_up() {
-    ip addr show $BRIDGE_DEV 2>/dev/null | grep -q $BRIDGE_IPADDR
+       ip addr show $BRIDGE_DEV 2>/dev/null | grep -q $BRIDGE_IPADDR
 }
 
 start() {
-        if is_bridge_up; then
+       if is_bridge_up; then
                nls "lxd bridge %s is already up" $BRIDGE_DEV
                return
        fi
 
        msg_starting $BRIDGE_DEV
-        busy
+       busy
 
-        ip link add dev lxdbr0 type bridge
-        ip a add $BRIDGE_IPADDR dev $BRIDGE_DEV
-        ip link set up dev $BRIDGE_DEV
+       ip link add dev lxdbr0 type bridge
+       ip a add $BRIDGE_IPADDR dev $BRIDGE_DEV
+       ip link set up dev $BRIDGE_DEV
 
-        if is_bridge_up; then
+       if is_bridge_up; then
                ok
        else
-               fail
-        fi
+               fail
+       fi
 }
 
 stop() {
-        if ! is_bridge_up; then
+       if ! is_bridge_up; then
                nls "lxd bridge %s is already down" $BRIDGE_DEV
                return
-        fi
+       fi
 
        if status --pidfile "/var/run/lxd.pid" lxd lxd >/dev/null; then
                nls "lxd bridge cannot be down while lxd daemon is running"
-                RETVAL=1
-                return
-        fi
+               RETVAL=1
+               return
+       fi
 
        msg_stopping $BRIDGE_DEV
-        ip link set down dev $BRIDGE_DEV
-        ip link del dev $BRIDGE_DEV
+       ip link set down dev $BRIDGE_DEV
+       ip link del dev $BRIDGE_DEV
        ok
 }
 
@@ -81,6 +81,15 @@ condrestart() {
        start
 }
 
+status() {
+       local st="down"
+       if ip link show $BRIDGE_DEV >/dev/null; then
+               st="up"
+               RETVAL=1
+       fi
+       nls "lxd bridge $BRIDGE_DEV is %s" $st
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -101,12 +110,7 @@ case "$1" in
        condrestart 7
        ;;
   status)
-        st="down"
-        if ip link show $BRIDGE_DEV >/dev/null; then
-               st="up"
-               RETVAL=1
-        fi
-        nls "lxd bridge $BRIDGE_DEV is %s" $st
+       status
        ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
This page took 0.1292 seconds and 4 git commands to generate.