fix build errors about mic 'remove /etc/fstab file'

Change-Id: I37168eb4b21c5f07ab4934eab83678723b02a7bd

diff --git a/cases/create/func_cases/mic_cr_auto_raw.case b/cases/create/func_cases/mic_cr_auto_raw.case
index da40462616ea824c21f88044543e5775f0ab0edb..10595f13bc525f97ddd141c7b048175c0e55645d 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw.case
+++ b/cases/create/func_cases/mic_cr_auto_raw.case
@@ -64,8 +64,8 @@ if [ "$platform"="openSUSE" ] && [ "$version"=42.3 ]; then
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
     let offset_2=$offset_2*512
     sudo mount -o loop,offset=$offset_2 $raw_image mic-output/ivi_dir/
-    (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
-    sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
+    #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
+    #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
     mic_version=$(mic --version  2>&1 | awk -F ' ' '{print $2}')
     python parse_manifest.py $bz2img $mic_version $bmap
     exit 0
@@ -85,8 +85,8 @@ else
                     if [ -e "/dev/mapper/$first_part" ] && [ -e "/dev/mapper/$second_part" ];then
                         sudo mount /dev/mapper/$first_part  mic-output/ivi_dir/boot/ -t ext4
                         sudo mount /dev/mapper/$second_part  mic-output/ivi_dir/ -t ext4
-                        (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
-                        sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
+                        #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
+                        #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
                         mic_version=$(mic --version  2>&1 | awk -F ' ' '{print $2}')
                         python parse_manifest.py $bz2img $mic_version $bmap
                         exit 0

diff --git a/cases/create/func_cases/mic_cr_auto_raw_gpt.case b/cases/create/func_cases/mic_cr_auto_raw_gpt.case
index 1440f349587fee7a5eea5a8cca54c53279c73bff..364b1c184c73c09e1ec18158c7759f87f6b8df40 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw_gpt.case
+++ b/cases/create/func_cases/mic_cr_auto_raw_gpt.case
@@ -43,8 +43,8 @@ if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
     let offset_2=$offset_2*512
     sudo mount -o loop,offset=$offset_2 $raw_image mic-output/ivi_dir/
-    sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
-    (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
+    #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
+    #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
     exit 0
 else
 loop_device=$(sudo $losetup_path -f)
@@ -62,8 +62,8 @@ do
                 if [ -e "/dev/mapper/$first_part" ] && [ -e "/dev/mapper/$second_part" ];then
                     sudo mount /dev/mapper/$first_part  mic-output/ivi_dir/boot/ -t ext3
                     sudo mount /dev/mapper/$second_part  mic-output/ivi_dir/ -t ext4
-                    sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
-                    (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
+                    #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
+                    #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
                     exit 0
                 else
                     sleep 2

diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
index 01edad81c05af12ad9a58d9132075c036a8fba7b..cad25f17422bc07be164316a658add1291489b5f 100755 (executable)
--- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
+++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
@@ -39,8 +39,8 @@ if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
     let offset_2=$offset_2*512
     sudo mount -o loop,offset=$offset_2 $raw_image mic-output/ivi_dir/
-    sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
-    (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
+    #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
+    #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
     exit 0
 else
 for i in {1..5}
@@ -56,8 +56,8 @@ do
                 if [ -e "/dev/mapper/$first_part" ] && [ -e "/dev/mapper/$second_part" ];then
                     sudo mount /dev/mapper/$first_part  mic-output/ivi_dir/boot/ -t ext4
                     sudo mount /dev/mapper/$second_part  mic-output/ivi_dir/ -t ext4
-                    sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
-                    (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
+                    #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb
+                    #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid')
                     exit 0
                 else
                     sleep 2

diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
index e331f3a34b801364b15165695d6993908870661d..63b52bfa2d76eb686434ec73401a7decdefca7c1 100755 (executable)
--- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
+++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
@@ -39,8 +39,8 @@ if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
     let offset_2=$offset_2*512
     sudo mount -o loop,offset=$offset_2 $raw_image mic-output/ivi_dir/
-    (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
-    sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
+    #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
+    #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
     exit 0
 else
     for i in {1..5}
@@ -56,8 +56,8 @@ else
                     if [ -e "/dev/mapper/$first_part" ] && [ -e "/dev/mapper/$second_part" ];then
                         sudo mount /dev/mapper/$first_part  mic-output/ivi_dir/boot/ -t ext4
                         sudo mount /dev/mapper/$second_part  mic-output/ivi_dir/ -t ext4
-                        (! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
-                        sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
+                        #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
+                        #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
                         exit 0
                     else
                         sleep 2