From d05b5f04c92034eae1675dc8102247a3cc3315f7 Mon Sep 17 00:00:00 2001 From: baigk 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 --- .../adapters/cobbler/scripts/partman_early_default | 10 +++--- .../adapters/cobbler/scripts/preseed_early_default | 14 ++++----- .../adapters/cobbler/scripts/preseed_late_default | 36 +++++++++++----------- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'deploy/adapters/cobbler/scripts') diff --git a/deploy/adapters/cobbler/scripts/partman_early_default b/deploy/adapters/cobbler/scripts/partman_early_default index 0891b037..01502871 100644 --- a/deploy/adapters/cobbler/scripts/partman_early_default +++ b/deploy/adapters/cobbler/scripts/partman_early_default @@ -1,5 +1,5 @@ -# Start partman_early_default -# This script is not run in the chroot /target by default -$SNIPPET('preseed_pre_partition_disks') -# End partman_early_default - +# Start partman_early_default +# This script is not run in the chroot /target by default +$SNIPPET('preseed_pre_partition_disks') +# End partman_early_default + diff --git a/deploy/adapters/cobbler/scripts/preseed_early_default b/deploy/adapters/cobbler/scripts/preseed_early_default index f1c2a7c0..36ad3b6b 100644 --- a/deploy/adapters/cobbler/scripts/preseed_early_default +++ b/deploy/adapters/cobbler/scripts/preseed_early_default @@ -1,7 +1,7 @@ -# Start preseed_early_default -# This script is not run in the chroot /target by default -$SNIPPET('kickstart_start') -$SNIPPET('preseed_pre_anamon') -echo "processed preseed_pre_anamon" >> /tmp/preseed.log -$SNIPPET('preseed_pre_install_network_config') -# End preseed_early_default +# Start preseed_early_default +# This script is not run in the chroot /target by default +$SNIPPET('kickstart_start') +$SNIPPET('preseed_pre_anamon') +echo "processed preseed_pre_anamon" >> /tmp/preseed.log +$SNIPPET('preseed_pre_install_network_config') +# End preseed_early_default diff --git a/deploy/adapters/cobbler/scripts/preseed_late_default b/deploy/adapters/cobbler/scripts/preseed_late_default index d6dc29f9..3fd0ac10 100644 --- a/deploy/adapters/cobbler/scripts/preseed_late_default +++ b/deploy/adapters/cobbler/scripts/preseed_late_default @@ -1,18 +1,18 @@ -# Start preseed_late_default -# This script runs in the chroot /target by default -$SNIPPET('preseed_post_install_kernel_options') -$SNIPPET('preseed_post_install_network_config') -$SNIPPET('preseed_post_partition_disks') -$SNIPPET('preseed_ssh') -$SNIPPET('preseed_ntp') -$SNIPPET('preseed_post_apt_repo_config') -#if $getVar('tool', '') != '' - #set $preseed_tool = "preseed_%s" % $tool -$SNIPPET($preseed_tool) -#end if -$SNIPPET('preseed_limits.conf') -$SNIPPET('preseed_sysctl.conf') -$SNIPPET('preseed_rsyslog.conf') -$SNIPPET('preseed_post_anamon') -$SNIPPET('kickstart_done') -# End preseed_late_default +# Start preseed_late_default +# This script runs in the chroot /target by default +$SNIPPET('preseed_post_install_kernel_options') +$SNIPPET('preseed_post_install_network_config') +$SNIPPET('preseed_post_partition_disks') +$SNIPPET('preseed_ssh') +$SNIPPET('preseed_ntp') +$SNIPPET('preseed_post_apt_repo_config') +#if $getVar('tool', '') != '' + #set $preseed_tool = "preseed_%s" % $tool +$SNIPPET($preseed_tool) +#end if +$SNIPPET('preseed_limits.conf') +$SNIPPET('preseed_sysctl.conf') +$SNIPPET('preseed_rsyslog.conf') +$SNIPPET('preseed_post_anamon') +$SNIPPET('kickstart_done') +# End preseed_late_default -- cgit 1.2.3-korg