Merge "check dnsmasq exists before kill dnsmasq service" into dev/experimental

install/cobbler.sh

@@ -159,15 +159,17 @@ echo "disable selinux temporarily"
 echo 0 > /selinux/enforce
 
 # make log dir
-mkdir -p /var/log/cobbler
-mkdir -p /var/log/cobbler/tasks
-mkdir -p /var/log/cobbler/anamon
-chmod -R 777 /var/log/cobbler
+sudo mkdir -p /var/log/cobbler
+sudo mkdir -p /var/log/cobbler/tasks
+sudo mkdir -p /var/log/cobbler/anamon
+sudo chmod -R 777 /var/log/cobbler
 
 # kill dnsmasq service
-chkconfig dnsmasq off
-service dnsmasq stop
-killall -9 dnsmasq
+if `sudo chkconfig --list dnsmasq`; then
+    sudo chkconfig dnsmasq off
+    sudo service dnsmasq stop
+fi
+sudo killall -9 dnsmasq
 
 sudo service httpd restart
 sudo service cobblerd restart

install/dependency.sh

@@ -52,4 +52,6 @@ sudo chkconfig redis on
 sudo chkconfig mysqld on
 sudo chkconfig iptables off
 sudo chkconfig ip6tables off
-sudo chkconfig dnsmasq off
+if `sudo chkconfig --list dnsmasq`; then
+    sudo chkconfig dnsmasq off
+fi

install/install_func.sh

@@ -205,7 +205,7 @@ download()
 	    fi
         fi
         if [[ "$url" =~ (http|https|ftp):// ]]; then
-	    echo "downloading $url to /tmp/${package}"
+	    echo "download $url to /tmp/${package}"
 	    if [[ -f /tmp/${package} || -L /tmp/${package} ]]; then
                 curl -f -L -z /tmp/${package} -o /tmp/${package}.tmp $url
 	    else