From d05b5f04c92034eae1675dc8102247a3cc3315f7 Mon Sep 17 00:00:00 2001
From: baigk <baiguoku@huawei.com>
Date: Tue, 4 Aug 2015 22:21:43 -0400
Subject: delete the windows newline character

JIRA: COMPASS-7

Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e
Signed-off-by: baigk <baiguoku@huawei.com>
---
 deploy/adapters/cobbler/snippets/preseed_chef_init | 62 +++++++++++-----------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'deploy/adapters/cobbler/snippets/preseed_chef_init')

diff --git a/deploy/adapters/cobbler/snippets/preseed_chef_init b/deploy/adapters/cobbler/snippets/preseed_chef_init
index ec9938a2..57fe7672 100644
--- a/deploy/adapters/cobbler/snippets/preseed_chef_init
+++ b/deploy/adapters/cobbler/snippets/preseed_chef_init
@@ -1,31 +1,31 @@
-## A self-destruct service to boot chef client and register cron job
-#if $getVar('ntp_server', '') == ""
-    #set $ntp_server = '0.ubuntu.pool.ntp.org'
-#end if
-cat << EOF > /etc/init.d/chef
-#raw
-#!/bin/bash
-# chkconfig: 2345 99 20
-# description: Description of the script
-# processname: chef-agent
-#end raw
-echo "old date is: `date`" 2>&1 > /tmp/ntp.log
-service ntpd stop 2>&1 >> /tmp/ntp.log
-ntpdate $ntp_server 2>&1 >> /tmp/ntp.log
-service ntpd start 2>&1 >> /tmp/ntp.log
-echo "new date is: `date`" 2>&1 >> /tmp/ntp.log
-apt-get -y update 2>&1 >> /tmp/apt_update
-
-crontab -l  > /tmp/mycron
-echo "*/30 * * * *  /etc/chef/chef_client_run.sh" >> /tmp/mycron
-crontab /tmp/mycron
-rm /tmp/mycron
-
-/etc/chef/chef_client_run.sh &
-
-update-rc.d -f chef remove
-mv /etc/init.d/chef /tmp/chef
-EOF
-
-chmod +x /etc/init.d/chef
-update-rc.d chef defaults 99 20
+## A self-destruct service to boot chef client and register cron job
+#if $getVar('ntp_server', '') == ""
+    #set $ntp_server = '0.ubuntu.pool.ntp.org'
+#end if
+cat << EOF > /etc/init.d/chef
+#raw
+#!/bin/bash
+# chkconfig: 2345 99 20
+# description: Description of the script
+# processname: chef-agent
+#end raw
+echo "old date is: `date`" 2>&1 > /tmp/ntp.log
+service ntpd stop 2>&1 >> /tmp/ntp.log
+ntpdate $ntp_server 2>&1 >> /tmp/ntp.log
+service ntpd start 2>&1 >> /tmp/ntp.log
+echo "new date is: `date`" 2>&1 >> /tmp/ntp.log
+apt-get -y update 2>&1 >> /tmp/apt_update
+
+crontab -l  > /tmp/mycron
+echo "*/30 * * * *  /etc/chef/chef_client_run.sh" >> /tmp/mycron
+crontab /tmp/mycron
+rm /tmp/mycron
+
+/etc/chef/chef_client_run.sh &
+
+update-rc.d -f chef remove
+mv /etc/init.d/chef /tmp/chef
+EOF
+
+chmod +x /etc/init.d/chef
+update-rc.d chef defaults 99 20
-- 
cgit 1.2.3-korg