Merge pull request #1981 from jsmeix/reorder_final_build_stage_script…

…s_related_to_pull_request_1971

Rearranged final build stage scripts so that now
"fix_broken_links" is run before "verify_rootfs".

usr/sbin/rear

@@ -410,7 +410,7 @@ if test "$WORKFLOW" != "help" ; then
 fi
 
 # In DEBUG mode keep by default the build area but that can be overridden in user config files
-# therefore no readonly KEEP_BUILD_DIR (it is also set to 1 in build/default/980_verify_rootfs.sh):
+# therefore no readonly KEEP_BUILD_DIR (it is also set to 1 in build/default/990_verify_rootfs.sh):
 test "$DEBUG" && KEEP_BUILD_DIR=1 || true
 
 # Check if we are in recovery mode:

usr/share/rear/build/default/985_fix_broken_links.sh

@@ -7,7 +7,7 @@
 # and https://github.com/rear/rear/pull/1734
 
 # FIXME: The following code fails if symlinks or their targets contain characters from IFS (e.g. blanks),
-# cf. the same kind of comments in build/default/980_verify_rootfs.sh
+# cf. the same kind of comments in build/default/990_verify_rootfs.sh
 # and layout/prepare/GNU/Linux/130_include_mount_subvolumes_code.sh
 # see https://github.com/rear/rear/pull/1514#discussion_r141031975
 # and for the general issue see https://github.com/rear/rear/issues/1372

usr/share/rear/conf/default.conf

@@ -1315,7 +1315,7 @@ SSH_UNPROTECTED_PRIVATE_KEYS='no'
 # By default it is fatal when 'ldd' reports a 'not found' library for
 # any file in a /bin/ or /sbin/ directory in the recovery system and
 # "rear mkrescue/mkbackup" aborts with "recovery system not usable".
-# For details see the build/default/980_verify_rootfs.sh script.
+# For details see the build/default/990_verify_rootfs.sh script.
 NON_FATAL_BINARIES_WITH_MISSING_LIBRARY=''
 
 ##

usr/share/rear/lib/sesam-functions.sh

@@ -9,7 +9,7 @@ if ! test -r $sesam2000ini_file ; then
     return 0
 fi
 
-# for later use in default/980_verify_rootfs.sh to avoid issues
+# for later use in build/default/990_verify_rootfs.sh to avoid issues
 # with missing library dependencies during rootfs check
 source $sesam2000ini_file
 SESAM_LD_LIBRARY_PATH=$SM_BIN_SESAM