From c3cf388664785f2cb194f93e2e650df930057c2e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 07 2019 11:49:51 +0000 Subject: import rear-2.4-6.el8 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..38668b3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/rear-2.4.tar.gz diff --git a/.rear.metadata b/.rear.metadata new file mode 100644 index 0000000..68e7cba --- /dev/null +++ b/.rear.metadata @@ -0,0 +1 @@ +9f6037ea582635ed78f1dffaa8a7cc5cdc7db37a SOURCES/rear-2.4.tar.gz diff --git a/SOURCES/rear-bz1492177-warning.patch b/SOURCES/rear-bz1492177-warning.patch new file mode 100644 index 0000000..1f5556f --- /dev/null +++ b/SOURCES/rear-bz1492177-warning.patch @@ -0,0 +1,15 @@ +diff --git a/usr/share/rear/output/ISO/Linux-i386/249_check_rhel_grub2_efi_package.sh b/usr/share/rear/output/ISO/Linux-i386/249_check_rhel_grub2_efi_package.sh +new file mode 100644 +index 00000000..4c4ded08 +--- /dev/null ++++ b/usr/share/rear/output/ISO/Linux-i386/249_check_rhel_grub2_efi_package.sh +@@ -0,0 +1,9 @@ ++# 249_check_rhel_grub2_efi_package.sh ++ ++is_true $USING_UEFI_BOOTLOADER || return # empty or 0 means NO UEFI ++ ++( ++ VERBOSE=1 ++ test -r /usr/lib/grub/x86_64-efi/moddep.lst ++ PrintIfError "WARNING: /usr/lib/grub/x86_64-efi/moddep.lst not found, grub2-mkimage will likely fail. Please install the grub2-efi-x64-modules package to fix this." ++) diff --git a/SOURCES/rear-bz1631183.patch b/SOURCES/rear-bz1631183.patch new file mode 100644 index 0000000..7c0ad0f --- /dev/null +++ b/SOURCES/rear-bz1631183.patch @@ -0,0 +1,275 @@ +diff --git a/usr/share/rear/backup/NETFS/default/500_make_backup.sh b/usr/share/rear/backup/NETFS/default/500_make_backup.sh +index 47266910..7170cda6 100644 +--- a/usr/share/rear/backup/NETFS/default/500_make_backup.sh ++++ b/usr/share/rear/backup/NETFS/default/500_make_backup.sh +@@ -67,49 +67,99 @@ else + SPLIT_COMMAND="dd of=$backuparchive" + fi + ++# Used by "tar" method to record which pipe command failed ++FAILING_BACKUP_PROG_FILE="$TMP_DIR/failing_backup_prog" ++FAILING_BACKUP_PROG_RC_FILE="$TMP_DIR/failing_backup_prog_rc" ++ + LogPrint "Creating $BACKUP_PROG archive '$backuparchive'" + ProgressStart "Preparing archive operation" + ( + case "$(basename ${BACKUP_PROG})" in +- # tar compatible programs here +- (tar) +- set_tar_features +- Log $BACKUP_PROG $TAR_OPTIONS --sparse --block-number --totals --verbose \ +- --no-wildcards-match-slash --one-file-system \ +- --ignore-failed-read "${BACKUP_PROG_OPTIONS[@]}" \ +- $BACKUP_PROG_CREATE_NEWER_OPTIONS \ +- ${BACKUP_PROG_BLOCKS:+-b $BACKUP_PROG_BLOCKS} "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ +- -X $TMP_DIR/backup-exclude.txt -C / -c -f - \ +- $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE \| $BACKUP_PROG_CRYPT_OPTIONS BACKUP_PROG_CRYPT_KEY \| $SPLIT_COMMAND +- $BACKUP_PROG $TAR_OPTIONS --sparse --block-number --totals --verbose \ +- --no-wildcards-match-slash --one-file-system \ +- --ignore-failed-read "${BACKUP_PROG_OPTIONS[@]}" \ +- $BACKUP_PROG_CREATE_NEWER_OPTIONS \ +- ${BACKUP_PROG_BLOCKS:+-b $BACKUP_PROG_BLOCKS} "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ +- -X $TMP_DIR/backup-exclude.txt -C / -c -f - \ +- $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE | $BACKUP_PROG_CRYPT_OPTIONS $BACKUP_PROG_CRYPT_KEY | $SPLIT_COMMAND +- ;; +- (rsync) +- # make sure that the target is a directory +- mkdir -p $v "$backuparchive" >&2 +- Log $BACKUP_PROG --verbose "${BACKUP_RSYNC_OPTIONS[@]}" --one-file-system --delete \ +- --exclude-from=$TMP_DIR/backup-exclude.txt --delete-excluded \ +- $(cat $TMP_DIR/backup-include.txt) "$backuparchive" +- $BACKUP_PROG --verbose "${BACKUP_RSYNC_OPTIONS[@]}" --one-file-system --delete \ +- --exclude-from=$TMP_DIR/backup-exclude.txt --delete-excluded \ +- $(cat $TMP_DIR/backup-include.txt) "$backuparchive" >&2 +- ;; +- (*) +- Log "Using unsupported backup program '$BACKUP_PROG'" +- Log $BACKUP_PROG "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ +- $BACKUP_PROG_OPTIONS_CREATE_ARCHIVE $TMP_DIR/backup-exclude.txt \ +- "${BACKUP_PROG_OPTIONS[@]}" $backuparchive \ +- $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE > $backuparchive +- $BACKUP_PROG "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ +- $BACKUP_PROG_OPTIONS_CREATE_ARCHIVE $TMP_DIR/backup-exclude.txt \ +- "${BACKUP_PROG_OPTIONS[@]}" $backuparchive \ +- $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE > $backuparchive +- ;; ++ # tar compatible programs here ++ (tar) ++ set_tar_features ++ Log $BACKUP_PROG $TAR_OPTIONS --sparse --block-number --totals --verbose \ ++ --no-wildcards-match-slash --one-file-system \ ++ --ignore-failed-read "${BACKUP_PROG_OPTIONS[@]}" \ ++ $BACKUP_PROG_CREATE_NEWER_OPTIONS \ ++ ${BACKUP_PROG_BLOCKS:+-b $BACKUP_PROG_BLOCKS} "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ ++ -X $TMP_DIR/backup-exclude.txt -C / -c -f - \ ++ $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE \| $BACKUP_PROG_CRYPT_OPTIONS BACKUP_PROG_CRYPT_KEY \| $SPLIT_COMMAND ++ ++ # Variable used to record the short name of piped commands in case of ++ # error, e.g. ( "tar" "cat" "dd" ) in case of unencrypted and unsplit backup. ++ backup_prog_shortnames=( ++ "$(basename $(echo "$BACKUP_PROG" | awk '{ print $1 }'))" ++ "$(basename $(echo "$BACKUP_PROG_CRYPT_OPTIONS" | awk '{ print $1 }'))" ++ "$(basename $(echo "$SPLIT_COMMAND" | awk '{ print $1 }'))" ++ ) ++ for index in ${!backup_prog_shortnames[@]} ; do ++ [ -n "${backup_prog_shortnames[$index]}" ] || BugError "No computed shortname for pipe component $index" ++ done ++ ++ $BACKUP_PROG $TAR_OPTIONS --sparse --block-number --totals --verbose \ ++ --no-wildcards-match-slash --one-file-system \ ++ --ignore-failed-read "${BACKUP_PROG_OPTIONS[@]}" \ ++ $BACKUP_PROG_CREATE_NEWER_OPTIONS \ ++ ${BACKUP_PROG_BLOCKS:+-b $BACKUP_PROG_BLOCKS} \ ++ "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ ++ -X $TMP_DIR/backup-exclude.txt -C / -c -f - \ ++ $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE | \ ++ \ ++ $BACKUP_PROG_CRYPT_OPTIONS $BACKUP_PROG_CRYPT_KEY | \ ++ \ ++ $SPLIT_COMMAND ++ pipes_rc=( ${PIPESTATUS[@]} ) ++ ++ # Exit code logic: ++ # - never return rc=1 (this is reserved for "tar" warning about modified files) ++ # - process exit code in pipe's reverse order ++ # - if last command failed (e.g. "dd"), return an error ++ # - otherwise if previous command failed (e.g. "encrypt"), return an error ++ # ... ++ # - otherwise return "tar" exit code ++ # ++ # When an error occurs, record the program name in $FAILING_BACKUP_PROG_FILE ++ # and real exit code in $FAILING_BACKUP_PROG_RC_FILE. ++ ++ let index=${#pipes_rc[@]}-1 ++ while [ $index -ge 0 ] ; do ++ rc=${pipes_rc[$index]} ++ if [ $rc -ne 0 ] ; then ++ echo "${backup_prog_shortnames[$index]}" > $FAILING_BACKUP_PROG_FILE ++ echo "$rc" > $FAILING_BACKUP_PROG_RC_FILE ++ if [ $rc -eq 1 ] && [ "${backup_prog_shortnames[$index]}" != "tar" ] ; then ++ rc=2 ++ fi ++ exit $rc ++ fi ++ # This pipe command succeeded, check the previous one ++ let index-- ++ done ++ # This was a success ++ exit 0 ++ ;; ++ (rsync) ++ # make sure that the target is a directory ++ mkdir -p $v "$backuparchive" >&2 ++ Log $BACKUP_PROG --verbose "${BACKUP_RSYNC_OPTIONS[@]}" --one-file-system --delete \ ++ --exclude-from=$TMP_DIR/backup-exclude.txt --delete-excluded \ ++ $(cat $TMP_DIR/backup-include.txt) "$backuparchive" ++ $BACKUP_PROG --verbose "${BACKUP_RSYNC_OPTIONS[@]}" --one-file-system --delete \ ++ --exclude-from=$TMP_DIR/backup-exclude.txt --delete-excluded \ ++ $(cat $TMP_DIR/backup-include.txt) "$backuparchive" >&2 ++ ;; ++ (*) ++ Log "Using unsupported backup program '$BACKUP_PROG'" ++ Log $BACKUP_PROG "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ ++ $BACKUP_PROG_OPTIONS_CREATE_ARCHIVE $TMP_DIR/backup-exclude.txt \ ++ "${BACKUP_PROG_OPTIONS[@]}" $backuparchive \ ++ $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE > $backuparchive ++ $BACKUP_PROG "${BACKUP_PROG_COMPRESS_OPTIONS[@]}" \ ++ $BACKUP_PROG_OPTIONS_CREATE_ARCHIVE $TMP_DIR/backup-exclude.txt \ ++ "${BACKUP_PROG_OPTIONS[@]}" $backuparchive \ ++ $(cat $TMP_DIR/backup-include.txt) $RUNTIME_LOGFILE > $backuparchive ++ ;; + esac 2> "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log" + # important trick: the backup prog is the last in each case entry and the case .. esac is the last command + # in the (..) subshell. As a result the return code of the subshell is the return code of the backup prog! +@@ -121,44 +171,44 @@ sleep 1 # Give the backup software a good chance to start working + + # return disk usage in bytes + function get_disk_used() { +- let "$(stat -f -c 'used=(%b-%f)*%S' $1)" +- echo $used ++ let "$(stat -f -c 'used=(%b-%f)*%S' $1)" ++ echo $used + } + + # While the backup runs in a sub-process, display some progress information to the user. + # ProgressInfo texts have a space at the end to get the 'OK' from ProgressStop shown separated. + test "$PROGRESS_WAIT_SECONDS" || PROGRESS_WAIT_SECONDS=1 + case "$( basename $BACKUP_PROG )" in +- (tar) +- while sleep $PROGRESS_WAIT_SECONDS ; kill -0 $BackupPID 2>/dev/null; do +- #blocks="$(stat -c %b ${backuparchive})" +- #size="$((blocks*512))" +- size="$(stat -c %s ${backuparchive}* | awk '{s+=$1} END {print s}')" +- ProgressInfo "Archived $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec] " +- done +- ;; +- (rsync) +- # since we do not want to do a $(du -s) run every second we count disk usage instead +- # this obviously leads to wrong results in case something else is writing to the same +- # disk at the same time as is very likely with a networked file system. For local disks +- # this should be good enough and in any case this is only some eye candy. +- # TODO: Find a fast way to count the actual transfer data, preferrable getting the info from rsync. +- let old_disk_used="$(get_disk_used "$backuparchive")" +- while sleep $PROGRESS_WAIT_SECONDS ; kill -0 $BackupPID 2>/dev/null; do +- let disk_used="$(get_disk_used "$backuparchive")" size=disk_used-old_disk_used +- ProgressInfo "Archived $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec] " +- done +- ;; +- (*) +- while sleep $PROGRESS_WAIT_SECONDS ; kill -0 $BackupPID 2>/dev/null; do +- size="$(stat -c "%s" "$backuparchive")" || { +- kill -9 $BackupPID +- ProgressError +- Error "$(basename $BACKUP_PROG) failed to create the archive file" +- } +- ProgressInfo "Archived $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec] " +- done +- ;; ++ (tar) ++ while sleep $PROGRESS_WAIT_SECONDS ; kill -0 $BackupPID 2>/dev/null; do ++ #blocks="$(stat -c %b ${backuparchive})" ++ #size="$((blocks*512))" ++ size="$(stat -c %s ${backuparchive}* | awk '{s+=$1} END {print s}')" ++ ProgressInfo "Archived $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec] " ++ done ++ ;; ++ (rsync) ++ # since we do not want to do a $(du -s) run every second we count disk usage instead ++ # this obviously leads to wrong results in case something else is writing to the same ++ # disk at the same time as is very likely with a networked file system. For local disks ++ # this should be good enough and in any case this is only some eye candy. ++ # TODO: Find a fast way to count the actual transfer data, preferrable getting the info from rsync. ++ let old_disk_used="$(get_disk_used "$backuparchive")" ++ while sleep $PROGRESS_WAIT_SECONDS ; kill -0 $BackupPID 2>/dev/null; do ++ let disk_used="$(get_disk_used "$backuparchive")" size=disk_used-old_disk_used ++ ProgressInfo "Archived $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec] " ++ done ++ ;; ++ (*) ++ while sleep $PROGRESS_WAIT_SECONDS ; kill -0 $BackupPID 2>/dev/null; do ++ size="$(stat -c "%s" "$backuparchive")" || { ++ kill -9 $BackupPID ++ ProgressError ++ Error "$(basename $BACKUP_PROG) failed to create the archive file" ++ } ++ ProgressInfo "Archived $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec] " ++ done ++ ;; + esac + ProgressStop + transfertime="$((SECONDS-starttime))" +@@ -177,10 +227,12 @@ sleep 1 + # everyone should see this warning, even if not verbose + case "$(basename $BACKUP_PROG)" in + (tar) +- if (( $backup_prog_rc == 1 )); then +- LogPrint "WARNING: $(basename $BACKUP_PROG) ended with return code $backup_prog_rc and below output: ++ if (( $backup_prog_rc != 0 )); then ++ prog="$(cat $FAILING_BACKUP_PROG_FILE)" ++ if (( $backup_prog_rc == 1 )); then ++ LogUserOutput "WARNING: $prog ended with return code 1 and below output: + ---snip--- +-$(grep '^tar: ' $RUNTIME_LOGFILE | sed -e 's/^/ /' | tail -n3) ++$(grep '^tar: ' "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log" | sed -e 's/^/ /' | tail -n3) + ---------- + This means that files have been modified during the archiving + process. As a result the backup may not be completely consistent +@@ -188,16 +240,19 @@ or may not be a perfect copy of the system. Relax-and-Recover + will continue, however it is highly advisable to verify the + backup in order to be sure to safely recover this system. + " +- elif (( $backup_prog_rc > 1 )); then +- Error "$(basename $BACKUP_PROG) failed with return code $backup_prog_rc and below output: ++ else ++ rc=$(cat $FAILING_BACKUP_PROG_RC_FILE) ++ Error "$prog failed with return code $rc and below output: + ---snip--- +-$(grep '^tar: ' $RUNTIME_LOGFILE | sed -e 's/^/ /' | tail -n3) ++$(grep "^$prog: " "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log" | sed -e 's/^/ /' | tail -n3) + ---------- + This means that the archiving process ended prematurely, or did + not even start. As a result it is unlikely you can recover this + system properly. Relax-and-Recover is therefore aborting execution. + " +- fi;; ++ fi ++ fi ++ ;; + (*) + if (( $backup_prog_rc > 0 )) ; then + Error "$(basename $BACKUP_PROG) failed with return code $backup_prog_rc +@@ -212,10 +267,12 @@ esac + + tar_message="$(tac $RUNTIME_LOGFILE | grep -m1 '^Total bytes written: ')" + if [ $backup_prog_rc -eq 0 -a "$tar_message" ] ; then +- LogPrint "$tar_message in $transfertime seconds." ++ LogPrint "$tar_message in $transfertime seconds." + elif [ "$size" ]; then +- LogPrint "Archived $((size/1024/1024)) MiB in $((transfertime)) seconds [avg $((size/1024/transfertime)) KiB/sec]" ++ LogPrint "Archived $((size/1024/1024)) MiB in $((transfertime)) seconds [avg $((size/1024/transfertime)) KiB/sec]" + fi + + ### Copy progress log to backup media + cp $v "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log" "${opath}/${BACKUP_PROG_ARCHIVE}.log" >&2 ++ ++# vim: set et ts=4 sw=4: diff --git a/SOURCES/rear-bz1639705.patch b/SOURCES/rear-bz1639705.patch new file mode 100644 index 0000000..88b6358 --- /dev/null +++ b/SOURCES/rear-bz1639705.patch @@ -0,0 +1,1487 @@ +diff --git a/tests/setup1/README b/tests/setup1/README +index 75bc000b..1cc4faa8 100644 +--- a/tests/setup1/README ++++ b/tests/setup1/README +@@ -3,7 +3,7 @@ + +----------------------------------+ + + +-You need a VM with 10 network interfaces (eth0 being the main interface). ++You need a VM with 13 network interfaces (eth0 being the main interface). + All interfaces except eth0 can be non-reachable. + + kvm.xml is an example template of such VM. +@@ -12,10 +12,11 @@ kvm.xml is an example template of such VM. + eth0 IP 192.168.122.x/24 default 192.168.122.1 (x=177) + bond12 eth1 + eth2 mode=4 miimon=1000 IP 1.1.1.1 + bond34 eth3 + eth4 mode=1 miimon=100 IP 2.2.2.2 route 102.0.0.0/8 +-team56 eth5 + eth6 IP 3.3.3.3 route 103.0.0.0/8 ++team56 eth5 + eth6 lacp IP 3.3.3.3 route 103.0.0.0/8 + bridge78 eth7 + eth8 IP 4.4.4.4 route 104.0.0.0/8 + vlan1eth9 eth9.1 IP 5.5.5.5 route 105.0.0.0/8 + eth10 IP 6.6.6.6 route 106.0.0.0/8 ++team1112 eth11 + eth12 activebackup IP 7.7.7.7 route 107.0.0.0/8 + + routes: + default via 192.168.122.1 dev eth0 +@@ -24,23 +25,24 @@ default via 192.168.122.1 dev eth0 + 104.0.0.0/8 via 4.4.4.254 dev bridge78 + 105.0.0.0/8 via 5.5.5.254 dev eth9.1 + 106.0.0.0/8 via 6.6.6.254 dev eth10 ++107.0.0.0/8 via 7.7.7.254 dev team1112 + + + Running the unit tests: + ---------------------- + +-After copying the files and making sure the script has been adapted, ++After copying the network configuration files and rebooting the system, + + from the VM, run the following command: + +-# for i in $(seq 1 8); do ./tcase$i.sh; done ++# for i in $(seq 1 8); do ./tcase${i}.sh; done + + This will record the generated network+route files. + + Then to verify result, run the following command (this will take down the + network, except eth0): + +-# for i in $(seq 1 8); do ./verify.sh tcase$i_results; done ++# for i in $(seq 1 8); do ./verify.sh tcase${i}_results; done + + + ------------------------------------------------------------------------------- +@@ -51,92 +53,98 @@ Test Case #1: standard + + Expected results: + +-team56 -> eth5 + default via 192.168.122.1 dev eth0 + 102.0.0.0/8 via 2.2.2.254 dev bond34 +-103.0.0.0/8 via 3.3.3.254 dev eth5 ++103.0.0.0/8 via 3.3.3.254 dev team56 + 104.0.0.0/8 via 4.4.4.254 dev bridge78 + 105.0.0.0/8 via 5.5.5.254 dev eth9.1 + 106.0.0.0/8 via 6.6.6.254 dev eth10 ++107.0.0.0/8 via 7.7.7.254 dev team1112 + + + Test Case #2: simplification + ------------ + +-SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y ++SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y SIMPLIFY_TEAMING=y + + Expected results: + +-bond12 -> eth1 ++bond12 -> bond12 (not simplified because mode=4) + bond34 -> eth3 +-team56 -> eth5 ++team56 -> team56 (not simplified because runner=lacp) + bridge78 -> eth7 ++team1112 -> eth11 + default via 192.168.122.1 dev eth0 + 102.0.0.0/8 via 2.2.2.254 dev eth3 +-103.0.0.0/8 via 3.3.3.254 dev eth5 ++103.0.0.0/8 via 3.3.3.254 dev team56 + 104.0.0.0/8 via 4.4.4.254 dev eth7 + 105.0.0.0/8 via 5.5.5.254 dev eth9.1 + 106.0.0.0/8 via 6.6.6.254 dev eth10 ++107.0.0.0/8 via 7.7.7.254 dev eth11 + + +-Test Case #3: standard with eth2, eth4, eth6, eth8, eth10 DOWN ++Test Case #3: standard with eth2, eth4, eth6, eth8, eth10, eth12 DOWN + ------------ + +-for eth in eth2 eth4 eth6 eth8 eth10; do ifdown $eth; done ++for eth in eth2 eth4 eth6 eth8 eth10 eth12; do ifdown $eth; done + + Expected results: + + eth2, eth4, eth6, eth8, eth10 not in file + default via 192.168.122.1 dev eth0 + 102.0.0.0/8 via 2.2.2.254 dev bond34 +-103.0.0.0/8 via 3.3.3.254 dev eth5 ++103.0.0.0/8 via 3.3.3.254 dev team56 + 104.0.0.0/8 via 4.4.4.254 dev bridge78 + 105.0.0.0/8 via 5.5.5.254 dev eth9.1 ++107.0.0.0/8 via 7.7.7.254 dev team1112 + + +-Test Case #4: simplification with eth2, eth4, eth6, eth8, eth10 DOWN ++Test Case #4: simplification with eth2, eth4, eth6, eth8, eth10, eth12 DOWN + ------------ + +-for eth in eth2 eth4 eth6 eth8 eth10; do ifdown $eth; done ++for eth in eth2 eth4 eth6 eth8 eth10 eth12; do ifdown $eth; done + + Expected results: + +-eth2, eth4, eth6, eth8, eth10 not in file ++eth4, eth6, eth8, eth10, eth12 not in file + default via 192.168.122.1 dev eth0 + 102.0.0.0/8 via 2.2.2.254 dev eth3 +-103.0.0.0/8 via 3.3.3.254 dev eth5 ++103.0.0.0/8 via 3.3.3.254 dev team56 + 104.0.0.0/8 via 4.4.4.254 dev eth7 + 105.0.0.0/8 via 5.5.5.254 dev eth9.1 ++107.0.0.0/8 via 7.7.7.254 dev eth11 + + +-Test Case #5: standard with eth1, eth3, eth5, eth7, eth9 DOWN ++Test Case #5: standard with eth1, eth3, eth5, eth7, eth9, eth11 DOWN + ------------ + +-for eth in eth1 eth3 eth5 eth7 eth9; do ifdown $eth; done ++for eth in eth1 eth3 eth5 eth7 eth9 eth11; do ifdown $eth; done + + Expected results: + + eth2, eth4, eth6, eth8, eth10 not in file + default via 192.168.122.1 dev eth0 + 102.0.0.0/8 via 2.2.2.254 dev bond34 +-103.0.0.0/8 via 3.3.3.254 dev eth6 ++103.0.0.0/8 via 3.3.3.254 dev team56 + 104.0.0.0/8 via 4.4.4.254 dev bridge78 + 106.0.0.0/8 via 6.6.6.254 dev eth10 ++107.0.0.0/8 via 7.7.7.254 dev team1112 + + +-Test Case #6: simplification with eth1, eth3, eth5, eth7, eth9 DOWN ++Test Case #6: simplification with eth1, eth3, eth5, eth7, eth9, eth11 DOWN + ------------ + +-for eth in eth1 eth3 eth5 eth7 eth9; do ifdown $eth; done ++for eth in eth1 eth3 eth5 eth7 eth9 eth11; do ifdown $eth; done + + Expected results: + +-eth2, eth4, eth6, eth8, eth10 not in file ++eth4, eth6, eth8, eth10 not in file + default via 192.168.122.1 dev eth0 + 102.0.0.0/8 via 2.2.2.254 dev eth4 +-103.0.0.0/8 via 3.3.3.254 dev eth6 ++103.0.0.0/8 via 3.3.3.254 dev team56 + 104.0.0.0/8 via 4.4.4.254 dev eth8 + 106.0.0.0/8 via 6.6.6.254 dev eth10 ++107.0.0.0/8 via 7.7.7.254 dev eth12 + + + Test Case #7: IP address mapping +@@ -149,6 +157,7 @@ bond34 2.2.2.100/16 + bridge78 4.4.4.100/24 + #eth9.1 5.5.5.100/24 + eth10 6.6.6.100/16 ++team1112 7.7.7.100/16 + + Expected results: + +@@ -156,14 +165,15 @@ bond12 -> 1.1.1.100/16 + bond34 -> 2.2.2.100/16 + eth5 -> 3.3.3.3/16 (no mapping) + bridge78 -> 4.4.4.100/24 +-eth9.1 => 5.5.5.5/24 (no mapping) +-eth10 => 6.6.6.100/16 ++eth9.1 -> 5.5.5.5/24 (no mapping) ++eth10 -> 6.6.6.100/16 ++team1112 -> 7.7.7.100/16 + + + Test Case #8: IP address mapping & simplification + ------------ + +-SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y ++SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y SIMPLIFY_TEAMING=y + + # cat mappings/ip_addresses + bond12 1.1.1.100/16 +@@ -172,12 +182,14 @@ bond34 2.2.2.100/16 + bridge78 4.4.4.100/24 + #eth9.1 5.5.5.100/24 + eth10 6.6.6.100/16 ++team1112 7.7.7.100/16 + + Expected results: + +-eth1 => 1.1.1.100/16 +-eth3 => 2.2.2.100/16 +-eth5 => 3.3.3.3/16 (no mapping) +-eth7 => 4.4.4.100/24 +-eth9.1 => 5.5.5.5/24 (no mapping) +-eth10 => 6.6.6.100/16 ++bond12 -> 1.1.1.100/16 ++eth3 -> 2.2.2.100/16 ++eth5 -> 3.3.3.3/16 (no mapping) ++eth7 -> 4.4.4.100/24 ++eth9.1 -> 5.5.5.5/24 (no mapping) ++eth10 -> 6.6.6.100/16 ++eth11 -> 7.7.7.100/16 +diff --git a/tests/setup1/etc/sysconfig/network-scripts/ifcfg-eth11 b/tests/setup1/etc/sysconfig/network-scripts/ifcfg-eth11 +new file mode 100644 +index 00000000..f8709b3e +--- /dev/null ++++ b/tests/setup1/etc/sysconfig/network-scripts/ifcfg-eth11 +@@ -0,0 +1,6 @@ ++NAME="eth11" ++DEVICE="eth11" ++ONBOOT="yes" ++TEAM_MASTER="team1112" ++DEVICETYPE="TeamPort" ++TYPE="Ethernet" +diff --git a/tests/setup1/etc/sysconfig/network-scripts/ifcfg-eth12 b/tests/setup1/etc/sysconfig/network-scripts/ifcfg-eth12 +new file mode 100644 +index 00000000..a5d62722 +--- /dev/null ++++ b/tests/setup1/etc/sysconfig/network-scripts/ifcfg-eth12 +@@ -0,0 +1,6 @@ ++NAME="eth12" ++DEVICE="eth12" ++ONBOOT="yes" ++TEAM_MASTER="team1112" ++DEVICETYPE="TeamPort" ++TYPE="Ethernet" +diff --git a/tests/setup1/etc/sysconfig/network-scripts/ifcfg-team1112 b/tests/setup1/etc/sysconfig/network-scripts/ifcfg-team1112 +new file mode 100644 +index 00000000..fd48fb47 +--- /dev/null ++++ b/tests/setup1/etc/sysconfig/network-scripts/ifcfg-team1112 +@@ -0,0 +1,9 @@ ++DEVICE="team1112" ++TEAM_CONFIG='{"device":"team1112","runner":{"name":"activebackup"},"link_watch":{"name":"ethtool"},"ports":{"eth11":{"prio":-10,"sticky":true},"eth12":{"prio":100}}}' ++PROXY_METHOD="none" ++BROWSER_ONLY="no" ++NAME="team1112" ++ONBOOT="yes" ++DEVICETYPE="Team" ++IPADDR=7.7.7.7 ++PREFIX=16 +diff --git a/tests/setup1/etc/sysconfig/network-scripts/route-team1112 b/tests/setup1/etc/sysconfig/network-scripts/route-team1112 +new file mode 100644 +index 00000000..d3e82f33 +--- /dev/null ++++ b/tests/setup1/etc/sysconfig/network-scripts/route-team1112 +@@ -0,0 +1 @@ ++107.0.0.0/8 via 7.7.7.254 +diff --git a/tests/setup1/kvm.xml b/tests/setup1/kvm.xml +index 3e7e84aa..2e7d10cf 100644 +--- a/tests/setup1/kvm.xml ++++ b/tests/setup1/kvm.xml +@@ -106,6 +106,14 @@ + +
+ ++ ++ ++
++ ++ ++ ++
++ + + + +diff --git a/tests/setup1/mappings/ip_addresses b/tests/setup1/mappings/ip_addresses +index 145300b9..102fdfcf 100644 +--- a/tests/setup1/mappings/ip_addresses ++++ b/tests/setup1/mappings/ip_addresses +@@ -4,3 +4,4 @@ bond34 2.2.2.100/16 + bridge78 4.4.4.100/24 + #eth9.1 5.5.5.100/24 + eth10 6.6.6.100/16 ++team1112 7.7.7.100/16 +diff --git a/tests/setup1/run.sh b/tests/setup1/run.sh +index 8dbc436b..3de8a5ba 100644 +--- a/tests/setup1/run.sh ++++ b/tests/setup1/run.sh +@@ -4,9 +4,9 @@ echo + echo "$0" + echo + +-REAR_DIR="/path/to/rear/sources" ++REAR_DIR="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/../..")" + +-RESULT_DIR="/root/$(basename $0 .sh)_results" ++RESULT_DIR="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")/$(basename $0 .sh)_results" + mkdir -p $RESULT_DIR + + function DebugPrint () { +@@ -41,9 +41,10 @@ function has_binary () { + which $1 >/dev/null 2>&1 + } + +-TMP_DIR=/root/tmp ++TMP_DIR="/tmp/$(basename "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" + +-rm -fr $TMP_DIR ++rm -fr $TMP_DIR >/dev/null 2>&1 ++mkdir -p $TMP_DIR + + # Add to sed -e below to test "ip_link_supports_bridge='false'" (RHEL6) + # -e "s#\$ip_link_supports_bridge#'false'#" \ +@@ -53,13 +54,13 @@ rm -fr $TMP_DIR + + # Add to sed -e below to have code using 'brctl' instead of 'ip link' (RHEL6) + # -e "s#\$net_devices_have_lower_links#'false'#" \ +-sed -e "s#^network_devices_setup_script=.*#network_devices_setup_script=/tmp/60-network-devices.sh#" \ +- $REAR_DIR/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh > /tmp/310_network_devices.sh +-sed "s#^netscript=.*#netscript=/tmp/62-routing.sh#" $REAR_DIR/usr/share/rear/rescue/GNU/Linux/350_routing.sh > /tmp/350_routing.sh ++sed -e "s#^network_devices_setup_script=.*#network_devices_setup_script=$TMP_DIR/60-network-devices.sh#" \ ++ $REAR_DIR/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh > $TMP_DIR/310_network_devices.sh ++sed "s#^network_routing_setup_script=.*#network_routing_setup_script=$TMP_DIR/62-routing.sh#" $REAR_DIR/usr/share/rear/rescue/GNU/Linux/350_routing.sh > $TMP_DIR/350_routing.sh + +-. /tmp/310_network_devices.sh +-. /tmp/350_routing.sh ++. $TMP_DIR/310_network_devices.sh ++. $TMP_DIR/350_routing.sh + +-for f in /tmp/60-network-devices.sh /tmp/62-routing.sh; do ++for f in $TMP_DIR/60-network-devices.sh $TMP_DIR/62-routing.sh; do + grep -v "dev eth0" $f > $RESULT_DIR/$(basename $f) + done +diff --git a/tests/setup1/tcase1.sh b/tests/setup1/tcase1.sh +index 597f3f5c..7b5032c7 100755 +--- a/tests/setup1/tcase1.sh ++++ b/tests/setup1/tcase1.sh +@@ -1,6 +1,5 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup1/tcase1_results/ip_a.expected b/tests/setup1/tcase1_results/ip_a.expected +index e039f6f9..415d840b 100644 +--- a/tests/setup1/tcase1_results/ip_a.expected ++++ b/tests/setup1/tcase1_results/ip_a.expected +@@ -2,14 +2,15 @@ eth1: mtu 1500 qdisc pfifo_fast master b + eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 +-eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5 +-eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth5: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 ++eth6: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast master bridge78 state UP qlen 1000 + eth8: mtu 1500 qdisc pfifo_fast master bridge78 state UP qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 6.6.6.6/16 scope global eth10 ++eth11: mtu 1500 qdisc pfifo_fast master team1112 state UP qlen 1000 ++eth12: mtu 1500 qdisc pfifo_fast master team1112 state UP qlen 1000 + bond12: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 1.1.1.1/16 scope global bond12 + bond34: mtu 1500 qdisc noqueue state UP qlen 1000 +@@ -18,3 +19,7 @@ bridge78: mtu 1500 qdisc noqueue state UP qlen + inet 4.4.4.4/24 scope global bridge78 + eth9.1@eth9: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 5.5.5.5/24 scope global eth9.1 ++team1112: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 7.7.7.7/16 scope global team1112 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 +diff --git a/tests/setup1/tcase1_results/ip_r.expected b/tests/setup1/tcase1_results/ip_r.expected +index 0e5ee87c..f246714c 100644 +--- a/tests/setup1/tcase1_results/ip_r.expected ++++ b/tests/setup1/tcase1_results/ip_r.expected +@@ -3,9 +3,11 @@ + 104.0.0.0/8 via 4.4.4.254 + 105.0.0.0/8 via 5.5.5.254 + 106.0.0.0/8 via 6.6.6.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.1 + 2.2.0.0/16 proto kernel scope link src 2.2.2.2 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.4 + 5.5.5.0/24 proto kernel scope link src 5.5.5.5 + 6.6.0.0/16 proto kernel scope link src 6.6.6.6 ++7.7.0.0/16 proto kernel scope link src 7.7.7.7 +diff --git a/tests/setup1/tcase2.sh b/tests/setup1/tcase2.sh +index faa39396..65d1aa34 100755 +--- a/tests/setup1/tcase2.sh ++++ b/tests/setup1/tcase2.sh +@@ -1,9 +1,9 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup1/tcase2_results/ip_a.expected b/tests/setup1/tcase2_results/ip_a.expected +index 51280843..21c5e686 100644 +--- a/tests/setup1/tcase2_results/ip_a.expected ++++ b/tests/setup1/tcase2_results/ip_a.expected +@@ -1,17 +1,22 @@ +-eth1: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 1.1.1.1/16 scope global eth1 +-eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.1/16 scope global bond12 ++eth1: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 ++eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 2.2.2.2/16 scope global eth3 + eth4: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5 +-eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth5: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 ++eth6: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 4.4.4.4/24 scope global eth7 + eth8: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 6.6.6.6/16 scope global eth10 ++eth11: mtu 1500 qdisc pfifo_fast state UP qlen 1000 ++ inet 7.7.7.7/16 scope global eth11 ++eth12: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth9.1@eth9: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 5.5.5.5/24 scope global eth9.1 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 +diff --git a/tests/setup1/tcase2_results/ip_r.expected b/tests/setup1/tcase2_results/ip_r.expected +index 0e5ee87c..f246714c 100644 +--- a/tests/setup1/tcase2_results/ip_r.expected ++++ b/tests/setup1/tcase2_results/ip_r.expected +@@ -3,9 +3,11 @@ + 104.0.0.0/8 via 4.4.4.254 + 105.0.0.0/8 via 5.5.5.254 + 106.0.0.0/8 via 6.6.6.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.1 + 2.2.0.0/16 proto kernel scope link src 2.2.2.2 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.4 + 5.5.5.0/24 proto kernel scope link src 5.5.5.5 + 6.6.0.0/16 proto kernel scope link src 6.6.6.6 ++7.7.0.0/16 proto kernel scope link src 7.7.7.7 +diff --git a/tests/setup1/tcase3.sh b/tests/setup1/tcase3.sh +index 45ce04ce..7ab38f3b 100755 +--- a/tests/setup1/tcase3.sh ++++ b/tests/setup1/tcase3.sh +@@ -1,10 +1,9 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + +-for eth in eth2 eth4 eth6 eth8 eth10; do ifdown $eth; done ++for eth in eth2 eth4 eth6 eth8 eth10 eth12; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + +-for eth in eth2 eth4 eth6 eth8 eth10; do ifup $eth; done ++for eth in eth2 eth4 eth6 eth8 eth10 eth12; do ifup $eth; done +diff --git a/tests/setup1/tcase3_results/ip_a.expected b/tests/setup1/tcase3_results/ip_a.expected +index 9adf521d..6071fb27 100644 +--- a/tests/setup1/tcase3_results/ip_a.expected ++++ b/tests/setup1/tcase3_results/ip_a.expected +@@ -2,13 +2,14 @@ eth1: mtu 1500 qdisc pfifo_fast master b + eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5 ++eth5: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast master bridge78 state UP qlen 1000 + eth8: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth11: mtu 1500 qdisc pfifo_fast master team1112 state UP qlen 1000 ++eth12: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + bond12: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 1.1.1.1/16 scope global bond12 + bond34: mtu 1500 qdisc noqueue state UP qlen 1000 +@@ -17,3 +18,7 @@ bridge78: mtu 1500 qdisc noqueue state UP qlen + inet 4.4.4.4/24 scope global bridge78 + eth9.1@eth9: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 5.5.5.5/24 scope global eth9.1 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 ++team1112: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 7.7.7.7/16 scope global team1112 +diff --git a/tests/setup1/tcase3_results/ip_r.expected b/tests/setup1/tcase3_results/ip_r.expected +index 62f16947..223a7db1 100644 +--- a/tests/setup1/tcase3_results/ip_r.expected ++++ b/tests/setup1/tcase3_results/ip_r.expected +@@ -2,8 +2,10 @@ + 103.0.0.0/8 via 3.3.3.254 + 104.0.0.0/8 via 4.4.4.254 + 105.0.0.0/8 via 5.5.5.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.1 + 2.2.0.0/16 proto kernel scope link src 2.2.2.2 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.4 + 5.5.5.0/24 proto kernel scope link src 5.5.5.5 ++7.7.0.0/16 proto kernel scope link src 7.7.7.7 +diff --git a/tests/setup1/tcase4.sh b/tests/setup1/tcase4.sh +index d28d2606..ac22ea73 100755 +--- a/tests/setup1/tcase4.sh ++++ b/tests/setup1/tcase4.sh +@@ -1,13 +1,13 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + +-for eth in eth2 eth4 eth6 eth8 eth10; do ifdown $eth; done ++for eth in eth2 eth4 eth6 eth8 eth10 eth12; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + +-for eth in eth2 eth4 eth6 eth8 eth10; do ifup $eth; done ++for eth in eth2 eth4 eth6 eth8 eth10 eth12; do ifup $eth; done +diff --git a/tests/setup1/tcase4_results/ip_a.expected b/tests/setup1/tcase4_results/ip_a.expected +index e12bd4d0..7112b5af 100644 +--- a/tests/setup1/tcase4_results/ip_a.expected ++++ b/tests/setup1/tcase4_results/ip_a.expected +@@ -1,16 +1,21 @@ +-eth1: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 1.1.1.1/16 scope global eth1 ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.1/16 scope global bond12 ++eth1: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 2.2.2.2/16 scope global eth3 + eth4: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5 ++eth5: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 4.4.4.4/24 scope global eth7 + eth8: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth11: mtu 1500 qdisc pfifo_fast state UP qlen 1000 ++ inet 7.7.7.7/16 scope global eth11 ++eth12: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth9.1@eth9: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 5.5.5.5/24 scope global eth9.1 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 +diff --git a/tests/setup1/tcase4_results/ip_r.expected b/tests/setup1/tcase4_results/ip_r.expected +index 62f16947..223a7db1 100644 +--- a/tests/setup1/tcase4_results/ip_r.expected ++++ b/tests/setup1/tcase4_results/ip_r.expected +@@ -2,8 +2,10 @@ + 103.0.0.0/8 via 3.3.3.254 + 104.0.0.0/8 via 4.4.4.254 + 105.0.0.0/8 via 5.5.5.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.1 + 2.2.0.0/16 proto kernel scope link src 2.2.2.2 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.4 + 5.5.5.0/24 proto kernel scope link src 5.5.5.5 ++7.7.0.0/16 proto kernel scope link src 7.7.7.7 +diff --git a/tests/setup1/tcase5.sh b/tests/setup1/tcase5.sh +index adb09bda..dc786a8a 100755 +--- a/tests/setup1/tcase5.sh ++++ b/tests/setup1/tcase5.sh +@@ -1,10 +1,9 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + +-for eth in eth1 eth3 eth5 eth7 eth9; do ifdown $eth; done ++for eth in eth1 eth3 eth5 eth7 eth9 eth11; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + +-for eth in eth1 eth3 eth5 eth7 eth9; do ifup $eth; done ++for eth in eth1 eth3 eth5 eth7 eth9 eth11; do ifup $eth; done +diff --git a/tests/setup1/tcase5_results/ip_a.expected b/tests/setup1/tcase5_results/ip_a.expected +index bd1152c8..e55915fc 100644 +--- a/tests/setup1/tcase5_results/ip_a.expected ++++ b/tests/setup1/tcase5_results/ip_a.expected +@@ -3,16 +3,21 @@ eth2: mtu 1500 qdisc pfifo_fast master b + eth3: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth5: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth6: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth6 ++eth6: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth8: mtu 1500 qdisc pfifo_fast master bridge78 state UP qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 6.6.6.6/16 scope global eth10 ++eth11: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth12: mtu 1500 qdisc pfifo_fast master team1112 state UP qlen 1000 + bond12: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 1.1.1.1/16 scope global bond12 + bond34: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 2.2.2.2/16 scope global bond34 + bridge78: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 4.4.4.4/24 scope global bridge78 ++team1112: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 7.7.7.7/16 scope global team1112 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 +diff --git a/tests/setup1/tcase5_results/ip_r.expected b/tests/setup1/tcase5_results/ip_r.expected +index 87a8f9fe..50638c8a 100644 +--- a/tests/setup1/tcase5_results/ip_r.expected ++++ b/tests/setup1/tcase5_results/ip_r.expected +@@ -2,8 +2,10 @@ + 103.0.0.0/8 via 3.3.3.254 + 104.0.0.0/8 via 4.4.4.254 + 106.0.0.0/8 via 6.6.6.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.1 + 2.2.0.0/16 proto kernel scope link src 2.2.2.2 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.4 + 6.6.0.0/16 proto kernel scope link src 6.6.6.6 ++7.7.0.0/16 proto kernel scope link src 7.7.7.7 +diff --git a/tests/setup1/tcase6.sh b/tests/setup1/tcase6.sh +index 0f11c0ae..698b88c3 100755 +--- a/tests/setup1/tcase6.sh ++++ b/tests/setup1/tcase6.sh +@@ -1,13 +1,13 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + +-for eth in eth1 eth3 eth5 eth7 eth9; do ifdown $eth; done ++for eth in eth1 eth3 eth5 eth7 eth9 eth11; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + +-for eth in eth1 eth3 eth5 eth7 vlan1eth9; do ifup $eth; done ++for eth in eth1 eth3 eth5 eth7 vlan1eth9 eth11; do ifup $eth; done +diff --git a/tests/setup1/tcase6_results/ip_a.expected b/tests/setup1/tcase6_results/ip_a.expected +index c04e1e12..4f086280 100644 +--- a/tests/setup1/tcase6_results/ip_a.expected ++++ b/tests/setup1/tcase6_results/ip_a.expected +@@ -1,15 +1,20 @@ ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.1/16 scope global bond12 + eth1: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth2: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 1.1.1.1/16 scope global eth2 ++eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 2.2.2.2/16 scope global eth4 + eth5: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth6: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth6 ++eth6: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth8: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 4.4.4.4/24 scope global eth8 + eth9: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 6.6.6.6/16 scope global eth10 ++eth11: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth12: mtu 1500 qdisc pfifo_fast state UP qlen 1000 ++ inet 7.7.7.7/16 scope global eth12 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 +diff --git a/tests/setup1/tcase6_results/ip_r.expected b/tests/setup1/tcase6_results/ip_r.expected +index 87a8f9fe..50638c8a 100644 +--- a/tests/setup1/tcase6_results/ip_r.expected ++++ b/tests/setup1/tcase6_results/ip_r.expected +@@ -2,8 +2,10 @@ + 103.0.0.0/8 via 3.3.3.254 + 104.0.0.0/8 via 4.4.4.254 + 106.0.0.0/8 via 6.6.6.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.1 + 2.2.0.0/16 proto kernel scope link src 2.2.2.2 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.4 + 6.6.0.0/16 proto kernel scope link src 6.6.6.6 ++7.7.0.0/16 proto kernel scope link src 7.7.7.7 +diff --git a/tests/setup1/tcase7.sh b/tests/setup1/tcase7.sh +index 57b3cdff..7dc07f63 100755 +--- a/tests/setup1/tcase7.sh ++++ b/tests/setup1/tcase7.sh +@@ -1,5 +1,5 @@ + #!/bin/bash + +-CONFIG_DIR=/root ++CONFIG_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup1/tcase7_results/ip_a.expected b/tests/setup1/tcase7_results/ip_a.expected +index c6ace88f..dba7dab6 100644 +--- a/tests/setup1/tcase7_results/ip_a.expected ++++ b/tests/setup1/tcase7_results/ip_a.expected +@@ -2,14 +2,15 @@ eth1: mtu 1500 qdisc pfifo_fast master b + eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 +-eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5 +-eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth5: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 ++eth6: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast master bridge78 state UP qlen 1000 + eth8: mtu 1500 qdisc pfifo_fast master bridge78 state UP qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 6.6.6.100/16 scope global eth10 ++eth11: mtu 1500 qdisc pfifo_fast master team1112 state UP qlen 1000 ++eth12: mtu 1500 qdisc pfifo_fast master team1112 state UP qlen 1000 + bond12: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 1.1.1.100/16 scope global bond12 + bond34: mtu 1500 qdisc noqueue state UP qlen 1000 +@@ -18,3 +19,7 @@ bridge78: mtu 1500 qdisc noqueue state UP qlen + inet 4.4.4.100/24 scope global bridge78 + eth9.1@eth9: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 5.5.5.5/24 scope global eth9.1 ++team1112: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 7.7.7.100/16 scope global team1112 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 +diff --git a/tests/setup1/tcase7_results/ip_r.expected b/tests/setup1/tcase7_results/ip_r.expected +index 2481d7f3..a89163a6 100644 +--- a/tests/setup1/tcase7_results/ip_r.expected ++++ b/tests/setup1/tcase7_results/ip_r.expected +@@ -3,9 +3,11 @@ + 104.0.0.0/8 via 4.4.4.254 + 105.0.0.0/8 via 5.5.5.254 + 106.0.0.0/8 via 6.6.6.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.100 + 2.2.0.0/16 proto kernel scope link src 2.2.2.100 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.100 + 5.5.5.0/24 proto kernel scope link src 5.5.5.5 + 6.6.0.0/16 proto kernel scope link src 6.6.6.100 ++7.7.0.0/16 proto kernel scope link src 7.7.7.100 +diff --git a/tests/setup1/tcase8.sh b/tests/setup1/tcase8.sh +index c40c5e15..6982d005 100755 +--- a/tests/setup1/tcase8.sh ++++ b/tests/setup1/tcase8.sh +@@ -1,8 +1,9 @@ + #!/bin/bash + +-CONFIG_DIR=/root ++CONFIG_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup1/tcase8_results/ip_a.expected b/tests/setup1/tcase8_results/ip_a.expected +index 6801434d..fb0e2d1e 100644 +--- a/tests/setup1/tcase8_results/ip_a.expected ++++ b/tests/setup1/tcase8_results/ip_a.expected +@@ -1,17 +1,22 @@ +-eth1: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 1.1.1.100/16 scope global eth1 +-eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.100/16 scope global bond12 ++eth1: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 ++eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 2.2.2.100/16 scope global eth3 + eth4: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5 +-eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth5: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 ++eth6: mtu 1500 qdisc pfifo_fast master team56 state UP qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 4.4.4.100/24 scope global eth7 + eth8: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + inet 6.6.6.100/16 scope global eth10 ++eth11: mtu 1500 qdisc pfifo_fast state UP qlen 1000 ++ inet 7.7.7.100/16 scope global eth11 ++eth12: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth9.1@eth9: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 5.5.5.5/24 scope global eth9.1 ++team56: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team56 +diff --git a/tests/setup1/tcase8_results/ip_r.expected b/tests/setup1/tcase8_results/ip_r.expected +index 2481d7f3..a89163a6 100644 +--- a/tests/setup1/tcase8_results/ip_r.expected ++++ b/tests/setup1/tcase8_results/ip_r.expected +@@ -3,9 +3,11 @@ + 104.0.0.0/8 via 4.4.4.254 + 105.0.0.0/8 via 5.5.5.254 + 106.0.0.0/8 via 6.6.6.254 ++107.0.0.0/8 via 7.7.7.254 + 1.1.0.0/16 proto kernel scope link src 1.1.1.100 + 2.2.0.0/16 proto kernel scope link src 2.2.2.100 + 3.3.0.0/16 proto kernel scope link src 3.3.3.3 + 4.4.4.0/24 proto kernel scope link src 4.4.4.100 + 5.5.5.0/24 proto kernel scope link src 5.5.5.5 + 6.6.0.0/16 proto kernel scope link src 6.6.6.100 ++7.7.0.0/16 proto kernel scope link src 7.7.7.100 +diff --git a/tests/setup1/verify.sh b/tests/setup1/verify.sh +index a9fd9c6c..146d017b 100755 +--- a/tests/setup1/verify.sh ++++ b/tests/setup1/verify.sh +@@ -32,7 +32,7 @@ DEVICES="$( ls /sys/class/net/ | egrep -wv "(bonding_masters|eth0|lo)" )" + + for dev in $DEVICES; do + ip addr show dev $dev +-done 2>/dev/null | egrep -w "(mtu|inet)" | sed "s/^[0-9]*: //" > $tmpfile_ipa ++done 2>/dev/null | egrep -w "(mtu|inet)" | sed -e "s/^[0-9]*: //" -e "s/ group \S* / /" > $tmpfile_ipa + + for dev in $DEVICES; do + ip r show dev $dev +diff --git a/tests/setup2/README b/tests/setup2/README +index 40731f83..34b123fb 100644 +--- a/tests/setup2/README ++++ b/tests/setup2/README +@@ -3,7 +3,7 @@ + +----------------------------------+ + + +-You need a VM with 10 network interfaces (eth0 being the main interface). ++You need a VM with 11 network interfaces (eth0 being the main interface). + All interfaces except eth0 can be non-reachable. + + kvm.xml is an example template of such VM. +@@ -31,18 +31,18 @@ default via 192.168.122.1 dev eth0 + Running the unit tests: + ---------------------- + +-After copying the files and making sure the script has been adapted, ++After copying the network configuration files and rebooting the system, + + from the VM, run the following command: + +-# for i in $(seq 1 8); do ./tcase$i.sh; done ++# for i in $(seq 1 8); do ./tcase${i}.sh; done + + This will record the generated network+route files. + + Then to verify result, run the following command (this will take down the + network, except eth0): + +-# for i in $(seq 1 8); do ./verify.sh tcase$i_results; done ++# for i in $(seq 1 8); do ./verify.sh tcase${i}_results; done + + + ------------------------------------------------------------------------------- +@@ -64,15 +64,15 @@ team89 -> eth8 + Test Case #2: simplification + ------------ + +-SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y ++SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y SIMPLIFY_TEAMING=y + + Expected results: + +-bond12 -> eth1 ++bond12 -> bond12 (not simplified, because mode=4) + bond34 -> eth3 + bridge2 -> eth3.2 + team567 -> eth5.5 +-team89 -> eth8 ++team89 -> team89 (not simplified, because runner=lacp) + bridge3 -> eth10.3 + + +@@ -100,7 +100,6 @@ for eth in eth2 eth4 eth6 eth8 eth10; do ifdown $eth; done + Expected results: + + eth2, eth4, eth6, eth8, eth10 not in file +-bond12 -> eth1 + bond34 -> eth3 + bridge2 -> eth3.2 + team567 -> eth5.5 +@@ -136,7 +135,6 @@ for eth in eth1 eth3 eth5 eth7 eth9; do ifdown $eth; done + Expected results: + + eth2, eth4, eth6, eth8, eth10 not in file +-bond12 -> eth2 + bond34 -> eth4 + team567 -> eth6 + team89 -> eth8 +@@ -168,7 +166,7 @@ bridge3 -> 4.4.4.100/24 + Test Case #8: IP address mapping & simplification + ------------ + +-SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y ++SIMPLIFY_BONDING=y SIMPLIFY_BRIDGE=y SIMPLIFY_TEAMING=y + + # cat mappings/ip_addresses + bond12.1 1.1.1.100/16 +diff --git a/tests/setup2/tcase1.sh b/tests/setup2/tcase1.sh +index 597f3f5c..7b5032c7 100755 +--- a/tests/setup2/tcase1.sh ++++ b/tests/setup2/tcase1.sh +@@ -1,6 +1,5 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup2/tcase1_results/ip_a.expected b/tests/setup2/tcase1_results/ip_a.expected +index 8e36b66c..23a2d8df 100644 +--- a/tests/setup2/tcase1_results/ip_a.expected ++++ b/tests/setup2/tcase1_results/ip_a.expected +@@ -14,10 +14,12 @@ eth2: mtu 1500 qdisc pfifo_fast master b + eth3: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth5.5@eth5: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5.5 +-eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth7: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth8: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth8.3@eth8: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 +-eth9: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth5.5@eth5: mtu 1500 qdisc noqueue master team567 state UP qlen 1000 ++eth6: mtu 1500 qdisc pfifo_fast master team567 state UP qlen 1000 ++eth7: mtu 1500 qdisc pfifo_fast master team567 state UP qlen 1000 ++eth8: mtu 1500 qdisc pfifo_fast master team89 state UP qlen 1000 ++eth9: mtu 1500 qdisc pfifo_fast master team89 state UP qlen 1000 ++team567: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team567 ++team89: mtu 1500 qdisc noqueue state UP qlen 1000 ++team89.3@team89: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 +diff --git a/tests/setup2/tcase2.sh b/tests/setup2/tcase2.sh +index faa39396..65d1aa34 100755 +--- a/tests/setup2/tcase2.sh ++++ b/tests/setup2/tcase2.sh +@@ -1,9 +1,9 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup2/tcase2_results/ip_a.expected b/tests/setup2/tcase2_results/ip_a.expected +index b2043ea2..097c6ed8 100644 +--- a/tests/setup2/tcase2_results/ip_a.expected ++++ b/tests/setup2/tcase2_results/ip_a.expected +@@ -1,10 +1,11 @@ +-eth1: mtu 1500 qdisc pfifo_fast state UP qlen 1000 ++bond12.1@bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.1/16 scope global bond12.1 ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++eth1: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10.3@eth10: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 4.4.4.4/24 scope global eth10.3 +-eth1.1@eth1: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 1.1.1.1/16 scope global eth1.1 +-eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth3.2@eth3: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 2.2.2.2/24 scope global eth3.2 +diff --git a/tests/setup2/tcase3.sh b/tests/setup2/tcase3.sh +index d23a1198..3b792b42 100755 +--- a/tests/setup2/tcase3.sh ++++ b/tests/setup2/tcase3.sh +@@ -1,10 +1,9 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + for eth in eth2 eth4 eth6 eth8 eth10; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + + for eth in eth2 eth4 eth6 eth8 vlan3eth10; do ifup $eth; done +diff --git a/tests/setup2/tcase3_results/ip_a.expected b/tests/setup2/tcase3_results/ip_a.expected +index 0b0c00ba..6cbcf572 100644 +--- a/tests/setup2/tcase3_results/ip_a.expected ++++ b/tests/setup2/tcase3_results/ip_a.expected +@@ -13,10 +13,12 @@ eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth5.5@eth5: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth5.5 ++eth5.5@eth5: mtu 1500 qdisc noqueue master team567 state UP qlen 1000 + eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth7: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth7: mtu 1500 qdisc pfifo_fast master team567 state UP qlen 1000 + eth8: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth9.3@eth9: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 ++eth9: mtu 1500 qdisc pfifo_fast master team89 state UP qlen 1000 ++team567: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team567 ++team89.3@team89: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 ++team89: mtu 1500 qdisc noqueue state UP qlen 1000 +diff --git a/tests/setup2/tcase4.sh b/tests/setup2/tcase4.sh +index f66236ff..5d8cfdd5 100755 +--- a/tests/setup2/tcase4.sh ++++ b/tests/setup2/tcase4.sh +@@ -1,13 +1,13 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + + for eth in eth2 eth4 eth6 eth8 eth10; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + + for eth in eth2 eth4 eth6 eth8 vlan3eth10; do ifup $eth; done +diff --git a/tests/setup2/tcase4_results/ip_a.expected b/tests/setup2/tcase4_results/ip_a.expected +index 8171a018..6afa74e5 100644 +--- a/tests/setup2/tcase4_results/ip_a.expected ++++ b/tests/setup2/tcase4_results/ip_a.expected +@@ -1,7 +1,8 @@ +-eth1: mtu 1500 qdisc pfifo_fast state UP qlen 1000 ++bond12.1@bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.1/16 scope global bond12.1 ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++eth1: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth1.1@eth1: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 1.1.1.1/16 scope global eth1.1 + eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth3.2@eth3: mtu 1500 qdisc noqueue state UP qlen 1000 +@@ -13,6 +14,7 @@ eth5.5@eth5: mtu 1500 qdisc noqueue state UP q + eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth8: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth9: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth9.3@eth9: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 4.4.4.4/24 scope global eth9.3 ++eth9: mtu 1500 qdisc pfifo_fast master team89 state UP qlen 1000 ++team89: mtu 1500 qdisc noqueue state UP qlen 1000 ++team89.3@team89: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 4.4.4.4/24 scope global team89.3 +diff --git a/tests/setup2/tcase5.sh b/tests/setup2/tcase5.sh +index 1085a80d..e332d9af 100755 +--- a/tests/setup2/tcase5.sh ++++ b/tests/setup2/tcase5.sh +@@ -1,10 +1,9 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + for eth in eth1 eth3 eth5 eth7 eth9; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + + for eth in eth1 eth3 vlan5eth5 eth7 eth9; do ifup $eth; done +diff --git a/tests/setup2/tcase5_results/ip_a.expected b/tests/setup2/tcase5_results/ip_a.expected +index 4841575c..2d08e19c 100644 +--- a/tests/setup2/tcase5_results/ip_a.expected ++++ b/tests/setup2/tcase5_results/ip_a.expected +@@ -14,9 +14,11 @@ eth2: mtu 1500 qdisc pfifo_fast master b + eth3: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth5: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth6: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +- inet 3.3.3.3/16 scope global eth6 ++eth6: mtu 1500 qdisc pfifo_fast master team567 state UP qlen 1000 + eth7: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth8: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth8.3@eth8: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 ++eth8: mtu 1500 qdisc pfifo_fast master team89 state UP qlen 1000 + eth9: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++team567: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.3/16 scope global team567 ++team89: mtu 1500 qdisc noqueue state UP qlen 1000 ++team89.3@team89: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 +diff --git a/tests/setup2/tcase6.sh b/tests/setup2/tcase6.sh +index 998672bf..b9a5153f 100755 +--- a/tests/setup2/tcase6.sh ++++ b/tests/setup2/tcase6.sh +@@ -1,13 +1,13 @@ + #!/bin/bash + + unset CONFIG_DIR +-#CONFIG_DIR=/root + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + + for eth in eth1 eth3 eth5 eth7 eth9; do ifdown $eth; done + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh + + for eth in eth1 eth3 vlan5eth5 eth7 eth9; do ifup $eth; done +diff --git a/tests/setup2/tcase6_results/ip_a.expected b/tests/setup2/tcase6_results/ip_a.expected +index 879aff9b..4239377a 100644 +--- a/tests/setup2/tcase6_results/ip_a.expected ++++ b/tests/setup2/tcase6_results/ip_a.expected +@@ -1,10 +1,11 @@ ++bond12.1@bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.1/16 scope global bond12.1 ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 + eth1: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10.3@eth10: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 4.4.4.4/24 scope global eth10.3 +-eth2: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth2.1@eth2: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 1.1.1.1/16 scope global eth2.1 ++eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth4.2@eth4: mtu 1500 qdisc noqueue state UP qlen 1000 +diff --git a/tests/setup2/tcase7.sh b/tests/setup2/tcase7.sh +index 57b3cdff..7dc07f63 100755 +--- a/tests/setup2/tcase7.sh ++++ b/tests/setup2/tcase7.sh +@@ -1,5 +1,5 @@ + #!/bin/bash + +-CONFIG_DIR=/root ++CONFIG_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup2/tcase7_results/ip_a.expected b/tests/setup2/tcase7_results/ip_a.expected +index a1825c41..4136fb4b 100644 +--- a/tests/setup2/tcase7_results/ip_a.expected ++++ b/tests/setup2/tcase7_results/ip_a.expected +@@ -14,10 +14,12 @@ eth2: mtu 1500 qdisc pfifo_fast master b + eth3: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth4: mtu 1500 qdisc pfifo_fast master bond34 state UP qlen 1000 + eth5: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth5.5@eth5: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 3.3.3.100/16 scope global eth5.5 +-eth6: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth7: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 +-eth8: mtu 1500 qdisc pfifo_fast state UP qlen 1000 +-eth8.3@eth8: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 +-eth9: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth5.5@eth5: mtu 1500 qdisc noqueue master team567 state UP qlen 1000 ++eth6: mtu 1500 qdisc pfifo_fast master team567 state UP qlen 1000 ++eth7: mtu 1500 qdisc pfifo_fast master team567 state UP qlen 1000 ++eth8: mtu 1500 qdisc pfifo_fast master team89 state UP qlen 1000 ++eth9: mtu 1500 qdisc pfifo_fast master team89 state UP qlen 1000 ++team567: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 3.3.3.100/16 scope global team567 ++team89: mtu 1500 qdisc noqueue state UP qlen 1000 ++team89.3@team89: mtu 1500 qdisc noqueue master bridge3 state UP qlen 1000 +diff --git a/tests/setup2/tcase8.sh b/tests/setup2/tcase8.sh +index c40c5e15..6982d005 100755 +--- a/tests/setup2/tcase8.sh ++++ b/tests/setup2/tcase8.sh +@@ -1,8 +1,9 @@ + #!/bin/bash + +-CONFIG_DIR=/root ++CONFIG_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" + + export SIMPLIFY_BONDING=y + export SIMPLIFY_BRIDGE=y ++export SIMPLIFY_TEAMING=y + +-. ./run.sh ++. "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/run.sh +diff --git a/tests/setup2/tcase8_results/ip_a.expected b/tests/setup2/tcase8_results/ip_a.expected +index 28140aa1..19e11934 100644 +--- a/tests/setup2/tcase8_results/ip_a.expected ++++ b/tests/setup2/tcase8_results/ip_a.expected +@@ -1,10 +1,11 @@ +-eth1: mtu 1500 qdisc pfifo_fast state UP qlen 1000 ++bond12.1@bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++ inet 1.1.1.100/16 scope global bond12.1 ++bond12: mtu 1500 qdisc noqueue state UP qlen 1000 ++eth1: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth10: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth10.3@eth10: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 4.4.4.100/24 scope global eth10.3 +-eth1.1@eth1: mtu 1500 qdisc noqueue state UP qlen 1000 +- inet 1.1.1.100/16 scope global eth1.1 +-eth2: mtu 1500 qdisc pfifo_fast state DOWN qlen 1000 ++eth2: mtu 1500 qdisc pfifo_fast master bond12 state UP qlen 1000 + eth3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + eth3.2@eth3: mtu 1500 qdisc noqueue state UP qlen 1000 + inet 2.2.2.2/24 scope global eth3.2 +diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf +index 796f228a..ef118998 100644 +--- a/usr/share/rear/conf/default.conf ++++ b/usr/share/rear/conf/default.conf +@@ -2237,15 +2237,16 @@ USE_CFG2HTML= + # If SKIP_CFG2HTML is enabled, skip this script (backward compatibility) - the var will become obsolete in rear-1.18 + # SKIP_CFG2HTML= + +-# Simplify bonding setups by configuring always the first active device of a bond +-SIMPLIFY_BONDING= ++# Simplify bonding setups by configuring always the first active device of a ++# bond, except when mode is 4 (IEEE 802.3ad policy) ++SIMPLIFY_BONDING=no + + # Simplify bridge setups by configuring always the first active device of a bridge +-SIMPLIFY_BRIDGE= ++SIMPLIFY_BRIDGE=no + +-# Simplify team setups by configuring always the first active device of a team +-# Current implementation only supports this mode +-#SIMPLIFY_TEAM= ++# Simplify team setups by configuring always the first active device of a team, ++# except when runner is 'lacp' (IEEE 802.3ad policy) ++SIMPLIFY_TEAMING=no + + # Serial Console support is enabled if serial devices are found on the system and + # then matching kernel command line parameters like 'console=ttyS0,9600 console=ttyS1,9600' +diff --git a/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh +index 8d24d2d5..4698618c 100644 +--- a/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh ++++ b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh +@@ -146,7 +146,7 @@ ip link help 2>&1 | grep -qw bridge && ip_link_supports_bridge='true' + # + # - if it is a bond + # +-# - if SIMPLIFY_BONDING is set ++# - if SIMPLIFY_BONDING is set and mode is not 4 (IEEE 802.3ad policy) + # - configure the first UP underlying interface using ALGO + # - keep record of interface mapping into new underlying interface + # - otherwise +@@ -157,10 +157,14 @@ ip link help 2>&1 | grep -qw bridge && ip_link_supports_bridge='true' + # + # - configure the vlan based on parent's interface + # +-# - if it is a team, only simplification is currently implemented ++# - if it is a team + # +-# - configure the first UP underlying interface using ALGO +-# - keep record of interface mapping into new underlying interface ++# - if SIMPLIFY_TEAMING is set and runner is not 'lacp' (IEEE 802.3ad policy) ++# - configure the first UP underlying interface using ALGO ++# - keep record of interface mapping into new underlying interface ++# - otherwise ++# - configure the team ++# - configure all UP underlying interfaces using ALGO + # + # - in any case, a given interface is only configured once; when an interface + # has already been configured, configuration code should be ignored by +@@ -470,7 +474,7 @@ function handle_bridge () { + local tmpfile=$( mktemp ) + local itf + +- if test "$SIMPLIFY_BRIDGE" ; then ++ if is_true "$SIMPLIFY_BRIDGE" ; then + for itf in $( get_lower_interfaces $network_interface ) ; do + DebugPrint "$network_interface has lower interface $itf" + is_interface_up $itf || continue +@@ -552,6 +556,7 @@ function handle_bridge () { + } + + already_set_up_teams="" ++team_initialized= + + function handle_team () { + local network_interface=$1 +@@ -569,13 +574,58 @@ function handle_team () { + fi + already_set_up_teams+=" $network_interface" + +- # FIXME? Team code below simplifies the configuration, returning first port only +- # There should a SIMPLIFY_TEAM variable for that +- + local rc + local nitfs=0 + local tmpfile=$( mktemp ) + local itf ++ local teaming_runner="$( teamdctl "$network_interface" state item get setup.runner_name )" ++ ++ if is_true "$SIMPLIFY_TEAMING" && [ "$teaming_runner" != "lacp" ] ; then ++ ++ for itf in $( get_lower_interfaces $network_interface ) ; do ++ DebugPrint "$network_interface has lower interface $itf" ++ is_interface_up $itf || continue ++ is_linked_to_physical $itf || continue ++ handle_interface $itf >$tmpfile ++ rc=$? ++ [ $rc -eq $rc_error ] && continue ++ let nitfs++ ++ echo "# Original interface was $network_interface, now is $itf" ++ [ $rc -eq $rc_success ] && cat $tmpfile ++ # itf may have been mapped into some other interface ++ itf=$( get_mapped_network_interface $itf ) ++ # We found an interface, so stop here after mapping team to lower interface ++ map_network_interface $network_interface $itf ++ break ++ done ++ rm $tmpfile ++ ++ # If we didn't find any lower interface, we are in trouble ... ++ if [ $nitfs -eq 0 ] ; then ++ LogPrintError "Couldn't find any suitable lower interface for '$network_interface'." ++ return $rc_error ++ fi ++ ++ # setup_device_params has already been called by interface team was mapped onto ++ ++ return $rc_success ++ elif is_true "$SIMPLIFY_TEAMING" ; then ++ # Teaming runner 'lacp' (IEEE 802.3ad policy) cannot be simplified ++ # because there is some special setup on the switch itself, requiring ++ # to keep the system's network interface's configuration intact. ++ LogPrint "Note: not simplifying network configuration for '$network_interface' because teaming runner is 'lacp' (IEEE 802.3ad policy)." ++ fi ++ ++ # ++ # Non-simplified teaming mode ++ # ++ ++ if [ -z "$team_initialized" ] ; then ++ PROGS=( "${PROGS[@]}" 'teamd' 'teamdctl' ) ++ team_initialized="y" ++ fi ++ ++ local teamconfig="$( teamdctl -o "$network_interface" config dump actual )" + + for itf in $( get_lower_interfaces $network_interface ) ; do + DebugPrint "$network_interface has lower interface $itf" +@@ -585,13 +635,15 @@ function handle_team () { + rc=$? + [ $rc -eq $rc_error ] && continue + let nitfs++ +- echo "# Original interface was $network_interface, now is $itf" + [ $rc -eq $rc_success ] && cat $tmpfile + # itf may have been mapped into some other interface +- itf=$( get_mapped_network_interface $itf ) +- # We found an interface, so stop here after mapping team to lower interface +- map_network_interface $network_interface $itf +- break ++ local newitf=$( get_mapped_network_interface $itf ) ++ if [ "$itf" != "$newitf" ] ; then ++ # Fix the teaming configuration ++ teamconfig="$( echo "$teamconfig" | sed "s/\"$itf\"/\"$newitf\"/g" )" ++ fi ++ # Make sure lower device is down before configuring the team ++ echo "ip link set dev $itf down" + done + rm $tmpfile + +@@ -601,12 +653,15 @@ function handle_team () { + return $rc_error + fi + +- # setup_device_params has already been called by interface team was mapped onto ++ echo "teamd -d -c '$teamconfig'" ++ ++ setup_device_params $network_interface + + return $rc_success + } + + already_set_up_bonds="" ++bond_initialized= + + function handle_bond () { + local network_interface=$1 +@@ -618,22 +673,19 @@ function handle_bond () { + + DebugPrint "$network_interface is a bond" + +- if [ -z "$already_set_up_bonds" ] ; then +- if ! test "$SIMPLIFY_BONDING" ; then +- echo "modprobe bonding" +- MODULES=( "${MODULES[@]}" 'bonding' ) +- fi +- elif [[ " $already_set_up_bonds " == *\ $network_interface\ * ]] ; then ++ if [[ " $already_set_up_bonds " == *\ $network_interface\ * ]] ; then + DebugPrint "$network_interface already handled..." + return $rc_ignore + fi + already_set_up_bonds+=" $network_interface" + ++ local rc + local nitfs=0 + local tmpfile=$( mktemp ) + local itf ++ local bonding_mode=$( awk '{ print $2 }' $sysfspath/bonding/mode ) + +- if test "$SIMPLIFY_BONDING" ; then ++ if is_true "$SIMPLIFY_BONDING" && [ $bonding_mode -ne 4 ] ; then + for itf in $( get_lower_interfaces $network_interface ) ; do + DebugPrint "$network_interface has lower interface $itf" + is_interface_up $itf || continue +@@ -663,13 +715,23 @@ function handle_bond () { + # setup_device_params has already been called by interface bond was mapped onto + + return $rc_success ++ elif is_true "$SIMPLIFY_BONDING" ; then ++ # Bond mode '4' (IEEE 802.3ad policy) cannot be simplified because ++ # there is some special setup on the switch itself, requiring to keep ++ # the system's network interface's configuration intact. ++ LogPrint "Note: not simplifying network configuration for '$network_interface' because bonding mode is '4' (IEEE 802.3ad policy)." + fi + + # + # Non-simplified bonding mode + # + +- local bonding_mode=$( awk '{ print $2 }' $sysfspath/bonding/mode ) ++ if [ -z "$bond_initialized" ] ; then ++ echo "modprobe bonding" ++ MODULES=( "${MODULES[@]}" 'bonding' ) ++ bond_initialized="y" ++ fi ++ + local miimon=$( cat $sysfspath/bonding/miimon ) + local use_carrier=$( cat $sysfspath/bonding/use_carrier ) + +@@ -689,7 +751,8 @@ EOT + is_interface_up $itf || continue + is_linked_to_physical $itf || continue + handle_interface $itf >$tmpfile +- [ $? -eq $rc_error ] && continue ++ rc=$? ++ [ $rc -eq $rc_error ] && continue + let nitfs++ + [ $rc -eq $rc_success ] && cat $tmpfile + # itf may have been mapped into some other interface +@@ -884,3 +947,5 @@ unset -f handle_team + unset -f handle_bond + unset -f handle_vlan + unset -f handle_physdev ++ ++# vim: set et ts=4 sw=4: diff --git a/SOURCES/rear-bz1652828-bz1652853.patch b/SOURCES/rear-bz1652828-bz1652853.patch new file mode 100644 index 0000000..2432451 --- /dev/null +++ b/SOURCES/rear-bz1652828-bz1652853.patch @@ -0,0 +1,156 @@ +diff --git a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh +index 9c4212ae..873e244e 100644 +--- a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh ++++ b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh +@@ -54,9 +54,13 @@ Log "copy_as_is_executables = ${copy_as_is_executables[@]}" + # add them to the LIBS list if they are not yet included in the copied files: + Log "Adding required libraries of executables in all the copied files to LIBS" + local required_library="" +-for required_library in $( RequiredSharedOjects "${copy_as_is_executables[@]}" ) ; do +- # Skip when the required library was already actually copied by 'tar' above: +- grep -q "$required_library" $copy_as_is_filelist_file && continue ++for required_library in $( RequiredSharedObjects "${copy_as_is_executables[@]}" ) ; do ++ # Skip when the required library was already actually copied by 'tar' above. ++ # grep for a full line (copy_as_is_filelist_file contains 1 file name per line) ++ # to avoid that libraries get skipped when their library path is a substring ++ # of another already copied library, e.g. do not skip /path/to/lib when ++ # /other/path/to/lib was already copied, cf. https://github.com/rear/rear/pull/1976 ++ grep -q "^${required_library}\$" $copy_as_is_filelist_file && continue + # Skip when the required library is already in LIBS: + IsInArray "$required_library" "${LIBS[@]}" && continue + Log "Adding required library '$required_library' to LIBS" +diff --git a/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh b/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh +index f7809bc7..ed02dea9 100644 +--- a/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh ++++ b/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh +@@ -62,16 +62,16 @@ Log "Binaries being copied: ${all_binaries[@]}" + copy_binaries "$ROOTFS_DIR/bin" "${all_binaries[@]}" + + # Copy libraries: +-# It is crucial to also have all LIBS itself in all_libs because RequiredSharedOjects() ++# It is crucial to also have all LIBS itself in all_libs because RequiredSharedObjects() + # outputs only those libraries that are required by a library but not the library itself + # so that without all LIBS itself in all_libs those libraries in LIBS are missing that + # are not needed by a binary in all_binaries (all_binaries were already copied above). +-# RequiredSharedOjects outputs the required shared objects on STDOUT. ++# RequiredSharedObjects outputs the required shared objects on STDOUT. + # The output are absolute paths to the required shared objects. + # The output can also be symbolic links (also as absolute paths). + # In case of symbolic links only the link but not the link target is output. + # Therefore for symbolic links also the link target gets copied below. +-local all_libs=( "${LIBS[@]}" $( RequiredSharedOjects "${all_binaries[@]}" "${LIBS[@]}" ) ) ++local all_libs=( "${LIBS[@]}" $( RequiredSharedObjects "${all_binaries[@]}" "${LIBS[@]}" ) ) + + Log "Libraries being copied: ${all_libs[@]}" + local lib="" +diff --git a/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh b/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh +index 9803200d..8cb27d78 100644 +--- a/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh ++++ b/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh +@@ -8,7 +8,7 @@ if is_true $KEEP_BUILD_DIR; then + executable_dependencies_list="$TMP_DIR/executable-dependencies" + + for executable in "${executables[@]}"; do +- dependents=( $(RequiredSharedOjects "$ROOTFS_DIR/$executable") ) ++ dependents=( $(RequiredSharedObjects "$ROOTFS_DIR/$executable") ) + echo "$executable: ${dependents[*]}" + done > "$executable_dependencies_list" + +diff --git a/usr/share/rear/build/default/980_verify_rootfs.sh b/usr/share/rear/build/default/980_verify_rootfs.sh +index f8b3e8e9..d03e5f34 100644 +--- a/usr/share/rear/build/default/980_verify_rootfs.sh ++++ b/usr/share/rear/build/default/980_verify_rootfs.sh +@@ -51,6 +51,11 @@ if test "$BACKUP" = "SESAM" ; then + # related libraries + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SESAM_LD_LIBRARY_PATH + fi ++if test "$BACKUP" = "NBU" ; then ++ # Use a NBU-specific LD_LIBRARY_PATH to find NBU libraries ++ # see https://github.com/rear/rear/issues/1974 ++ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$NBU_LD_LIBRARY_PATH ++fi + # Actually test all binaries for 'not found' libraries. + # Find all binaries and libraries also e.g. those that are copied via COPY_AS_IS into other paths: + for binary in $( find $ROOTFS_DIR -type f -executable -printf '/%P\n' ); do +diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf +index 0f0d0675..796f228a 100644 +--- a/usr/share/rear/conf/default.conf ++++ b/usr/share/rear/conf/default.conf +@@ -1467,7 +1467,8 @@ OBDR_BLOCKSIZE=2048 + ## + # + COPY_AS_IS_NBU=( /usr/openv/bin/vnetd /usr/openv/bin/vopied /usr/openv/lib /usr/openv/netbackup /usr/openv/var/auth/[mn]*.txt ) +-COPY_AS_IS_EXCLUDE_NBU=( "/usr/openv/netbackup/logs/*" "/usr/openv/netbackup/bin/bpjava*" "/usr/openv/netbackup/bin/xbp" ) ++COPY_AS_IS_EXCLUDE_NBU=( "/usr/openv/netbackup/logs/*" "/usr/openv/netbackup/bin/bpjava*" /usr/openv/netbackup/bin/xbp /usr/openv/netbackup/bin/private /usr/openv/lib/java /usr/openv/lib/shared/vddk /usr/openv/netbackup/baremetal ) ++NBU_LD_LIBRARY_PATH="/usr/openv/lib" + PROGS_NBU=( ) + + ## +diff --git a/usr/share/rear/lib/_input-output-functions.sh b/usr/share/rear/lib/_input-output-functions.sh +index d5eed43e..bdbf593d 100644 +--- a/usr/share/rear/lib/_input-output-functions.sh ++++ b/usr/share/rear/lib/_input-output-functions.sh +@@ -324,10 +324,11 @@ function LogToSyslog () { + # see https://github.com/rear/rear/issues/729 + function has_binary () { + for bin in $@ ; do +- # Suppress success output via stdout (but keep failure output via stderr): +- if type $bin 1>/dev/null ; then +- return 0 +- fi ++ # Suppress success output via stdout which is crucial when has_binary is called ++ # in other functions that provide their intended function results via stdout ++ # to not pollute intended function results with intermixed has_binary stdout ++ # (e.g. the RequiredSharedObjects function) but keep failure output via stderr: ++ type $bin 1>/dev/null && return 0 + done + return 1 + } +diff --git a/usr/share/rear/lib/linux-functions.sh b/usr/share/rear/lib/linux-functions.sh +index 6a767367..3fb44e6d 100644 +--- a/usr/share/rear/lib/linux-functions.sh ++++ b/usr/share/rear/lib/linux-functions.sh +@@ -100,13 +100,13 @@ function FindStorageDrivers () { + + # Determine all required shared objects (shared/dynamic libraries) + # for programs and/or shared objects (binaries) specified in $@. +-# RequiredSharedOjects outputs the required shared objects on STDOUT. ++# RequiredSharedObjects outputs the required shared objects on STDOUT. + # The output are absolute paths to the required shared objects. + # The output can also be symbolic links (also as absolute paths). + # In case of symbolic links only the link but not the link target is output. +-function RequiredSharedOjects () { +- has_binary ldd || Error "Cannot run RequiredSharedOjects() because there is no ldd binary" +- Log "RequiredSharedOjects: Determining required shared objects" ++function RequiredSharedObjects () { ++ has_binary ldd || Error "Cannot run RequiredSharedObjects() because there is no ldd binary" ++ Log "RequiredSharedObjects: Determining required shared objects" + # It uses 'ldd' to determine all required shared objects because 'ldd' outputs + # also transitively required shared objects i.e. libraries needed by libraries, + # e.g. for /usr/sbin/parted also the libraries needed by the libparted library: +@@ -164,10 +164,11 @@ function RequiredSharedOjects () { + # 2. Line: " lib (mem-addr)" -> virtual library + # 3. Line: " lib => not found" -> print error to stderr + # 4. Line: " lib => /path/to/lib (mem-addr)" -> print $3 '/path/to/lib' +- # 5. Line: " /path/to/lib (mem-addr)" -> print $1 '/path/to/lib' ++ # 5. Line: " /path/to/lib => /path/to/lib2 (mem-addr)" -> print $3 '/path/to/lib2' ++ # 6. Line: " /path/to/lib (mem-addr)" -> print $1 '/path/to/lib' + ldd "$@" | awk ' /^\t.+ => not found/ { print "Shared object " $1 " not found" > "/dev/stderr" } + /^\t.+ => \// { print $3 } +- /^\t\// { print $1 } ' | sort -u ++ /^\t\// && !/ => / { print $1 } ' | sort -u + } + + # Provide a shell, with custom exit-prompt and history +diff --git a/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh b/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh +index e01dcdbd..3cc29777 100644 +--- a/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh ++++ b/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh +@@ -5,5 +5,6 @@ + Log "Running: /usr/openv/netbackup/bin/bplist command" + LANG=C /usr/openv/netbackup/bin/bplist -l -s `date -d "-5 days" \ + "+%m/%d/%Y"` / >/dev/null +-[ $? -gt 0 ] && LogPrint "WARNING: Netbackup bplist check failed with error code $?. ++rc=$? ++[ $rc -gt 0 ] && LogPrint "WARNING: Netbackup bplist check failed with error code ${rc}. + See $RUNTIME_LOGFILE for more details." diff --git a/SOURCES/rear-bz1653214.patch b/SOURCES/rear-bz1653214.patch new file mode 100644 index 0000000..8ed8ace --- /dev/null +++ b/SOURCES/rear-bz1653214.patch @@ -0,0 +1,17 @@ +diff --git a/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh +index 4698618c..6b3194bd 100644 +--- a/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh ++++ b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh +@@ -854,7 +854,11 @@ function handle_physdev () { + + DebugPrint "$network_interface is a physical device" + +- mac="$( cat $sysfspath/address )" || BugError "Could not read a MAC address for '$network_interface'." ++ if [ -e $sysfspath/bonding_slave/perm_hwaddr ] ; then ++ mac="$( cat $sysfspath/bonding_slave/perm_hwaddr )" ++ else ++ mac="$( cat $sysfspath/address )" || BugError "Could not read a MAC address for '$network_interface'." ++ fi + # Skip fake interfaces without MAC address + [ "$mac" != "00:00:00:00:00:00" ] || return $rc_error + diff --git a/SOURCES/rear-bz1659137.patch b/SOURCES/rear-bz1659137.patch new file mode 100644 index 0000000..e76336b --- /dev/null +++ b/SOURCES/rear-bz1659137.patch @@ -0,0 +1,91 @@ +diff --git a/usr/share/rear/skel/default/etc/scripts/system-setup.d/55-migrate-network-devices.sh b/usr/share/rear/skel/default/etc/scripts/system-setup.d/55-migrate-network-devices.sh +index e3ebacce..17cd1dd6 100644 +--- a/usr/share/rear/skel/default/etc/scripts/system-setup.d/55-migrate-network-devices.sh ++++ b/usr/share/rear/skel/default/etc/scripts/system-setup.d/55-migrate-network-devices.sh +@@ -26,18 +26,47 @@ ORIGINAL_MACS=() + # The ORIGINAL_DEVICES collects the original device names: + ORIGINAL_DEVICES=() + # The ORIG_MACS_FILE contains lines of the form: network_interface mac_address ++ ++# Temporary rear_mappings_mac used when interfaces have been renamed ++tmp_mac_mapping_file=$(mktemp) ++ + # TODO: What should happen if there is no ORIG_MACS_FILE or when it is empty? + while read orig_dev orig_mac junk ; do + ORIGINAL_DEVICES=( "${ORIGINAL_DEVICES[@]}" "$orig_dev") + ORIGINAL_MACS=( "${ORIGINAL_MACS[@]}" "$orig_mac" ) +- # Continue with the next original MAC address if it is found on the current system: +- ip link show | grep -q "$orig_mac" && continue +- MIGRATE_DEVNAMES=( "${MIGRATE_DEVNAMES[@]}" "$orig_dev" ) +- MIGRATE_MACS=( "${MIGRATE_MACS[@]}" "$orig_mac" ) ++ # Continue with the next original MAC address if it is found on the current ++ # system, otherwise we consider it needs migration: ++ new_dev=$( get_device_by_hwaddr "$orig_mac" ) ++ if [ -n "$new_dev" ] ; then ++ [ "$new_dev" = "$orig_dev" ] && continue ++ # The device was found but has been renamed (it was customized in ++ # source system). ++ # Create a temporary mac mapping, we don't want finalize() to update ++ # the ifcfg-* files! ++ echo "$orig_mac $orig_mac $orig_dev" >> $tmp_mac_mapping_file ++ else ++ MIGRATE_MACS+=( "$orig_mac" ) ++ fi + done < $ORIG_MACS_FILE + +-# Skip this process if all MACs and network interfacs (devices) are accounted for: +-test ${#MIGRATE_MACS[@]} -eq 0 && test ${#MIGRATE_DEVNAMES[@]} -eq 0 && return 0 ++ ++if [ ${#MIGRATE_MACS[@]} -ne 0 ] ; then ++ # If some MACs were not found (MIGRATE_MACS not empty) then, we need a migration ++ : ++elif [ -s $tmp_mac_mapping_file ] ; then ++ # Else, if some devices were renamed, we also need a migration, but it will ++ # be automatic thanks to the $tmp_mac_mapping_file mapping file ++ ++ # We do not need the $MAC_MAPPING_FILE file from the user, just overwrite it ++ # Later, we will remove that file to not have finalize() modify the ifcfg-* ++ # files. ++ mkdir -p $(dirname $MAC_MAPPING_FILE) ++ cp $tmp_mac_mapping_file $MAC_MAPPING_FILE ++else ++ # Skip this process if all MACs and network interfaces (devices) are accounted for ++ unset tmp_mac_mapping_file ++ return 0 ++fi + + # Find the MAC addresses that are now available. + # This is an array with values of the form "$dev $mac $driver" +@@ -74,7 +103,7 @@ done + # so that it is shown to the user what MAC address mappings will be done: + if read_and_strip_file $MAC_MAPPING_FILE ; then + while read orig_dev orig_mac junk ; do +- read_and_strip_file $MAC_MAPPING_FILE | grep -q "$orig_mac" && MANUAL_MAC_MAPPING=true ++ read_and_strip_file $MAC_MAPPING_FILE | grep -qw "^$orig_mac" && MANUAL_MAC_MAPPING=true + done < $ORIG_MACS_FILE + fi + +@@ -237,7 +266,7 @@ if is_true $reload_udev ; then + echo -n "Reloading udev ... " + # Force udev to reload rules (as they were just changed) + # Failback to "udevadm control --reload" in case of problem (as specify in udevadm manpage in SLES12) +- # If nothing work, then wait 1 seconf delay. It should let the time for udev to detect changes in the rules files. ++ # If nothing work, then wait 1 second delay. It should let the time for udev to detect changes in the rules files. + udevadm control --reload-rules || udevadm control --reload || sleep 1 + my_udevtrigger + sleep 1 +@@ -252,5 +281,13 @@ if is_true $reload_udev ; then + fi + + # A later script in finalize/* will also go over the MAC mappings file and +-# apply them to the files in the recovered system. ++# apply them to the files in the recovered system, unless we did the mapping ++# automatically, which means some device has been renamed and will probably ++# gets its name back upon reboot. ++if [ -s $tmp_mac_mapping_file ] ; then ++ rm $MAC_MAPPING_FILE $tmp_mac_mapping_file ++fi ++ ++unset tmp_mac_mapping_file + ++# vim: set et ts=4 sw=4: diff --git a/SOURCES/rear-bz1663515.patch b/SOURCES/rear-bz1663515.patch new file mode 100644 index 0000000..6c63d92 --- /dev/null +++ b/SOURCES/rear-bz1663515.patch @@ -0,0 +1,17 @@ +diff --git a/usr/share/rear/lib/uefi-functions.sh b/usr/share/rear/lib/uefi-functions.sh +index e40f2ab0..95e6292d 100644 +--- a/usr/share/rear/lib/uefi-functions.sh ++++ b/usr/share/rear/lib/uefi-functions.sh +@@ -46,6 +46,11 @@ function build_bootx86_efi { + Log "Did not find grub-mkimage (cannot build bootx86.efi)" + return + fi +- $gmkimage $v -O x86_64-efi -c $TMP_DIR/mnt/EFI/BOOT/embedded_grub.cfg -o $TMP_DIR/mnt/EFI/BOOT/BOOTX64.efi -p "/EFI/BOOT" part_gpt part_msdos fat ext2 normal chain boot configfile linux linuxefi multiboot jfs iso9660 usb usbms usb_keyboard video udf ntfs all_video gzio efi_gop reboot search test echo btrfs ++ # as not all Linux distro's have the same grub modules present we verify what we have (see also https://github.com/rear/rear/pull/2001) ++ grub_modules="" ++ for grub_module in part_gpt part_msdos fat ext2 normal chain boot configfile linux linuxefi multiboot jfs iso9660 usb usbms usb_keyboard video udf ntfs all_video gzio efi_gop reboot search test echo btrfs ; do ++ test "$( find /boot -type f -name "$grub_module.mod" 2>/dev/null )" && grub_modules="$grub_modules $grub_module" ++ done ++ $gmkimage $v -O x86_64-efi -c $TMP_DIR/mnt/EFI/BOOT/embedded_grub.cfg -o $TMP_DIR/mnt/EFI/BOOT/BOOTX64.efi -p "/EFI/BOOT" $grub_modules + StopIfError "Error occurred during $gmkimage of BOOTX64.efi" + } diff --git a/SOURCES/rear-rhbz1610638.patch b/SOURCES/rear-rhbz1610638.patch new file mode 100644 index 0000000..7111c27 --- /dev/null +++ b/SOURCES/rear-rhbz1610638.patch @@ -0,0 +1,85 @@ +diff --git a/usr/share/rear/conf/GNU/Linux.conf b/usr/share/rear/conf/GNU/Linux.conf +index 5b9343b9..f0c44381 100644 +--- a/usr/share/rear/conf/GNU/Linux.conf ++++ b/usr/share/rear/conf/GNU/Linux.conf +@@ -184,6 +184,8 @@ env + w + dosfslabel + sysctl ++blockdev ++lsblk + ) + + # the lib* serves to cover both 32bit and 64bit libraries! +diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh +index eb45115b..af1069ea 100644 +--- a/usr/share/rear/lib/layout-functions.sh ++++ b/usr/share/rear/lib/layout-functions.sh +@@ -365,7 +365,9 @@ get_partition_start() { + local disk_name=$1 + local start_block start + +- local block_size=$(get_block_size ${disk_name%/*}) ++ # When reading /sys/block/.../start or "dmsetup table", output is always in ++ # 512 bytes blocks ++ local block_size=512 + + if [[ -r /sys/block/$disk_name/start ]] ; then + start_block=$(< $path/start) +@@ -548,11 +550,32 @@ get_device_mapping() { + } + + # Get the size in bytes of a disk/partition. ++# For disks, use "sda" as argument. + # For partitions, use "sda/sda1" as argument. + get_disk_size() { + local disk_name=$1 ++ # When a partition is specified (e.g. sda/sda1) ++ # then it has to read /sys/block/sda/sda1/size in the old code below. ++ # In contrast the get_block_size() function below is different ++ # because it is non-sense asking for block size of a partition, ++ # so that the get_block_size() function below is stripping everything ++ # in front of the blockdev basename (e.g. /some/path/sda -> sda) ++ # cf. https://github.com/rear/rear/pull/1885#discussion_r207900308 ++ ++ # Preferably use blockdev, see https://github.com/rear/rear/issues/1884 ++ if has_binary blockdev; then ++ # ${disk_name##*/} translates 'sda/sda1' into 'sda1' and 'sda' into 'sda' ++ blockdev --getsize64 /dev/${disk_name##*/} && return ++ # If blockdev fails do not error out but fall through to the old code below ++ # because blockdev fails e.g. for a CDROM device when no DVD or ISO is attached to ++ # cf. https://github.com/rear/rear/pull/1885#issuecomment-410676283 ++ # and https://github.com/rear/rear/pull/1885#issuecomment-410697398 ++ fi + +- local block_size=$(get_block_size ${disk_name%/*}) ++ # Linux always considers sectors to be 512 bytes long. See the note in the ++ # kernel source, specifically, include/linux/types.h regarding the sector_t ++ # type for details. ++ local block_size=512 + + retry_command test -r /sys/block/$disk_name/size || Error "Could not determine size of disk $disk_name" + +@@ -565,9 +588,20 @@ get_disk_size() { + + # Get the block size of a disk. + get_block_size() { ++ local disk_name="${1##*/}" # /some/path/sda -> sda ++ ++ # Preferably use blockdev, see https://github.com/rear/rear/issues/1884 ++ if has_binary blockdev; then ++ blockdev --getss /dev/$disk_name && return ++ # If blockdev fails do not error out but fall through to the old code below ++ # because blockdev fails e.g. for a CDROM device when no DVD or ISO is attached to ++ # cf. https://github.com/rear/rear/pull/1885#issuecomment-410676283 ++ # and https://github.com/rear/rear/pull/1885#issuecomment-410697398 ++ fi ++ + # Only newer kernels have an interface to get the block size +- if [ -r /sys/block/$1/queue/logical_block_size ] ; then +- echo $( < /sys/block/$1/queue/logical_block_size) ++ if [ -r /sys/block/$disk_name/queue/logical_block_size ] ; then ++ echo $( < /sys/block/$disk_name/queue/logical_block_size) + else + echo "512" + fi diff --git a/SOURCES/rear-rhbz1610647.patch b/SOURCES/rear-rhbz1610647.patch new file mode 100644 index 0000000..664ca3d --- /dev/null +++ b/SOURCES/rear-rhbz1610647.patch @@ -0,0 +1,50 @@ +diff --git a/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh b/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh +index bf1db404..49480f38 100644 +--- a/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh ++++ b/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh +@@ -9,9 +9,12 @@ if grep -q "PowerNV" /proc/cpuinfo || grep -q "emulated by qemu" /proc/cpuinfo ; + fi + + # Look for the PPC PReP Boot Partition. +-part=$( awk -F ' ' '/^part / {if ($6 ~ /prep/) {print $7}}' $LAYOUT_FILE ) ++part_list=$( awk -F ' ' '/^part / {if ($6 ~ /prep/) {print $7}}' $LAYOUT_FILE ) + +-if [ -n "$part" ]; then ++# All the possible boot devices ++boot_list=() ++ ++for part in $part_list ; do + LogPrint "PPC PReP Boot partition found: $part" + + # Using $LAYOUT_DEPS file to find the disk device containing the partition. +@@ -29,14 +32,23 @@ if [ -n "$part" ]; then + # If yes, get the list of path which are part of the multipath device. + # Limit to the first 5 PATH (see #876) + if dmsetup ls --target multipath | grep -w ${bootdev#/dev/mapper/} >/dev/null 2>&1; then +- LogPrint "Limiting bootlist to 5 entries..." +- bootlist_path=$(dmsetup deps $bootdev -o devname | awk -F: '{gsub (" ",""); gsub("\\(","/dev/",$2) ; gsub("\\)"," ",$2) ; print $2}' | cut -d" " -f-5) +- LogPrint "Set LPAR bootlist to $bootlist_path" +- bootlist -m normal $bootlist_path ++ LogPrint "Limiting bootlist to 5 entries as a maximum..." ++ boot_list+=( $(dmsetup deps $bootdev -o devname | awk -F: '{gsub (" ",""); gsub("\\(","/dev/",$2) ; gsub("\\)"," ",$2) ; print $2}' | cut -d" " -f-5) ) + else + # Single Path device found +- LogPrint "Set LPAR bootlist to $bootdev" +- bootlist -m normal $bootdev ++ boot_list+=( $bootdev ) + fi +- LogIfError "Unable to set bootlist. You will have to start in SMS to set it up manually." ++done ++ ++if [[ ${#boot_list[@]} -gt 5 ]]; then ++ LogPrint "Too many entries for bootlist command, limiting to first 5 entries..." ++ boot_list=( ${boot_list[@]:0:5} ) + fi ++ ++if [[ ${#boot_list[@]} -gt 0 ]]; then ++ LogPrint "Set LPAR bootlist to '${boot_list[@]}'" ++ bootlist -m normal $boot_list ++ LogPrintIfError "Unable to set bootlist. You will have to start in SMS to set it up manually." ++fi ++ ++# vim: set et ts=4 sw=4: diff --git a/SPECS/rear.spec b/SPECS/rear.spec new file mode 100644 index 0000000..8c476c3 --- /dev/null +++ b/SPECS/rear.spec @@ -0,0 +1,245 @@ +%define debug_package %{nil} + +Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool +Name: rear +Version: 2.4 +Release: 6%{?dist} +License: GPLv3 +Group: Applications/File +URL: http://relax-and-recover.org/ + +Source0: https://github.com/rear/rear/archive/%{version}.tar.gz#/rear-%{version}.tar.gz +Patch4: rear-bz1492177-warning.patch +Patch6: rear-rhbz1610638.patch +Patch7: rear-rhbz1610647.patch +Patch8: rear-bz1652828-bz1652853.patch +Patch9: rear-bz1631183.patch +Patch10: rear-bz1639705.patch +Patch11: rear-bz1653214.patch +Patch12: rear-bz1659137.patch +patch13: rear-bz1663515.patch + +ExcludeArch: s390x +ExcludeArch: s390 + +### Dependencies on all distributions +BuildRequires: asciidoc +Requires: binutils +Requires: ethtool +Requires: gzip +Requires: iputils +Requires: parted +Requires: tar +Requires: openssl +Requires: gawk +Requires: attr +Requires: bc + +### If you require NFS, you may need the below packages +#Requires: nfsclient portmap rpcbind + +### We drop LSB requirements because it pulls in too many dependencies +### The OS is hardcoded in /etc/rear/os.conf instead +#Requires: redhat-lsb + +### Required for Bacula/MySQL support +#Requires: bacula-mysql + +### Required for OBDR +#Requires: lsscsi sg3_utils + +### Optional requirement +#Requires: cfg2html + +%ifarch x86_64 i686 +Requires: syslinux +%endif +%ifarch ppc ppc64 +Requires: yaboot +%endif + +Requires: crontabs +Requires: iproute +#Requires: mkisofs +Requires: xorriso + +# mingetty is not available anymore with RHEL 7 (use agetty instead via systemd) +# Note that CentOS also has rhel defined so there is no need to use centos +%if 0%{?rhel} && 0%{?rhel} > 6 +Requires: util-linux +%else +Requires: mingetty +Requires: util-linux +%endif + +### The rear-snapshot package is no more +#Obsoletes: rear-snapshot + +%description +Relax-and-Recover is the leading Open Source disaster recovery and system +migration solution. It comprises of a modular +frame-work and ready-to-go workflows for many common situations to produce +a bootable image and restore from backup using this image. As a benefit, +it allows to restore to different hardware and can therefore be used as +a migration tool as well. + +Currently Relax-and-Recover supports various boot media (incl. ISO, PXE, +OBDR tape, USB or eSATA storage), a variety of network protocols (incl. +sftp, ftp, http, nfs, cifs) as well as a multitude of backup strategies +(incl. IBM TSM, HP DataProtector, Symantec NetBackup, EMC NetWorker, +Bacula, Bareos, BORG, Duplicity, rsync). + +Relax-and-Recover was designed to be easy to set up, requires no maintenance +and is there to assist when disaster strikes. Its setup-and-forget nature +removes any excuse for not having a disaster recovery solution implemented. + +Professional services and support are available. + +%pre +if [ $1 -gt 1 ] ; then +# during upgrade remove obsolete directories +%{__rm} -rf %{_datadir}/rear/output/NETFS +fi + +%prep +%setup +%patch4 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 + +echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron + +### Add a specific os.conf so we do not depend on LSB dependencies +%{?fedora:echo -e "OS_VENDOR=Fedora\nOS_VERSION=%{?fedora}" >etc/rear/os.conf} +%{?rhel:echo -e "OS_VENDOR=RedHatEnterpriseServer\nOS_VERSION=%{?rhel}" >etc/rear/os.conf} + +%build +# asciidoc writes a timestamp to files it produces, based on the last +# modified date of the source file, but is sensible to the timezone. +# This makes the results differ according to the timezone of the build machine +# and spurious changes will be seen. +# Set the timezone to UTC as a workaround. +# https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByAsciidoc +TZ=UTC %{__make} -C doc + +%install +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR="%{buildroot}" +%{__install} -Dp -m0644 rear.cron %{buildroot}%{_sysconfdir}/cron.d/rear + +%files +%defattr(-, root, root, 0755) +%doc MAINTAINERS COPYING README.adoc doc/*.txt doc/user-guide/relax-and-recover-user-guide.html +%doc %{_mandir}/man8/rear.8* +%config(noreplace) %{_sysconfdir}/cron.d/rear +%config(noreplace) %{_sysconfdir}/rear/ +%config(noreplace) %{_sysconfdir}/rear/cert/ +%{_datadir}/rear/ +%{_localstatedir}/lib/rear/ +%{_sbindir}/rear + +%changelog +* Mon Jan 14 2019 Pavel Cahyna - 2.4-6 +- Require xorriso instead of genisoimage, it is now the preferred method + and supports files over 4GB in size. +- Apply upstream PR2004 (support for custom network interface naming) +- Backport upstream PR2001 (UEFI support broken on Fedora 29 and RHEL 8) + +* Thu Dec 13 2018 Pavel Cahyna - 2.4-4 +- Backport fixes for upstream bugs 1974 and 1975 +- Backport fix for upstream bug 1913 (backup succeeds in case of tar error) +- Backport fix for upstream bug 1926 (support for LACP bonding and teaming) +- Apply upstream PR1954 (record permanent MAC address for bond members) + +* Thu Aug 09 2018 Pavel Cahyna - 2.4-3 +- Merge some spec changes from Fedora. +- Apply upstream patch PR1887 + LPAR/PPC64 bootlist is incorrectly set when having multiple 'prep' partitions +- Apply upstream patch PR1885 + Partition information recorded is unexpected when disk has 4K block size + +* Wed Jul 18 2018 Pavel Cahyna - 2.4-2 +- Build and install the HTML user guide. #1418459 + +* Wed Jun 27 2018 Pavel Cahyna - 2.4-1 +- Rebase to version 2.4, drop patches integrated upstream + Resolves #1534646 #1484051 #1498828 #1571266 #1496518 + +* Wed Feb 14 2018 Pavel Cahyna - 2.00-6 +- Ensure that NetBackup is started automatically upon recovery (PR#1544) + Also do not kill daemons spawned by sysinit.service at the service's end + (PR#1610, applies to NetBackup and also to dhclient) + Resolves #1506231 +- Print a warning if grub2-mkimage is about to fail and suggest what to do. + bz#1492177 +- Update the patch for #1388653 to the one actually merged upstream (PR1418) + +* Fri Jan 12 2018 Pavel Cahyna - 2.00-5 +- cd to the correct directory before md5sum to fix BACKUP_INTEGRITY_CHECK. + Upstream PR#1685, bz1532676 + +* Mon Oct 23 2017 Pavel Cahyna - 2.00-4 +- Retry get_disk_size to fix upstream #1370, bz1388653 + +* Wed Sep 13 2017 Pavel Cahyna - 2.00-3 +- Fix rear mkrescue on systems w/o UEFI. Upstream PR#1481 issue#1478 +- Resolves: #1479002 + +* Wed May 17 2017 Jakub Mazanek - 2.00-2 +- Excluding Archs s390 and s390x +- Related #1355667 + +* Mon Feb 20 2017 Jakub Mazanek - 2.00-1 +- Rebase to version 2.00 +- Resolves #1355667 + +* Tue Jul 19 2016 Petr Hracek - 1.17.2-6 +- Replace experimental grep -P with grep -E +Resolves: #1290205 + +* Wed Mar 23 2016 Petr Hracek - 1.17.2-5 +- Remove backuped patched files +Related: #1283930 + +* Wed Mar 23 2016 Petr Hracek - 1.17.2-4 +- Rear recovery over teaming interface will not work +Resolves: #1283930 + +* Tue Mar 08 2016 Petr Hracek - 1.17.2-3 +- Replace experimental grep -P with grep -E +Resolves: #1290205 + +* Tue Feb 23 2016 Petr Hracek - 1.17.2-2 +- rear does not require syslinux +- changing to arch package so that syslinux is installed +- Resolves: #1283927 + +* Mon Sep 14 2015 Petr Hracek - 1.17.2-1 +- New upstream release 1.17.2 +Related: #1059196 + +* Wed May 13 2015 Petr Hracek 1.17.0-2 +- Fix Source tag +Related: #1059196 + +* Mon May 04 2015 Petr Hracek 1.17.0-1 +- Initial package for RHEL 7 +Resolves: #1059196 + +* Fri Oct 17 2014 Gratien D'haese +- added the suse_version lines to identify the corresponding OS_VERSION + +* Fri Jun 20 2014 Gratien D'haese +- add %%pre section + +* Thu Apr 11 2013 Gratien D'haese +- changes Source + +* Thu Jun 03 2010 Dag Wieers +- Initial package. (using DAR)