From 3e9905bb0720d5f6707fd6bb7d43f13c15dd6314 Mon Sep 17 00:00:00 2001
From: He Simei <hesimei@zju.edu.cn>
Date: Thu, 8 Oct 2015 13:57:22 +0800
Subject: [PATCH] fix incorrect upstart script for ubuntu

---
 cluster/ubuntu/master/init_scripts/flanneld               | 8 ++++----
 .../ubuntu/master/init_scripts/kube-controller-manager    | 4 ++--
 cluster/ubuntu/minion/init_scripts/flanneld               | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cluster/ubuntu/master/init_scripts/flanneld b/cluster/ubuntu/master/init_scripts/flanneld
index 5e9abce8fd6..cf433b833e7 100644
--- a/cluster/ubuntu/master/init_scripts/flanneld
+++ b/cluster/ubuntu/master/init_scripts/flanneld
@@ -69,22 +69,22 @@ case "$1" in
 	start)
 		fail_unless_root
 		log_begin_msg "Starting $FLANNEL_DESC: $BASE"
-        $KUBE_APISERVER_START
+        $FLANNEL_START
 		log_end_msg $?
 		;;
 
 	stop)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
+		$FLANNEL_STOP
 		log_end_msg $?
 		;;
 
 	restart | force-reload)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
-		$KUBE_APISERVER_START
+		$FLANNEL_STOP
+		$FLANNEL_START
 		log_end_msg $?
 		;;
 
diff --git a/cluster/ubuntu/master/init_scripts/kube-controller-manager b/cluster/ubuntu/master/init_scripts/kube-controller-manager
index e6cdd216e59..74cd5c9c8e8 100755
--- a/cluster/ubuntu/master/init_scripts/kube-controller-manager
+++ b/cluster/ubuntu/master/init_scripts/kube-controller-manager
@@ -9,7 +9,7 @@ set -e
 # Should-Stop:        
 # Default-Start:      
 # Default-Stop:       
-# Short-Description:  Start kube-controller-managerservice
+# Short-Description:  Start kube-controller-manager service
 # Description:
 #  http://www.github.com/GoogleCloudPlatform/Kubernetes
 ### END INIT INFO
@@ -59,7 +59,7 @@ KUBE_CONTROLLER_MANAGER_START="start-stop-daemon
 --make-pidfile \
 --pidfile $KUBE_CONTROLLER_MANAGER_PIDFILE \
 -- $KUBE_CONTROLLER_MANAGER_OPTS \
->> "$KUBE_CONTROLLER_MANAGER_LOGFILE" 2>&1
+>> $KUBE_CONTROLLER_MANAGER_LOGFILE 2>&1"
 
 KUBE_CONTROLLER_MANAGER_STOP="start-stop-daemon \
 --stop \
diff --git a/cluster/ubuntu/minion/init_scripts/flanneld b/cluster/ubuntu/minion/init_scripts/flanneld
index 5e9abce8fd6..cf433b833e7 100755
--- a/cluster/ubuntu/minion/init_scripts/flanneld
+++ b/cluster/ubuntu/minion/init_scripts/flanneld
@@ -69,22 +69,22 @@ case "$1" in
 	start)
 		fail_unless_root
 		log_begin_msg "Starting $FLANNEL_DESC: $BASE"
-        $KUBE_APISERVER_START
+        $FLANNEL_START
 		log_end_msg $?
 		;;
 
 	stop)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
+		$FLANNEL_STOP
 		log_end_msg $?
 		;;
 
 	restart | force-reload)
 		fail_unless_root
 		log_begin_msg "Stopping $FLANNEL_DESC: $BASE"
-		$KUBE_APISERVER_STOP
-		$KUBE_APISERVER_START
+		$FLANNEL_STOP
+		$FLANNEL_START
 		log_end_msg $?
 		;;