Changeset 3707 in MondoRescue

Timestamp:

Apr 13, 2018, 1:35:12 AM (6 years ago)

Author:

Bruno Cornec

Message:

Update pbtest to latest version with SLES support

Location:

branches/3.3

Files:

• MondoRescue/bin/mr-net-get-config (modified) (1 diff)
• ansible/roles/httpd/tasks/main.yml (modified) (1 diff)
• contrib/pbtest (modified) (3 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/3.3/MondoRescue/bin/mr-net-get-config

@@ -37 +37 @@
 =over 4
 
-=item B<proto://[user@]server/export|[user@]server:/export>
+=item B<[proto://][user@]server/export|[user@]server:/export>
 
 This is the name of the network server, followed by a ':' and the exported directory if nfs or you have to specify the protocol used (nfs, sshfs or smbfs) followed by the network server and the exported directory (without ':'). An optional user name may be provided in case it's needed.

branches/3.3/ansible/roles/httpd/tasks/main.yml

@@ -27 +27 @@
   tags: httpd
 
+- name: Setup httpd restart by cron
+  cron: name=httpd-restart minute=43 hour=23 weekday=sunday user=root job="systemctl restart httpd" cron_file=httpd-restart state=present backup=yes 
+  tags: httpd
+
 - name: Configure Apache logrotate
   copy: src=files/mondorescue.logrot dest=/etc/logrotate.d/mondorescue owner=root group=root mode=0644 backup=yes

branches/3.3/contrib/pbtest

@@ -1 +1 @@
 #!/bin/bash
-# Test a remote machine such as Fedora 20
+# Test a remote machine such as Fedora, RHEL, SLES
 #
 
-#DISTRO=rhel-6.2-x86_64
+# On RHEL 7.3+
+# for ssh access edit pam.d files to avoid root login by ssh to fail with uid < 1000
 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}'`
@@ -25 +27 @@
 pb -p mondorescue -r branches/3.3 -m $D sbx2vm MondoRescue mondo mindi mindi-busybox
 cat > /tmp/test << EOF
-cd /etc/yum.repos.d
-yum install -y curl
-if [ ! -f /etc/yum.repos.d/mondorescue.repo ]; then
+#!/bin/bash
+#
+if [ $NAME = "rhel" ]; then
+    REPODIR="/etc/yum.repos.d"
+    REPOCMD="yum"
+elif [ $NAME = "sles" ]; then
+    REPODIR="/etc/zypp/repos.d"
+    REPOCMD="zypper"
+fi
+\$REPOCMD install -y curl
+cd \$REPODIR
+if [ ! -f \$REPODIR/mondorescue.repo ]; then
     curl ftp://ftp.mondorescue.org/$NAME/$VER/$ARCH/mondorescue.repo -o mondorescue.repo
 fi
-if [ ! -f /etc/yum.repos.d/mondorescue-test.repo ]; then
+if [ ! -f \$REPODIR/mondorescue-test.repo ]; then
     curl ftp://ftp.mondorescue.org/test/$NAME/$VER/$ARCH/mondorescue-test.repo -o mondorescue-test.repo
 fi
-yum makecache fast
-yum install mondo -y
-yum update mondo mindi perl-MondoRescue mindi-busybox -y
-yum install nfs-utils -y
+if [ $NAME = "rhel" ]; then
+    \$REPOCMD makecache fast
+elif [ $NAME = "sles" ]; then
+    \$REPOCMD ref
+fi
+\$REPOCMD install -y nfs-utils
+# To take test repo first do it that way
+\$REPOCMD install -y mindi
+\$REPOCMD install -y mondo
+\$REPOCMD update -y mondo mindi perl-MondoRescue mindi-busybox
 modprobe nfsv3
 mount -o vers=3 10.0.2.2:$DEST $MNT
@@ -48 +65 @@
 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 ; ./test"
+ssh -i $KEY -p $port root@localhost "chmod 755 ./test ; sh -x ./test"
 
 sudo chown bruno $DEST/temp

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1504 +1504 @@
         log_msg(1, "    mr-mount-me");
         log_msg(1, "    chroot " MNT_RESTORING);
-        log_msg(1, "    mount /boot");
+        log_msg(1, "    mount /boot if needed");
         log_msg(1, "    grub-install '(hd0)'");
         log_msg(1, "    exit");