delete the windows newline character

JIRA: COMPASS-7

Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e
Signed-off-by: baigk <baiguoku@huawei.com>

1 files changed, 80 insertions, 80 deletions

diff --git a/deploy/adapters/cobbler/snippets/preseed_post_anamon b/deploy/adapters/cobbler/snippets/preseed_post_anamon
index 5ed99760..6d889bb7 100644
--- a/deploy/adapters/cobbler/snippets/preseed_post_anamon
+++ b/deploy/adapters/cobbler/snippets/preseed_post_anamon
@@ -1,80 +1,80 @@
-#if $str($getVar('anamon_enabled','')) == "1"

-

-## install anamon script

-    #if $getVar("compass_server", "") != ""

-wget -O /usr/local/sbin/anamon "http://$compass_server:$http_port/cobbler/aux/anamon"

-    #else

-wget -O /usr/local/sbin/anamon "http://$server:$http_port/cobbler/aux/anamon"

-    #end if

-## install anamon system service

-cat << EOF > /etc/init.d/anamon.init

-#raw

-#!/bin/bash

-## BEGIN INIT INFO

-# Provides: anamon.init

-# Default-Start: 3 5

-# Default-Stop: 0 1 2 4 6

-# Required-Start: $network

-# Short-Description: Starts the cobbler anamon boot notification program

-# Description: anamon runs the first time a machine is booted after

-#              installation.

-## END INIT INFO

-

-#

-# anamon.init: Starts the cobbler post-install boot notification program

-#

-# chkconfig: 35 95 95

-#

-# description: anamon runs the first time a machine is booted after

-#              installation.

-#

-#end raw

-cd /var/log/installer

-gunzip initial-status.gz

-cd -

-#if $getVar("compass_server","") != ""

-/usr/local/sbin/anamon --watchfile "/var/log/installer/syslog /var/log/installer/hardware-summary /var/log/installer/initial-status /var/log/installer/status" --name $name --server $compass_server --port $http_port --exit

-#else

-/usr/local/sbin/anamon --watchfile "/var/log/installer/syslog /var/log/installer/hardware-summary /var/log/installer/initial-status /var/log/installer/status" --name $name --server $server --port $http_port --exit

-#end if

-update-rc.d -f anamon remove

-mv /etc/init.d/anamon.init /tmp/anamon.init

-EOF

-

-## adjust permissions

-chmod 755 /etc/init.d/anamon.init /usr/local/sbin/anamon

-test -d /selinux && restorecon /etc/init.d/anamon.init /usr/local/sbin/anamon

-

-## enable the script

-update-rc.d anamon.init defaults 95 95

-#end if

-

-## place start-up script for updating os state

-#if $getVar('compass_server', '') != ""

-    #set srv = $getVar('compass_server','')

-#else

-    #set srv = $getVar('server','')

-#end if

-cat << EOF > /etc/init.d/set_state

-#raw

-#!/bin/bash

-# Provides: set_state

-# Default-Start: 3 5

-# Default-Stop: 0 1 2 4 6

-# Required-Start: $network $ssh

-# Short-Description: Notifies the os installation is finished

-# Description: set_state runs the first time a machine is booted after

-#              installation.

-#end raw

-wget -O /tmp/os_state --post-data='{"ready": true}' --header=Content-Type:application/json "http://$srv/api/hosts/${hostname}/state_internal"

-update-rc.d -f set_state remove

-mv /etc/init.d/set_state /tmp/set_state

-EOF

-

-## adjust permissions

-chmod 755 /etc/init.d/set_state

-test -d /selinux && restorecon /etc/init.d/set_state

-

-update-rc.d set_state defaults 99 99

-

-echo "compass_server=$server" >> /etc/compass.conf

+#if $str($getVar('anamon_enabled','')) == "1"
+
+## install anamon script
+    #if $getVar("compass_server", "") != ""
+wget -O /usr/local/sbin/anamon "http://$compass_server:$http_port/cobbler/aux/anamon"
+    #else
+wget -O /usr/local/sbin/anamon "http://$server:$http_port/cobbler/aux/anamon"
+    #end if
+## install anamon system service
+cat << EOF > /etc/init.d/anamon.init
+#raw
+#!/bin/bash
+## BEGIN INIT INFO
+# Provides: anamon.init
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 4 6
+# Required-Start: $network
+# Short-Description: Starts the cobbler anamon boot notification program
+# Description: anamon runs the first time a machine is booted after
+#              installation.
+## END INIT INFO
+
+#
+# anamon.init: Starts the cobbler post-install boot notification program
+#
+# chkconfig: 35 95 95
+#
+# description: anamon runs the first time a machine is booted after
+#              installation.
+#
+#end raw
+cd /var/log/installer
+gunzip initial-status.gz
+cd -
+#if $getVar("compass_server","") != ""
+/usr/local/sbin/anamon --watchfile "/var/log/installer/syslog /var/log/installer/hardware-summary /var/log/installer/initial-status /var/log/installer/status" --name $name --server $compass_server --port $http_port --exit
+#else
+/usr/local/sbin/anamon --watchfile "/var/log/installer/syslog /var/log/installer/hardware-summary /var/log/installer/initial-status /var/log/installer/status" --name $name --server $server --port $http_port --exit
+#end if
+update-rc.d -f anamon remove
+mv /etc/init.d/anamon.init /tmp/anamon.init
+EOF
+
+## adjust permissions
+chmod 755 /etc/init.d/anamon.init /usr/local/sbin/anamon
+test -d /selinux && restorecon /etc/init.d/anamon.init /usr/local/sbin/anamon
+
+## enable the script
+update-rc.d anamon.init defaults 95 95
+#end if
+
+## place start-up script for updating os state
+#if $getVar('compass_server', '') != ""
+    #set srv = $getVar('compass_server','')
+#else
+    #set srv = $getVar('server','')
+#end if
+cat << EOF > /etc/init.d/set_state
+#raw
+#!/bin/bash
+# Provides: set_state
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 4 6
+# Required-Start: $network $ssh
+# Short-Description: Notifies the os installation is finished
+# Description: set_state runs the first time a machine is booted after
+#              installation.
+#end raw
+wget -O /tmp/os_state --post-data='{"ready": true}' --header=Content-Type:application/json "http://$srv/api/hosts/${hostname}/state_internal"
+update-rc.d -f set_state remove
+mv /etc/init.d/set_state /tmp/set_state
+EOF
+
+## adjust permissions
+chmod 755 /etc/init.d/set_state
+test -d /selinux && restorecon /etc/init.d/set_state
+
+update-rc.d set_state defaults 99 99
+
+echo "compass_server=$server" >> /etc/compass.conf