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>
---
 .../cobbler/snippets/preseed_post_partition_disks  | 78 +++++++++++-----------
 1 file changed, 39 insertions(+), 39 deletions(-)

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

diff --git a/deploy/adapters/cobbler/snippets/preseed_post_partition_disks b/deploy/adapters/cobbler/snippets/preseed_post_partition_disks
index ed058c73..4770e2af 100644
--- a/deploy/adapters/cobbler/snippets/preseed_post_partition_disks
+++ b/deploy/adapters/cobbler/snippets/preseed_post_partition_disks
@@ -1,39 +1,39 @@
-partitions=\$(pvs --noheadings --separator :| cut -d: -f1,2)
-vg_remove=0
-remove_partitions=''
-echo "partitions \$partitions" >> /tmp/post_partition.log
-
-for partition in \$partitions; do
-    set \$(echo \$partition | tr ':' ' ')
-    partition=\$1
-    vg=\$2
-    if [ "\$vg" = "reserved" ]; then
-        echo "prepare remove partition \$partition" >> /tmp/post_partition.log
-        remove_partitions="\${remove_partitions} \$partition"
-        vg_remove=1
-    else
-        echo "ignore \$vg since it is not reserved" >> /tmp/post_partition.log
-    fi
-done
-
-if [ "\${vg_remove}" != "0" ]; then
-    vgremove -f reserved
-fi
-
-for remove_partition in \${remove_partitions}; do
-    echo "remove pv \${remove_partition}" >> /tmp/post_partition.log
-    pvremove -ff -y \${remove_partition}
-    set \$(echo \${remove_partition}  | sed -e 's/^\(.*\)\([0-9]\+\)\$/\1 \2/g')
-    partition_disk=\$1
-    partition_number=\$2
-    if [ ! -z "\${partition_disk}" ]; then
-        if [ ! -z "\${partition_number}" ]; then
-            echo "remove partition \${remove_partition} on \${partition_disk} number \${partition_number}" >> /tmp/post_partition.log 
-            parted \${partition_disk} --script -- rm \${partition_number}
-        else
-            echo "no partition number found for \${remove_partition}" >> /tmp/post_partition.log
-        fi
-    else
-        echo "no partition disk found for \${remove_partition}" >> /tmp/post_partition.log
-    fi
-done
+partitions=\$(pvs --noheadings --separator :| cut -d: -f1,2)
+vg_remove=0
+remove_partitions=''
+echo "partitions \$partitions" >> /tmp/post_partition.log
+
+for partition in \$partitions; do
+    set \$(echo \$partition | tr ':' ' ')
+    partition=\$1
+    vg=\$2
+    if [ "\$vg" = "reserved" ]; then
+        echo "prepare remove partition \$partition" >> /tmp/post_partition.log
+        remove_partitions="\${remove_partitions} \$partition"
+        vg_remove=1
+    else
+        echo "ignore \$vg since it is not reserved" >> /tmp/post_partition.log
+    fi
+done
+
+if [ "\${vg_remove}" != "0" ]; then
+    vgremove -f reserved
+fi
+
+for remove_partition in \${remove_partitions}; do
+    echo "remove pv \${remove_partition}" >> /tmp/post_partition.log
+    pvremove -ff -y \${remove_partition}
+    set \$(echo \${remove_partition}  | sed -e 's/^\(.*\)\([0-9]\+\)\$/\1 \2/g')
+    partition_disk=\$1
+    partition_number=\$2
+    if [ ! -z "\${partition_disk}" ]; then
+        if [ ! -z "\${partition_number}" ]; then
+            echo "remove partition \${remove_partition} on \${partition_disk} number \${partition_number}" >> /tmp/post_partition.log
+            parted \${partition_disk} --script -- rm \${partition_number}
+        else
+            echo "no partition number found for \${remove_partition}" >> /tmp/post_partition.log
+        fi
+    else
+        echo "no partition disk found for \${remove_partition}" >> /tmp/post_partition.log
+    fi
+done
-- 
cgit 1.2.3-korg