Repository: cloudstack Updated Branches: refs/heads/4.4-forward 4ba3aae2e -> 2d96ad987
Cosmetic fixed. three in total. 1. Only run hv_kvp_daemon if it exists. 2. add the -f argument to the rm to make is silent if it doesn't exist. 3. by using log_action_msg instead of log_action_begin_msg the screen output looks way better. Signed-off-by: Daan Hoogland <d...@onecht.net> (cherry picked from commit 66816827cbef1415dddd3f734e494c8adc41fbae) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2d96ad98 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d96ad98 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d96ad98 Branch: refs/heads/4.4-forward Commit: 2d96ad987ee22e5266208e637daaaa26f6a85a22 Parents: 4ba3aae Author: Joris van Lieshout <jvanliesh...@schubergphilis.com> Authored: Wed May 21 16:58:01 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Thu Jun 12 14:57:31 2014 +0200 ---------------------------------------------------------------------- systemvm/patches/debian/config/etc/init.d/cloud-early-config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d96ad98/systemvm/patches/debian/config/etc/init.d/cloud-early-config ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config index ffb23ec..b8c40db 100755 --- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config +++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config @@ -30,13 +30,13 @@ PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" #set -x #exec 3>&0 4>&1 > /var/log/test.log 2>&1 #start hv_kvp daemon -/usr/sbin/hv_kvp_daemon +[ -f /usr/sbin/hv_kvp_daemon ] && /usr/sbin/hv_kvp_daemon # Fix haproxy directory issue mkdir -p /var/lib/haproxy # Clear boot up flag, it would be created by rc.local after boot up done -rm /var/cache/cloud/boot_up_done +rm -f /var/cache/cloud/boot_up_done [ -x /sbin/ifup ] || exit 0 @@ -44,7 +44,7 @@ rm /var/cache/cloud/boot_up_done log_it() { echo "$(date) $@" >> /var/log/cloud.log - log_action_begin_msg "$@" + log_action_msg "$@" } init_interfaces_orderby_macs() {
