Merge branch 'main' of ../pcp

qa/1485

@@ -31,7 +31,7 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    [ $PCPQA_VALGRIND = both ] || \
+    [ "$PCPQA_VALGRIND" = both ] || \
         _notrun "valgrind variant qa/1487 will be run"
 fi
 
@@ -69,13 +69,15 @@ inerr == 0		{ print >"'"$tmp.out"'" }'
 }
 
 mkdir -p $tmp/root
-cd $tmp/root
-$sudo tar zxpf $here/linux/uuid-root.tgz
-cd $here
 export LINUX_STATSPATH=$tmp/root
 
 # real QA test starts here
 
+echo "+++ uuid-00 tarball +++"
+cd $tmp/root
+$sudo tar zxpf $here/linux/uuid-00-root.tgz
+cd $here
+
 echo "situation normal ..."
 DEBUG=''
 _doit
@@ -84,6 +86,7 @@ echo
 echo "cull some mounts ..."
 grep -v '/dev/sd[bd]' <$LINUX_STATSPATH/proc/self/mounts >$tmp.tmp
 $sudo cp $tmp.tmp $LINUX_STATSPATH/proc/self/mounts
+DEBUG=''
 _doit
 
 echo
@@ -101,11 +104,44 @@ _doit
 echo
 echo "/dev/disk/by-uuid empty ..."
 rm -f $LINUX_STATSPATH/dev/disk/by-uuid/*
+DEBUG='-Dappl8'
 _doit
 
 echo
 echo "/dev/disk/by-uuid missing ..."
 rm -rf $LINUX_STATSPATH/dev/disk/by-uuid
+DEBUG='-Dappl8'
+_doit
+
+echo
+echo "+++ uuid-01 tarball +++"
+cd $tmp/root
+$sudo tar zxpf $here/linux/uuid-01-root.tgz
+cd $here
+
+echo "situation normal ..."
+DEBUG=''
+_doit
+
+echo
+echo "/dev/mapper empty ..."
+$sudo rm -f $LINUX_STATSPATH/dev/mapper/*
+DEBUG='-Dappl8'
+_doit
+
+echo
+echo "/dev/mapper is bogus ..."
+cd $LINUX_STATSPATH/dev/mapper
+$sudo ln -s ../dm-13 fedora_vm22-root
+$sudo touch fedora_vm22-swap
+cd $here
+DEBUG='-Dappl8'
+_doit
+
+echo
+echo "/dev/mapper missing ..."
+$sudo rm -rf $LINUX_STATSPATH/dev/mapper
+DEBUG='-Dappl8'
 _doit
 
 # success, all done

qa/1485.out

@@ -1,4 +1,5 @@
 QA output created by 1485
++++ uuid-00 tarball +++
 situation normal ...
 
 filesys.mountdir
@@ -60,32 +61,32 @@ filesys.uuid
     inst [8 or "/dev/sde7"] value "70180cb3-338f-41bb-8ff0-9cb70d2614cc"
 
 mismatches ...
-do_uuids: Warning: disk /dev/sda5 not in InDom Cache
-do_uuids: Warning: disk /dev/sdb1 not in InDom Cache
-do_uuids: Warning: disk /dev/sdb5 not in InDom Cache
-do_uuids: Warning: disk /dev/sdb6 not in InDom Cache
-do_uuids: Warning: disk /dev/sdb7 not in InDom Cache
-do_uuids: Warning: disk /dev/sdd6 not in InDom Cache
-do_uuids: Warning: disk /dev/sdd7 not in InDom Cache
-do_uuids: Warning: disk /dev/sde1 not in InDom Cache
-do_uuids: Warning: disk /dev/vda1 not in InDom Cache
-do_uuids: add "/dev/sda1" "4abf1947-f982-4c76-b776-75c996742e7f"
-do_uuids: add "/dev/sda6" "eb787c10-e3bf-4b63-9a20-9ca9063a81c2"
-do_uuids: add "/dev/sda7" "6bd6fd66-c9a2-418e-8790-7519beeb6fa6"
-do_uuids: add "/dev/sdc1" "ca00c9cd-d370-4387-9487-37c15ee82bf4"
-do_uuids: add "/dev/sdc5" "d7f9bdc1-40ad-471f-9eb1-846990359f06"
-do_uuids: add "/dev/sde5" "7514e1d0-a5ae-42db-9e9f-0015d1ad3035"
-do_uuids: add "/dev/sde7" "70180cb3-338f-41bb-8ff0-9cb70d2614cc"
+do_uuids: Warning: device /dev/sda5 not in InDom Cache
+do_uuids: Warning: device /dev/sdb1 not in InDom Cache
+do_uuids: Warning: device /dev/sdb5 not in InDom Cache
+do_uuids: Warning: device /dev/sdb6 not in InDom Cache
+do_uuids: Warning: device /dev/sdb7 not in InDom Cache
+do_uuids: Warning: device /dev/sdd6 not in InDom Cache
+do_uuids: Warning: device /dev/sdd7 not in InDom Cache
+do_uuids: Warning: device /dev/sde1 not in InDom Cache
+do_uuids: Warning: device /dev/vda1 not in InDom Cache
+do_uuids: add device "/dev/sda1" uuid "4abf1947-f982-4c76-b776-75c996742e7f"
+do_uuids: add device "/dev/sda6" uuid "eb787c10-e3bf-4b63-9a20-9ca9063a81c2"
+do_uuids: add device "/dev/sda7" uuid "6bd6fd66-c9a2-418e-8790-7519beeb6fa6"
+do_uuids: add device "/dev/sdc1" uuid "ca00c9cd-d370-4387-9487-37c15ee82bf4"
+do_uuids: add device "/dev/sdc5" uuid "d7f9bdc1-40ad-471f-9eb1-846990359f06"
+do_uuids: add device "/dev/sde5" uuid "7514e1d0-a5ae-42db-9e9f-0015d1ad3035"
+do_uuids: add device "/dev/sde7" uuid "70180cb3-338f-41bb-8ff0-9cb70d2614cc"
 do_uuids: readlink(TMP/root/dev/disk/by-uuid/dead-beef-cafe-feed) failed: Invalid argument
-refresh_filesys: add "/" "/dev/sdc1"
-refresh_filesys: add "/archive-1" "/dev/sde6"
-refresh_filesys: add "/backup" "/dev/vda2"
-refresh_filesys: add "/bozo-1" "/dev/sde5"
-refresh_filesys: add "/data" "/dev/sda6"
-refresh_filesys: add "/ssd-cache" "/dev/sdc5"
-refresh_filesys: add "/tmp" "/dev/sda1"
-refresh_filesys: add "/vmstore0" "/dev/sda7"
-refresh_filesys: add "/vmstore3" "/dev/sde7"
+refresh_filesys: add mount "/" device "/dev/sdc1"
+refresh_filesys: add mount "/archive-1" device "/dev/sde6"
+refresh_filesys: add mount "/backup" device "/dev/vda2"
+refresh_filesys: add mount "/bozo-1" device "/dev/sde5"
+refresh_filesys: add mount "/data" device "/dev/sda6"
+refresh_filesys: add mount "/ssd-cache" device "/dev/sdc5"
+refresh_filesys: add mount "/tmp" device "/dev/sda1"
+refresh_filesys: add mount "/vmstore0" device "/dev/sda7"
+refresh_filesys: add mount "/vmstore3" device "/dev/sde7"
 
 filesys.mountdir
     inst [0 or "/dev/sdc1"] value "/"
@@ -110,15 +111,15 @@ filesys.uuid
     inst [8 or "/dev/sde7"] value "70180cb3-338f-41bb-8ff0-9cb70d2614cc"
 
 /dev/disk/by-uuid empty ...
-refresh_filesys: add "/" "/dev/sdc1"
-refresh_filesys: add "/archive-1" "/dev/sde6"
-refresh_filesys: add "/backup" "/dev/vda2"
-refresh_filesys: add "/bozo-1" "/dev/sde5"
-refresh_filesys: add "/data" "/dev/sda6"
-refresh_filesys: add "/ssd-cache" "/dev/sdc5"
-refresh_filesys: add "/tmp" "/dev/sda1"
-refresh_filesys: add "/vmstore0" "/dev/sda7"
-refresh_filesys: add "/vmstore3" "/dev/sde7"
+refresh_filesys: add mount "/" device "/dev/sdc1"
+refresh_filesys: add mount "/archive-1" device "/dev/sde6"
+refresh_filesys: add mount "/backup" device "/dev/vda2"
+refresh_filesys: add mount "/bozo-1" device "/dev/sde5"
+refresh_filesys: add mount "/data" device "/dev/sda6"
+refresh_filesys: add mount "/ssd-cache" device "/dev/sdc5"
+refresh_filesys: add mount "/tmp" device "/dev/sda1"
+refresh_filesys: add mount "/vmstore0" device "/dev/sda7"
+refresh_filesys: add mount "/vmstore3" device "/dev/sde7"
 
 filesys.mountdir
     inst [0 or "/dev/sdc1"] value "/"
@@ -145,15 +146,15 @@ filesys.uuid
 /dev/disk/by-uuid missing ...
 do_uuids: stat(TMP/root/dev/disk/by-uuid) failed: No such file or directory
 do_uuids: stat(TMP/root/dev/disk/by-uuid) failed: No such file or directory
-refresh_filesys: add "/" "/dev/sdc1"
-refresh_filesys: add "/archive-1" "/dev/sde6"
-refresh_filesys: add "/backup" "/dev/vda2"
-refresh_filesys: add "/bozo-1" "/dev/sde5"
-refresh_filesys: add "/data" "/dev/sda6"
-refresh_filesys: add "/ssd-cache" "/dev/sdc5"
-refresh_filesys: add "/tmp" "/dev/sda1"
-refresh_filesys: add "/vmstore0" "/dev/sda7"
-refresh_filesys: add "/vmstore3" "/dev/sde7"
+refresh_filesys: add mount "/" device "/dev/sdc1"
+refresh_filesys: add mount "/archive-1" device "/dev/sde6"
+refresh_filesys: add mount "/backup" device "/dev/vda2"
+refresh_filesys: add mount "/bozo-1" device "/dev/sde5"
+refresh_filesys: add mount "/data" device "/dev/sda6"
+refresh_filesys: add mount "/ssd-cache" device "/dev/sdc5"
+refresh_filesys: add mount "/tmp" device "/dev/sda1"
+refresh_filesys: add mount "/vmstore0" device "/dev/sda7"
+refresh_filesys: add mount "/vmstore3" device "/dev/sde7"
 
 filesys.mountdir
     inst [0 or "/dev/sdc1"] value "/"
@@ -176,3 +177,64 @@ filesys.uuid
     inst [6 or "/dev/sda7"] value ""
     inst [7 or "/dev/sde6"] value ""
     inst [8 or "/dev/sde7"] value ""
+
++++ uuid-01 tarball +++
+situation normal ...
+
+filesys.mountdir
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value "/"
+    inst [1 or "/dev/vda1"] value "/boot"
+
+filesys.uuid
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value "d52039cc-5d37-4742-9bd5-0bc80146c9f0"
+    inst [1 or "/dev/vda1"] value "ab1a4be4-3b08-45c2-8445-b6a577ee1c30"
+
+/dev/mapper empty ...
+do_uuids: Warning: device /dev/dm-0 not in InDom Cache
+do_uuids: Warning: device /dev/dm-1 not in InDom Cache
+do_uuids: Warning: device /dev/sr0 not in InDom Cache
+do_uuids: add device "/dev/vda1" uuid "ab1a4be4-3b08-45c2-8445-b6a577ee1c30"
+do_uuids: readlink(TMP/root//dev/mapper/fedora_vm22-root) failed: No such file or directory
+refresh_filesys: add mount "/" device "/dev/mapper/fedora_vm22-root"
+refresh_filesys: add mount "/boot" device "/dev/vda1"
+
+filesys.mountdir
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value "/"
+    inst [1 or "/dev/vda1"] value "/boot"
+
+filesys.uuid
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value ""
+    inst [1 or "/dev/vda1"] value "ab1a4be4-3b08-45c2-8445-b6a577ee1c30"
+
+/dev/mapper is bogus ...
+do_uuids: Warning: device /dev/dm-0 not in InDom Cache
+do_uuids: Warning: device /dev/dm-1 not in InDom Cache
+do_uuids: Warning: device /dev/sr0 not in InDom Cache
+do_uuids: add device "/dev/vda1" uuid "ab1a4be4-3b08-45c2-8445-b6a577ee1c30"
+refresh_filesys: add mount "/" device "/dev/mapper/fedora_vm22-root" dm_device "/dev/dm-13"
+refresh_filesys: add mount "/boot" device "/dev/vda1"
+
+filesys.mountdir
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value "/"
+    inst [1 or "/dev/vda1"] value "/boot"
+
+filesys.uuid
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value ""
+    inst [1 or "/dev/vda1"] value "ab1a4be4-3b08-45c2-8445-b6a577ee1c30"
+
+/dev/mapper missing ...
+do_uuids: Warning: device /dev/dm-0 not in InDom Cache
+do_uuids: Warning: device /dev/dm-1 not in InDom Cache
+do_uuids: Warning: device /dev/sr0 not in InDom Cache
+do_uuids: add device "/dev/vda1" uuid "ab1a4be4-3b08-45c2-8445-b6a577ee1c30"
+do_uuids: readlink(TMP/root//dev/mapper/fedora_vm22-root) failed: No such file or directory
+refresh_filesys: add mount "/" device "/dev/mapper/fedora_vm22-root"
+refresh_filesys: add mount "/boot" device "/dev/vda1"
+
+filesys.mountdir
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value "/"
+    inst [1 or "/dev/vda1"] value "/boot"
+
+filesys.uuid
+    inst [0 or "/dev/mapper/fedora_vm22-root"] value ""
+    inst [1 or "/dev/vda1"] value "ab1a4be4-3b08-45c2-8445-b6a577ee1c30"