Changeset 3717 in MondoRescue

Timestamp:

Aug 13, 2019, 11:20:03 PM (6 years ago)

Author:

Bruno Cornec

Message:

minor pbtest improvements

File:

• branches/3.3/contrib/pbtest (modified) (3 diffs)

branches/3.3/contrib/pbtest

@@ -5 +5 @@
 # On RHEL 7.3+
 # for ssh access edit pam.d files to avoid root login by ssh to fail with uid < 1000
+# Install on it perl perl-Data-Dumper and perl-YAML
+# setup that VM with pb -p pb -m $DISTRO sbx2setupvm
+# setup that VM after with pb -p mondorescue -m $DISTRO prepvm
+#
+#DISTRO=sles-12-x86_64
 DISTRO=rhel-7-x86_64
 #DISTRO=rhel-5-x86_64
 #DISTRO=fedora-20-x86_64
-#DISTRO=sles-12-x86_64
 
 NAME=`pbdistrocheck $DISTRO | grep -E '^Name:' | awk '{print $2}'`
@@ -18 +22 @@
 TEMP=temp
 CACHE=cache
-MNT=/mnt
+MNT=/mnt2
 KEY=$HOME/.ssh/pb_rsa
-port=`ps auxww | grep qemu | grep -w $D | grep -v grep | perl -p -e 's|.*127.0.0.1:([0-9]+)-:.*|$1|'`
-if [ _"$port" == _"" ]; then
+PORT=`ps auxww | grep qemu | grep -w $D | grep -v grep | perl -p -e 's|.*127.0.0.1:([0-9]+)-:.*|$1|'`
+if [ _"$PORT" == _"" ]; then
     pb -p mondorescue -r branches/3.3 -m $D launchvm
 fi
@@ -55 +59 @@
 \$REPOCMD update -y mondo mindi perl-MondoRescue mindi-busybox
 modprobe nfsv3
+mkdir -p $MNT
 mount -o vers=3 10.0.2.2:$DEST $MNT
 mkdir -p $MNT/$DIR $MNT/$TEMP $MNT/$CACHE
-mondoarchive -N -G -K 99 -E '/home|/var/log|/usr/share/doc|/usr/src|/usr/share/texmf|/mnt' -s 4480m -n 10.0.2.2:$DEST -d $DIR -p $D -z -O -S $MNT/$CACHE -T $MNT/$TEMP 
+mondoarchive -N -G -K 99 -E '/home|/var/log|/usr/share/doc|/usr/src|/usr/share/texmf|/mnt|/mnt2' -s 4480m -n 10.0.2.2:$DEST -d $DIR -p $D -z -O -S $MNT/$CACHE -T $MNT/$TEMP 
 umount $MNT/
 EOF
 # Now should be OK
-port=`ps auxww | grep qemu | grep -w $D | grep -v grep | perl -p -e 's|.*127.0.0.1:([0-9]+)-:.*|$1|'`
+PORT=`ps auxww | grep qemu | grep -w $D | grep -v grep | perl -p -e 's|.*127.0.0.1:([0-9]+)-:.*|$1|'`
 
-ssh -i $KEY -p $port root@localhost "rm -rf ./test"
-scp -i $KEY -P $port /tmp/test root@localhost:
-ssh -i $KEY -p $port root@localhost "chmod 755 ./test ; sh -x ./test"
+ssh -i $KEY -p $PORT root@localhost "rm -rf ./test"
+scp -i $KEY -P $PORT /tmp/test root@localhost:
+ssh -i $KEY -p $PORT root@localhost "chmod 755 ./test ; sh -x ./test"
 
 sudo chown bruno $DEST/temp