delete the windows newline character

JIRA: COMPASS-7

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

1 files changed, 70 insertions, 70 deletions

diff --git a/deploy/adapters/cobbler/snippets/preseed_ntp b/deploy/adapters/cobbler/snippets/preseed_ntp
index 68caf090..83b30559 100644
--- a/deploy/adapters/cobbler/snippets/preseed_ntp
+++ b/deploy/adapters/cobbler/snippets/preseed_ntp
@@ -1,70 +1,70 @@
-#if $getVar('ntp_server', '') == ""

-    #set $ntp_server = '0.ubuntu.pool.ntp.org'

-#end if

-

-cat << EOF > /etc/ntp.conf

-# For more information about this file, see the man pages

-# ntp.conf(5), ntp_acc(5), ntp_auth(5), ntp_clock(5), ntp_misc(5), ntp_mon(5).

-

-# Include the option tinker panic 0 at the top of your ntp.conf file. 

-# By default, the NTP daemon sometimes panics and exits if the underlying clock

-# appears to be behaving erratically. This option causes the daemon to keep 

-# running instead of panicking. 

-tinker panic 0

-

-driftfile /var/lib/ntp/drift

-

-# Permit time synchronization with our time source, but do not

-# permit the source to query or modify the service on this system.

-restrict default kod nomodify notrap nopeer noquery

-restrict -6 default kod nomodify notrap nopeer noquery

-

-# Permit all access over the loopback interface.  This could

-# be tightened as well, but to do so would effect some of

-# the administrative functions.

-restrict 127.0.0.1 

-restrict -6 ::1

-

-# Hosts on local network are less restricted.

-# restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap

-

-# Use public servers from the pool.ntp.org project.

-# Please consider joining the pool (http://www.pool.ntp.org/join.html).

-# server 0.ubuntu.pool.ntp.org

-# server 1.ubuntu.pool.ntp.org

-# server 2.ubuntu.pool.ntp.org

-server $ntp_server

-

-# broadcast 192.168.1.255 autokey	# broadcast server

-# broadcastclient			# broadcast client

-# broadcast 224.0.1.1 autokey		# multicast server

-# multicastclient 224.0.1.1		# multicast client

-# manycastserver 239.255.254.254		# manycast server

-# manycastclient 239.255.254.254 autokey # manycast client

-

-# Undisciplined Local Clock. This is a fake driver intended for backup

-# and when no outside source of synchronized time is available. 

-server	127.127.1.0	# local clock

-

-# Enable public key cryptography.

-# crypto

-

-includefile /etc/ntp/crypto/pw

-

-# Key file containing the keys and key identifiers used when operating

-# with symmetric key cryptography. 

-keys /etc/ntp/keys

-

-# Specify the key identifiers which are trusted.

-# trustedkey 4 8 42

-

-# Specify the key identifier to use with the ntpdc utility.

-# requestkey 8

-

-# Specify the key identifier to use with the ntpq utility.

-# controlkey 8

-

-# Enable writing of statistics records.

-# statistics clockstats cryptostats loopstats peerstats

-EOF

-update-rc.d ntp defaults 58 74

+#if $getVar('ntp_server', '') == ""
+    #set $ntp_server = '0.ubuntu.pool.ntp.org'
+#end if
+
+cat << EOF > /etc/ntp.conf
+# For more information about this file, see the man pages
+# ntp.conf(5), ntp_acc(5), ntp_auth(5), ntp_clock(5), ntp_misc(5), ntp_mon(5).
+
+# Include the option tinker panic 0 at the top of your ntp.conf file.
+# By default, the NTP daemon sometimes panics and exits if the underlying clock
+# appears to be behaving erratically. This option causes the daemon to keep
+# running instead of panicking.
+tinker panic 0
+
+driftfile /var/lib/ntp/drift
+
+# Permit time synchronization with our time source, but do not
+# permit the source to query or modify the service on this system.
+restrict default kod nomodify notrap nopeer noquery
+restrict -6 default kod nomodify notrap nopeer noquery
+
+# Permit all access over the loopback interface.  This could
+# be tightened as well, but to do so would effect some of
+# the administrative functions.
+restrict 127.0.0.1
+restrict -6 ::1
+
+# Hosts on local network are less restricted.
+# restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
+
+# Use public servers from the pool.ntp.org project.
+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
+# server 0.ubuntu.pool.ntp.org
+# server 1.ubuntu.pool.ntp.org
+# server 2.ubuntu.pool.ntp.org
+server $ntp_server
+
+# broadcast 192.168.1.255 autokey        # broadcast server
+# broadcastclient                        # broadcast client
+# broadcast 224.0.1.1 autokey            # multicast server
+# multicastclient 224.0.1.1              # multicast client
+# manycastserver 239.255.254.254         # manycast server
+# manycastclient 239.255.254.254 autokey # manycast client
+
+# Undisciplined Local Clock. This is a fake driver intended for backup
+# and when no outside source of synchronized time is available.
+server    127.127.1.0    # local clock
+
+# Enable public key cryptography.
+# crypto
+
+includefile /etc/ntp/crypto/pw
+
+# Key file containing the keys and key identifiers used when operating
+# with symmetric key cryptography.
+keys /etc/ntp/keys
+
+# Specify the key identifiers which are trusted.
+# trustedkey 4 8 42
+
+# Specify the key identifier to use with the ntpdc utility.
+# requestkey 8
+
+# Specify the key identifier to use with the ntpq utility.
+# controlkey 8
+
+# Enable writing of statistics records.
+# statistics clockstats cryptostats loopstats peerstats
+EOF
+update-rc.d ntp defaults 58 74