[packages/lxd] format fixes (tab indent)

glen glen at pld-linux.org
Sun Aug 21 21:40:38 CEST 2016


commit a89a534c045b8d4cb55cdf1062b7e3643ee5ad82
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Aug 21 22:40:26 2016 +0300

    format fixes (tab indent)

 lxd.init   | 14 +++++++-------
 lxdbr.init | 50 +++++++++++++++++++++++++++-----------------------
 2 files changed, 34 insertions(+), 30 deletions(-)
---
diff --git a/lxd.init b/lxd.init
index 69ad85b..ec5ee36 100755
--- 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
 }
 
diff --git a/lxdbr.init b/lxdbr.init
index a0b2bf2..31f88f3 100755
--- a/lxdbr.init
+++ b/lxdbr.init
@@ -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}"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxd.git/commitdiff/a89a534c045b8d4cb55cdf1062b7e3643ee5ad82



More information about the pld-cvs-commit mailing list