diff --git a/doc/user-guide/10-integrating-external-backup.adoc b/doc/user-guide/10-integrating-external-backup.adoc index 716f5a00fd..b10544acc8 100644 --- a/doc/user-guide/10-integrating-external-backup.adoc +++ b/doc/user-guide/10-integrating-external-backup.adoc @@ -76,16 +76,16 @@ Again, think burp, and you probably also need these directories to be created: Another easy trick is to look at the existing scripts of NBU (as a starter): $ sudo rear -s mkrescue | grep NBU - Source prep/NBU/default/40_prep_nbu.sh - Source prep/NBU/default/45_check_nbu_client_configured.sh - Source rescue/NBU/default/45_prepare_netbackup.sh - Source rescue/NBU/default/45_prepare_xinetd.sh + Source prep/NBU/default/400_prep_nbu.sh + Source prep/NBU/default/450_check_nbu_client_configured.sh + Source rescue/NBU/default/450_prepare_netbackup.sh + Source rescue/NBU/default/450_prepare_xinetd.sh $ sudo rear -s recover | grep NBU - Source verify/NBU/default/38_request_client_destination.sh - Source verify/NBU/default/39_request_point_in_time_restore_parameters.sh - Source verify/NBU/default/40_verify_nbu.sh - Source restore/NBU/default/30_create_nbu_restore_fs_list.sh - Source restore/NBU/default/40_restore_with_nbu.sh - Source finalize/NBU/default/99_copy_bplogrestorelog.sh + Source verify/NBU/default/380_request_client_destination.sh + Source verify/NBU/default/390_request_point_in_time_restore_parameters.sh + Source verify/NBU/default/400_verify_nbu.sh + Source restore/NBU/default/300_create_nbu_restore_fs_list.sh + Source restore/NBU/default/400_restore_with_nbu.sh + Source finalize/NBU/default/990_copy_bplogrestorelog.sh diff --git a/usr/sbin/rear b/usr/sbin/rear index 8f4385a53c..f775887acf 100755 --- a/usr/sbin/rear +++ b/usr/sbin/rear @@ -334,7 +334,7 @@ if test "$VERBOSE" ; then fi # Enable debug output of the progress pipe -# (no readonly KEEP_BUILD_DIR because it is also set to 1 in build/default/98_verify_rootfs.sh): +# (no readonly KEEP_BUILD_DIR because it is also set to 1 in build/default/980_verify_rootfs.sh): test "$DEBUG" && KEEP_BUILD_DIR=1 || true # Check if we are in recovery mode: diff --git a/usr/share/rear/backup/BORG/default/10_get_suffix.sh b/usr/share/rear/backup/BORG/default/100_get_suffix.sh similarity index 96% rename from usr/share/rear/backup/BORG/default/10_get_suffix.sh rename to usr/share/rear/backup/BORG/default/100_get_suffix.sh index fc6a89b61a..a7f81f8709 100644 --- a/usr/share/rear/backup/BORG/default/10_get_suffix.sh +++ b/usr/share/rear/backup/BORG/default/100_get_suffix.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 10_get_suffix.sh +# 100_get_suffix.sh # Do we have Borg binary? has_binary borg diff --git a/usr/share/rear/backup/BORG/default/400_create_include_exclude_files.sh b/usr/share/rear/backup/BORG/default/400_create_include_exclude_files.sh new file mode 120000 index 0000000000..d8d12c0b1d --- /dev/null +++ b/usr/share/rear/backup/BORG/default/400_create_include_exclude_files.sh @@ -0,0 +1 @@ +../../NETFS/default/400_create_include_exclude_files.sh \ No newline at end of file diff --git a/usr/share/rear/backup/BORG/default/40_create_include_exclude_files.sh b/usr/share/rear/backup/BORG/default/40_create_include_exclude_files.sh deleted file mode 120000 index faa21d7f7c..0000000000 --- a/usr/share/rear/backup/BORG/default/40_create_include_exclude_files.sh +++ /dev/null @@ -1 +0,0 @@ -../../NETFS/default/40_create_include_exclude_files.sh \ No newline at end of file diff --git a/usr/share/rear/backup/BORG/default/50_make_backup.sh b/usr/share/rear/backup/BORG/default/500_make_backup.sh similarity index 89% rename from usr/share/rear/backup/BORG/default/50_make_backup.sh rename to usr/share/rear/backup/BORG/default/500_make_backup.sh index eb0ae7a198..e08ddde36e 100644 --- a/usr/share/rear/backup/BORG/default/50_make_backup.sh +++ b/usr/share/rear/backup/BORG/default/500_make_backup.sh @@ -1,11 +1,11 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 50_make_backup.sh +# 500_make_backup.sh include_list=() -# Check if backup-include.txt (created by 40_create_include_exclude_files.sh), +# Check if backup-include.txt (created by 400_create_include_exclude_files.sh), # really exists. if [ ! -r $TMP_DIR/backup-include.txt ]; then Error "Can't find include list" diff --git a/usr/share/rear/backup/BORG/default/80_prune_old_backups.sh b/usr/share/rear/backup/BORG/default/800_prune_old_backups.sh similarity index 95% rename from usr/share/rear/backup/BORG/default/80_prune_old_backups.sh rename to usr/share/rear/backup/BORG/default/800_prune_old_backups.sh index d34f005079..4b89e0adb1 100644 --- a/usr/share/rear/backup/BORG/default/80_prune_old_backups.sh +++ b/usr/share/rear/backup/BORG/default/800_prune_old_backups.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 80_prune_old_backups.sh +# 800_prune_old_backups.sh if [ ! -z $BORGBACKUP_OPT_PRUNE ]; then # Purge old archives according user settings. diff --git a/usr/share/rear/backup/DUPLICITY/default/50_make_duplicity_backup.sh b/usr/share/rear/backup/DUPLICITY/default/500_make_duplicity_backup.sh similarity index 100% rename from usr/share/rear/backup/DUPLICITY/default/50_make_duplicity_backup.sh rename to usr/share/rear/backup/DUPLICITY/default/500_make_duplicity_backup.sh diff --git a/usr/share/rear/backup/EXTERNAL/default/50_make_backup_with_external.sh b/usr/share/rear/backup/EXTERNAL/default/500_make_backup_with_external.sh similarity index 100% rename from usr/share/rear/backup/EXTERNAL/default/50_make_backup_with_external.sh rename to usr/share/rear/backup/EXTERNAL/default/500_make_backup_with_external.sh diff --git a/usr/share/rear/backup/NETFS/GNU/Linux/310_stop_selinux.sh b/usr/share/rear/backup/NETFS/GNU/Linux/310_stop_selinux.sh new file mode 120000 index 0000000000..7e95a5cb28 --- /dev/null +++ b/usr/share/rear/backup/NETFS/GNU/Linux/310_stop_selinux.sh @@ -0,0 +1 @@ +../../../RSYNC/GNU/Linux/310_stop_selinux.sh \ No newline at end of file diff --git a/usr/share/rear/backup/NETFS/GNU/Linux/31_stop_selinux.sh b/usr/share/rear/backup/NETFS/GNU/Linux/31_stop_selinux.sh deleted file mode 120000 index 7b883dade0..0000000000 --- a/usr/share/rear/backup/NETFS/GNU/Linux/31_stop_selinux.sh +++ /dev/null @@ -1 +0,0 @@ -../../../RSYNC/GNU/Linux/31_stop_selinux.sh \ No newline at end of file diff --git a/usr/share/rear/backup/NETFS/GNU/Linux/60_start_selinux.sh b/usr/share/rear/backup/NETFS/GNU/Linux/600_start_selinux.sh similarity index 100% rename from usr/share/rear/backup/NETFS/GNU/Linux/60_start_selinux.sh rename to usr/share/rear/backup/NETFS/GNU/Linux/600_start_selinux.sh diff --git a/usr/share/rear/backup/NETFS/GNU/Linux/620_force_autorelabel.sh b/usr/share/rear/backup/NETFS/GNU/Linux/620_force_autorelabel.sh new file mode 120000 index 0000000000..78e15ad783 --- /dev/null +++ b/usr/share/rear/backup/NETFS/GNU/Linux/620_force_autorelabel.sh @@ -0,0 +1 @@ +../../../RSYNC/GNU/Linux/620_force_autorelabel.sh \ No newline at end of file diff --git a/usr/share/rear/backup/NETFS/GNU/Linux/62_force_autorelabel.sh b/usr/share/rear/backup/NETFS/GNU/Linux/62_force_autorelabel.sh deleted file mode 120000 index 74b617e588..0000000000 --- a/usr/share/rear/backup/NETFS/GNU/Linux/62_force_autorelabel.sh +++ /dev/null @@ -1 +0,0 @@ -../../../RSYNC/GNU/Linux/62_force_autorelabel.sh \ No newline at end of file diff --git a/usr/share/rear/backup/NETFS/default/10_mount_NETFS_path.sh b/usr/share/rear/backup/NETFS/default/100_mount_NETFS_path.sh similarity index 100% rename from usr/share/rear/backup/NETFS/default/10_mount_NETFS_path.sh rename to usr/share/rear/backup/NETFS/default/100_mount_NETFS_path.sh diff --git a/usr/share/rear/backup/NETFS/default/15_save_copy_of_prefix_dir.sh b/usr/share/rear/backup/NETFS/default/150_save_copy_of_prefix_dir.sh similarity index 89% rename from usr/share/rear/backup/NETFS/default/15_save_copy_of_prefix_dir.sh rename to usr/share/rear/backup/NETFS/default/150_save_copy_of_prefix_dir.sh index c67f0409ea..d79653b42d 100644 --- a/usr/share/rear/backup/NETFS/default/15_save_copy_of_prefix_dir.sh +++ b/usr/share/rear/backup/NETFS/default/150_save_copy_of_prefix_dir.sh @@ -22,4 +22,4 @@ else # lockfile was already made through the output workflow (hands off) Log "Lockfile '${opath}/.lockfile' found (created by output workflow)." fi -# the ${BUILD_DIR}/outputfs/${NETFS_PREFIX} will be created by output/NETFS/default/20_make_prefix_dir.sh +# the ${BUILD_DIR}/outputfs/${NETFS_PREFIX} will be created by backup/NETFS/default/200_make_prefix_dir.sh diff --git a/usr/share/rear/backup/NETFS/default/20_make_prefix_dir.sh b/usr/share/rear/backup/NETFS/default/200_make_prefix_dir.sh similarity index 100% rename from usr/share/rear/backup/NETFS/default/20_make_prefix_dir.sh rename to usr/share/rear/backup/NETFS/default/200_make_prefix_dir.sh diff --git a/usr/share/rear/backup/NETFS/default/25_create_lock.sh b/usr/share/rear/backup/NETFS/default/250_create_lock.sh similarity index 100% rename from usr/share/rear/backup/NETFS/default/25_create_lock.sh rename to usr/share/rear/backup/NETFS/default/250_create_lock.sh diff --git a/usr/share/rear/backup/NETFS/default/40_create_include_exclude_files.sh b/usr/share/rear/backup/NETFS/default/400_create_include_exclude_files.sh similarity index 100% rename from usr/share/rear/backup/NETFS/default/40_create_include_exclude_files.sh rename to usr/share/rear/backup/NETFS/default/400_create_include_exclude_files.sh diff --git a/usr/share/rear/backup/NETFS/default/50_make_backup.sh b/usr/share/rear/backup/NETFS/default/500_make_backup.sh similarity index 99% rename from usr/share/rear/backup/NETFS/default/50_make_backup.sh rename to usr/share/rear/backup/NETFS/default/500_make_backup.sh index 233bd300c0..f43f2fbbbe 100644 --- a/usr/share/rear/backup/NETFS/default/50_make_backup.sh +++ b/usr/share/rear/backup/NETFS/default/500_make_backup.sh @@ -1,4 +1,4 @@ -# 50_make_backup.sh +# 500_make_backup.sh # function set_tar_features { diff --git a/usr/share/rear/backup/NETFS/default/97_remove_lock.sh b/usr/share/rear/backup/NETFS/default/970_remove_lock.sh similarity index 100% rename from usr/share/rear/backup/NETFS/default/97_remove_lock.sh rename to usr/share/rear/backup/NETFS/default/970_remove_lock.sh diff --git a/usr/share/rear/backup/NETFS/default/98_umount_NETFS_dir.sh b/usr/share/rear/backup/NETFS/default/980_umount_NETFS_dir.sh similarity index 100% rename from usr/share/rear/backup/NETFS/default/98_umount_NETFS_dir.sh rename to usr/share/rear/backup/NETFS/default/980_umount_NETFS_dir.sh diff --git a/usr/share/rear/backup/OBDR/default/51_rewind_tape_drive.sh b/usr/share/rear/backup/OBDR/default/510_rewind_tape_drive.sh similarity index 100% rename from usr/share/rear/backup/OBDR/default/51_rewind_tape_drive.sh rename to usr/share/rear/backup/OBDR/default/510_rewind_tape_drive.sh diff --git a/usr/share/rear/backup/RSYNC/GNU/Linux/31_stop_selinux.sh b/usr/share/rear/backup/RSYNC/GNU/Linux/310_stop_selinux.sh similarity index 80% rename from usr/share/rear/backup/RSYNC/GNU/Linux/31_stop_selinux.sh rename to usr/share/rear/backup/RSYNC/GNU/Linux/310_stop_selinux.sh index c0f74bc031..8b9456b540 100644 --- a/usr/share/rear/backup/RSYNC/GNU/Linux/31_stop_selinux.sh +++ b/usr/share/rear/backup/RSYNC/GNU/Linux/310_stop_selinux.sh @@ -1,4 +1,4 @@ -# Stop SELinux if present - see prep/RSYNC/default/20_selinux_in_use.sh +# Stop SELinux if present - see prep/RSYNC/GNU/Linux/200_selinux_in_use.sh [ -f $TMP_DIR/selinux.mode ] || return case "$(basename ${BACKUP_PROG})" in (tar|rsync) diff --git a/usr/share/rear/backup/RSYNC/GNU/Linux/61_start_selinux.sh b/usr/share/rear/backup/RSYNC/GNU/Linux/610_start_selinux.sh similarity index 100% rename from usr/share/rear/backup/RSYNC/GNU/Linux/61_start_selinux.sh rename to usr/share/rear/backup/RSYNC/GNU/Linux/610_start_selinux.sh diff --git a/usr/share/rear/backup/RSYNC/GNU/Linux/62_force_autorelabel.sh b/usr/share/rear/backup/RSYNC/GNU/Linux/620_force_autorelabel.sh similarity index 100% rename from usr/share/rear/backup/RSYNC/GNU/Linux/62_force_autorelabel.sh rename to usr/share/rear/backup/RSYNC/GNU/Linux/620_force_autorelabel.sh diff --git a/usr/share/rear/backup/RSYNC/default/20_check_rsync_relative_option.sh b/usr/share/rear/backup/RSYNC/default/200_check_rsync_relative_option.sh similarity index 91% rename from usr/share/rear/backup/RSYNC/default/20_check_rsync_relative_option.sh rename to usr/share/rear/backup/RSYNC/default/200_check_rsync_relative_option.sh index 9f3d6605c3..ede150ddd3 100644 --- a/usr/share/rear/backup/RSYNC/default/20_check_rsync_relative_option.sh +++ b/usr/share/rear/backup/RSYNC/default/200_check_rsync_relative_option.sh @@ -1,4 +1,4 @@ -# 20_check_rsync_relative_option.sh +# 200_check_rsync_relative_option.sh # See issue #871 for details # check for the --relative option in BACKUP_RSYNC_OPTIONS array diff --git a/usr/share/rear/backup/RSYNC/default/400_create_include_exclude_files.sh b/usr/share/rear/backup/RSYNC/default/400_create_include_exclude_files.sh new file mode 120000 index 0000000000..d8d12c0b1d --- /dev/null +++ b/usr/share/rear/backup/RSYNC/default/400_create_include_exclude_files.sh @@ -0,0 +1 @@ +../../NETFS/default/400_create_include_exclude_files.sh \ No newline at end of file diff --git a/usr/share/rear/backup/RSYNC/default/40_create_include_exclude_files.sh b/usr/share/rear/backup/RSYNC/default/40_create_include_exclude_files.sh deleted file mode 120000 index faa21d7f7c..0000000000 --- a/usr/share/rear/backup/RSYNC/default/40_create_include_exclude_files.sh +++ /dev/null @@ -1 +0,0 @@ -../../NETFS/default/40_create_include_exclude_files.sh \ No newline at end of file diff --git a/usr/share/rear/backup/RSYNC/default/45_calculate_req_space.sh b/usr/share/rear/backup/RSYNC/default/450_calculate_req_space.sh similarity index 100% rename from usr/share/rear/backup/RSYNC/default/45_calculate_req_space.sh rename to usr/share/rear/backup/RSYNC/default/450_calculate_req_space.sh diff --git a/usr/share/rear/backup/RSYNC/default/50_make_rsync_backup.sh b/usr/share/rear/backup/RSYNC/default/500_make_rsync_backup.sh similarity index 100% rename from usr/share/rear/backup/RSYNC/default/50_make_rsync_backup.sh rename to usr/share/rear/backup/RSYNC/default/500_make_rsync_backup.sh diff --git a/usr/share/rear/backup/RSYNC/default/70_copy_backup_log.sh b/usr/share/rear/backup/RSYNC/default/700_copy_backup_log.sh similarity index 100% rename from usr/share/rear/backup/RSYNC/default/70_copy_backup_log.sh rename to usr/share/rear/backup/RSYNC/default/700_copy_backup_log.sh diff --git a/usr/share/rear/backup/default/00_valid_backup_methods.sh b/usr/share/rear/backup/default/005_valid_backup_methods.sh similarity index 100% rename from usr/share/rear/backup/default/00_valid_backup_methods.sh rename to usr/share/rear/backup/default/005_valid_backup_methods.sh diff --git a/usr/share/rear/backup/default/01_pre_backup_script.sh b/usr/share/rear/backup/default/010_pre_backup_script.sh similarity index 100% rename from usr/share/rear/backup/default/01_pre_backup_script.sh rename to usr/share/rear/backup/default/010_pre_backup_script.sh diff --git a/usr/share/rear/backup/default/99_post_backup_script.sh b/usr/share/rear/backup/default/990_post_backup_script.sh similarity index 100% rename from usr/share/rear/backup/default/99_post_backup_script.sh rename to usr/share/rear/backup/default/990_post_backup_script.sh diff --git a/usr/share/rear/build/DUPLICITY/default/60_create_python_symlink.sh b/usr/share/rear/build/DUPLICITY/default/600_create_python_symlink.sh similarity index 100% rename from usr/share/rear/build/DUPLICITY/default/60_create_python_symlink.sh rename to usr/share/rear/build/DUPLICITY/default/600_create_python_symlink.sh diff --git a/usr/share/rear/build/Debian/61_jessie_link_systemd_lib.sh b/usr/share/rear/build/Debian/610_jessie_link_systemd_lib.sh similarity index 100% rename from usr/share/rear/build/Debian/61_jessie_link_systemd_lib.sh rename to usr/share/rear/build/Debian/610_jessie_link_systemd_lib.sh diff --git a/usr/share/rear/build/Debian/i386/60_fix_debian_stuff.sh b/usr/share/rear/build/Debian/i386/600_fix_debian_stuff.sh similarity index 100% rename from usr/share/rear/build/Debian/i386/60_fix_debian_stuff.sh rename to usr/share/rear/build/Debian/i386/600_fix_debian_stuff.sh diff --git a/usr/share/rear/build/GNU/Linux/00_create_symlinks.sh b/usr/share/rear/build/GNU/Linux/005_create_symlinks.sh similarity index 98% rename from usr/share/rear/build/GNU/Linux/00_create_symlinks.sh rename to usr/share/rear/build/GNU/Linux/005_create_symlinks.sh index ac51d66605..ad2fbedad2 100644 --- a/usr/share/rear/build/GNU/Linux/00_create_symlinks.sh +++ b/usr/share/rear/build/GNU/Linux/005_create_symlinks.sh @@ -1,4 +1,4 @@ -# 00_create_symlinks.sh +# 005_create_symlinks.sh # # create some symlinks for Relax-and-Recover # diff --git a/usr/share/rear/build/GNU/Linux/09_create_lib_directories_and_symlinks.sh b/usr/share/rear/build/GNU/Linux/090_create_lib_directories_and_symlinks.sh similarity index 100% rename from usr/share/rear/build/GNU/Linux/09_create_lib_directories_and_symlinks.sh rename to usr/share/rear/build/GNU/Linux/090_create_lib_directories_and_symlinks.sh diff --git a/usr/share/rear/build/GNU/Linux/10_copy_as_is.sh b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh similarity index 98% rename from usr/share/rear/build/GNU/Linux/10_copy_as_is.sh rename to usr/share/rear/build/GNU/Linux/100_copy_as_is.sh index 3f4f5a7c46..ffab143046 100644 --- a/usr/share/rear/build/GNU/Linux/10_copy_as_is.sh +++ b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh @@ -1,4 +1,4 @@ -# 40_copy_as_is.sh +# 400_copy_as_is.sh # # copy files and directories that should be copied over as-is to the rescue # systems. Checks also for library dependancies of executables and adds diff --git a/usr/share/rear/build/GNU/Linux/11_touch_empty_files.sh b/usr/share/rear/build/GNU/Linux/110_touch_empty_files.sh similarity index 92% rename from usr/share/rear/build/GNU/Linux/11_touch_empty_files.sh rename to usr/share/rear/build/GNU/Linux/110_touch_empty_files.sh index 568119f293..c8e0f2fff5 100644 --- a/usr/share/rear/build/GNU/Linux/11_touch_empty_files.sh +++ b/usr/share/rear/build/GNU/Linux/110_touch_empty_files.sh @@ -1,4 +1,4 @@ -# 10_touch_empty_files.sh +# 100_touch_empty_files.sh # # Create some empty system necessary files for Relax-and-Recover # diff --git a/usr/share/rear/build/GNU/Linux/13_create_dotfiles.sh b/usr/share/rear/build/GNU/Linux/130_create_dotfiles.sh similarity index 97% rename from usr/share/rear/build/GNU/Linux/13_create_dotfiles.sh rename to usr/share/rear/build/GNU/Linux/130_create_dotfiles.sh index 1691f95a4b..c034c409a7 100644 --- a/usr/share/rear/build/GNU/Linux/13_create_dotfiles.sh +++ b/usr/share/rear/build/GNU/Linux/130_create_dotfiles.sh @@ -1,4 +1,4 @@ -# 20_create_dotfiles.sh +# 200_create_dotfiles.sh # # Create some . dot files for Relax-and-Recover # diff --git a/usr/share/rear/build/GNU/Linux/15_adjust_permissions.sh b/usr/share/rear/build/GNU/Linux/150_adjust_permissions.sh similarity index 100% rename from usr/share/rear/build/GNU/Linux/15_adjust_permissions.sh rename to usr/share/rear/build/GNU/Linux/150_adjust_permissions.sh diff --git a/usr/share/rear/build/GNU/Linux/39_copy_binaries_libraries.sh b/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh similarity index 97% rename from usr/share/rear/build/GNU/Linux/39_copy_binaries_libraries.sh rename to usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh index d5563d9dfa..67ab2dde8f 100644 --- a/usr/share/rear/build/GNU/Linux/39_copy_binaries_libraries.sh +++ b/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh @@ -1,4 +1,4 @@ -# 20_copy_binaries_libraries.sh +# 200_copy_binaries_libraries.sh # # copy binaries and libraries for Relax-and-Recover # diff --git a/usr/share/rear/build/GNU/Linux/40_copy_modules.sh b/usr/share/rear/build/GNU/Linux/400_copy_modules.sh similarity index 97% rename from usr/share/rear/build/GNU/Linux/40_copy_modules.sh rename to usr/share/rear/build/GNU/Linux/400_copy_modules.sh index f3028e4c66..1e6c6d6506 100644 --- a/usr/share/rear/build/GNU/Linux/40_copy_modules.sh +++ b/usr/share/rear/build/GNU/Linux/400_copy_modules.sh @@ -1,4 +1,4 @@ -# 40_copy_modules.sh +# 400_copy_modules.sh # # copy kernel modules for Relax-and-Recover # diff --git a/usr/share/rear/build/GNU/Linux/45_symlink_mingetty.sh b/usr/share/rear/build/GNU/Linux/450_symlink_mingetty.sh similarity index 84% rename from usr/share/rear/build/GNU/Linux/45_symlink_mingetty.sh rename to usr/share/rear/build/GNU/Linux/450_symlink_mingetty.sh index ef125e2827..af4cad4ddb 100644 --- a/usr/share/rear/build/GNU/Linux/45_symlink_mingetty.sh +++ b/usr/share/rear/build/GNU/Linux/450_symlink_mingetty.sh @@ -1,4 +1,4 @@ -# build/GNU/Linux/45_symlink_mingetty.sh +# build/GNU/Linux/450_symlink_mingetty.sh [[ -f "$ROOTFS_DIR/bin/mingetty" ]] && return # no need to create a symlink to mingetty diff --git a/usr/share/rear/build/GNU/Linux/60_verify_and_adjust_udev.sh b/usr/share/rear/build/GNU/Linux/600_verify_and_adjust_udev.sh similarity index 98% rename from usr/share/rear/build/GNU/Linux/60_verify_and_adjust_udev.sh rename to usr/share/rear/build/GNU/Linux/600_verify_and_adjust_udev.sh index d607c7a2e6..6dddffefc2 100644 --- a/usr/share/rear/build/GNU/Linux/60_verify_and_adjust_udev.sh +++ b/usr/share/rear/build/GNU/Linux/600_verify_and_adjust_udev.sh @@ -82,5 +82,5 @@ else fi >>$ROOTFS_DIR/etc/udev/rules.d/00-rear.rules # udev requires certain standard groups, add them to the rescue system -# the groups and users are in rescue/default/15_users_and_groups.sh +# the groups and users are in rescue/default/900_clone_users_and_groups.sh diff --git a/usr/share/rear/build/GNU/Linux/61_verify_and_adjust_udev_systemd.sh b/usr/share/rear/build/GNU/Linux/610_verify_and_adjust_udev_systemd.sh similarity index 100% rename from usr/share/rear/build/GNU/Linux/61_verify_and_adjust_udev_systemd.sh rename to usr/share/rear/build/GNU/Linux/610_verify_and_adjust_udev_systemd.sh diff --git a/usr/share/rear/build/GNU/Linux/62_verify_os_release_file.sh b/usr/share/rear/build/GNU/Linux/620_verify_os_release_file.sh similarity index 92% rename from usr/share/rear/build/GNU/Linux/62_verify_os_release_file.sh rename to usr/share/rear/build/GNU/Linux/620_verify_os_release_file.sh index b602a4adbc..69dcd03bca 100644 --- a/usr/share/rear/build/GNU/Linux/62_verify_os_release_file.sh +++ b/usr/share/rear/build/GNU/Linux/620_verify_os_release_file.sh @@ -1,4 +1,4 @@ -# 62_verify_os_release_file.sh +# 620_verify_os_release_file.sh # Because of issue 778 (where /etc/os-release is linked to /usr/lib/os-release) the copy of /etc/os-release fails # This is the case on Fedora 23 diff --git a/usr/share/rear/build/GNU/Linux/63_simplify_systemd_reboot_halt_poweroff_shutdown.sh b/usr/share/rear/build/GNU/Linux/630_simplify_systemd_reboot_halt_poweroff_shutdown.sh similarity index 88% rename from usr/share/rear/build/GNU/Linux/63_simplify_systemd_reboot_halt_poweroff_shutdown.sh rename to usr/share/rear/build/GNU/Linux/630_simplify_systemd_reboot_halt_poweroff_shutdown.sh index bab28d2a32..f37ba8753a 100644 --- a/usr/share/rear/build/GNU/Linux/63_simplify_systemd_reboot_halt_poweroff_shutdown.sh +++ b/usr/share/rear/build/GNU/Linux/630_simplify_systemd_reboot_halt_poweroff_shutdown.sh @@ -1,13 +1,13 @@ -# build/GNU/Linux/63_simplify_systemd_reboot_halt_poweroff_shutdown.sh +# build/GNU/Linux/630_simplify_systemd_reboot_halt_poweroff_shutdown.sh # simplifies how reboot halt poweroff and shutdown work in case of systemd # to make them more fail-safe, see https://github.com/rear/rear/issues/953 # Skip if systemd is not used. # Because the scripts below need the systemctl executable and because -# via prep/GNU/Linux/28_include_systemd.sh and build/GNU/Linux/10_copy_as_is.sh +# via prep/GNU/Linux/280_include_systemd.sh and build/GNU/Linux/100_copy_as_is.sh # systemctl gets only copied into the recovery system if systemd is used, -# we can test here (i.e. after build/GNU/Linux/10_copy_as_is.sh had already run) +# we can test here (i.e. after build/GNU/Linux/100_copy_as_is.sh had already run) # if /bin/systemctl exists in the recovery system: test -x $ROOTFS_DIR/bin/systemctl || return 0 @@ -33,7 +33,7 @@ cat <$filename #!/bin/bash # script to make $command working more simple and fail-safe # see https://github.com/rear/rear/issues/953 -# and 63_simplify_systemd_reboot_halt_poweroff_shutdown.sh +# and 630_simplify_systemd_reboot_halt_poweroff_shutdown.sh export LC_ALL=C LANG=C echo umounting all filesystems umount -vfar @@ -59,7 +59,7 @@ cat <<'EOF' >$filename #!/bin/bash # script to make shutdown working more simple and fail-safe # see https://github.com/rear/rear/issues/953 -# and 63_simplify_systemd_reboot_halt_poweroff_shutdown.sh +# and 630_simplify_systemd_reboot_halt_poweroff_shutdown.sh export LC_ALL=C LANG=C command=poweroff for arg in "$@" ; do diff --git a/usr/share/rear/build/NSR/default/55_add_nsr_libs_to_ldsoconf.sh b/usr/share/rear/build/NSR/default/550_add_nsr_libs_to_ldsoconf.sh similarity index 84% rename from usr/share/rear/build/NSR/default/55_add_nsr_libs_to_ldsoconf.sh rename to usr/share/rear/build/NSR/default/550_add_nsr_libs_to_ldsoconf.sh index 62e2e3e85a..cf2fcafdb0 100644 --- a/usr/share/rear/build/NSR/default/55_add_nsr_libs_to_ldsoconf.sh +++ b/usr/share/rear/build/NSR/default/550_add_nsr_libs_to_ldsoconf.sh @@ -1,4 +1,4 @@ -# 55_add_nsr_libs_to_ldsoconf.sh +# 550_add_nsr_libs_to_ldsoconf.sh if [[ -f $ROOTFS_DIR/etc/ld.so.conf ]]; then Log "Add NSR library paths to etc/ld.so.conf" cat >> $ROOTFS_DIR/etc/ld.so.conf <<-EOD diff --git a/usr/share/rear/build/SUSE_LINUX/61_link_systemd_lib.sh b/usr/share/rear/build/SUSE_LINUX/610_link_systemd_lib.sh similarity index 100% rename from usr/share/rear/build/SUSE_LINUX/61_link_systemd_lib.sh rename to usr/share/rear/build/SUSE_LINUX/610_link_systemd_lib.sh diff --git a/usr/share/rear/build/USB/default/80_enforce_usb_output.sh b/usr/share/rear/build/USB/default/800_enforce_usb_output.sh similarity index 100% rename from usr/share/rear/build/USB/default/80_enforce_usb_output.sh rename to usr/share/rear/build/USB/default/800_enforce_usb_output.sh diff --git a/usr/share/rear/build/default/50_patch_sshd_config.sh b/usr/share/rear/build/default/500_patch_sshd_config.sh similarity index 100% rename from usr/share/rear/build/default/50_patch_sshd_config.sh rename to usr/share/rear/build/default/500_patch_sshd_config.sh diff --git a/usr/share/rear/build/default/96_remove_encryption_keys.sh b/usr/share/rear/build/default/960_remove_encryption_keys.sh similarity index 100% rename from usr/share/rear/build/default/96_remove_encryption_keys.sh rename to usr/share/rear/build/default/960_remove_encryption_keys.sh diff --git a/usr/share/rear/build/default/97_add_rear_release.sh b/usr/share/rear/build/default/970_add_rear_release.sh similarity index 100% rename from usr/share/rear/build/default/97_add_rear_release.sh rename to usr/share/rear/build/default/970_add_rear_release.sh diff --git a/usr/share/rear/build/default/98_verify_rootfs.sh b/usr/share/rear/build/default/980_verify_rootfs.sh similarity index 100% rename from usr/share/rear/build/default/98_verify_rootfs.sh rename to usr/share/rear/build/default/980_verify_rootfs.sh diff --git a/usr/share/rear/build/default/99_update_os_conf.sh b/usr/share/rear/build/default/990_update_os_conf.sh similarity index 100% rename from usr/share/rear/build/default/99_update_os_conf.sh rename to usr/share/rear/build/default/990_update_os_conf.sh diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf index f29594f073..29ee1d0f1b 100644 --- a/usr/share/rear/conf/default.conf +++ b/usr/share/rear/conf/default.conf @@ -465,7 +465,7 @@ REQUIRED_PROGS_FDRUPSTREAM=( "$FDRUPSTREAM_INSTALL_PATH/uscmd1" ) ## # (Novastor NovaBACKUP DataCenter: http://www.novastor.com) # Agent installation will be detected automatically in: -# prep/NBKDC/default/40_prep_nbkdc.sh +# prep/NBKDC/default/400_prep_nbkdc.sh # ReaR will not perform the backup, this will be triggered by NBK DataCenter ## @@ -600,7 +600,7 @@ NSR_DEFAULT_POOL_NAME=Default ## # BACKUP=SESAM (SEP Sesam: http://www.sep.de) # path to sesam installation will be detected automatically in: -# prep/SESAM/default/40_prep_sesam.sh +# prep/SESAM/default/400_prep_sesam.sh ## COPY_AS_IS_SESAM=() COPY_AS_IS_EXCLUDE_SESAM=() @@ -777,7 +777,7 @@ DUPLY_PROFILE="" # BACKUP_DUPLICITY_EXCLUDE=( '/proc' '/sys' '/run' '/var/lib/ntp/proc' "$HOME/.cache" '/tmp' '/var/tmp' '/app' '/var/app' ) # # Mountpoints to restore -# if defined, used by restore/default/90_create_missing_directories.sh +# if defined, used by restore/default/900_create_missing_directories.sh # MOUNTPOINTS_TO_RESTORE="proc sys run tmp dev/pts dev/shm app app/rear var/app" # ####################################################################### @@ -1073,7 +1073,7 @@ USE_STATIC_NETWORKING= # The primary intent is to be able to specify special commands for special cases # as preparation so that the subsequent autogenerated network devices setup code # in the 60-network-devices.sh script can successfully set up network devices -# (for details see usr/share/rear/rescue/GNU/Linux/31_network_devices.sh). +# (for details see usr/share/rear/rescue/GNU/Linux/310_network_devices.sh). # But NETWORKING_PREPARATION_COMMANDS is not limited to its primary intent. # For example it can also be used to set up networking completely manually in the rescue/recovery system via something like # NETWORKING_PREPARATION_COMMANDS=( 'ip addr add 192.168.100.2/24 dev eth0' 'ip link set dev eth0 up' 'ip route add default via 192.168.100.1' 'return' ) diff --git a/usr/share/rear/finalize/Debian/i386/17_rebuild_initramfs.sh b/usr/share/rear/finalize/Debian/i386/170_rebuild_initramfs.sh similarity index 100% rename from usr/share/rear/finalize/Debian/i386/17_rebuild_initramfs.sh rename to usr/share/rear/finalize/Debian/i386/170_rebuild_initramfs.sh diff --git a/usr/share/rear/finalize/Fedora/i386/17_rebuild_initramfs.sh b/usr/share/rear/finalize/Fedora/i386/170_rebuild_initramfs.sh similarity index 100% rename from usr/share/rear/finalize/Fedora/i386/17_rebuild_initramfs.sh rename to usr/share/rear/finalize/Fedora/i386/170_rebuild_initramfs.sh diff --git a/usr/share/rear/finalize/GNU/Linux/15_migrate_disk_devices_layout.sh b/usr/share/rear/finalize/GNU/Linux/150_migrate_disk_devices_layout.sh similarity index 88% rename from usr/share/rear/finalize/GNU/Linux/15_migrate_disk_devices_layout.sh rename to usr/share/rear/finalize/GNU/Linux/150_migrate_disk_devices_layout.sh index ce84d767f7..a9c8481c96 100644 --- a/usr/share/rear/finalize/GNU/Linux/15_migrate_disk_devices_layout.sh +++ b/usr/share/rear/finalize/GNU/Linux/150_migrate_disk_devices_layout.sh @@ -4,9 +4,9 @@ if [[ ! -s "$MAPPING_FILE" ]] ; then return fi -### reuse the script in layout/prepare/default/32_apply_mappings.sh +### reuse the script in layout/prepare/default/320_apply_mappings.sh # FIXME: Why is there is no matching popd for this pushd? -# Cf. usr/share/rear/finalize/GNU/Linux/15_migrate_uuid_tags.sh where a popd is at the end. +# Cf. finalize/GNU/Linux/150_migrate_uuid_tags.sh where a popd is at the end. # If there is intentionally no popd here an explanation why there is no popd is missing. pushd $TARGET_FS_ROOT >&8 # the funny [] around the first letter make sure that shopt -s nullglob removes this file from the list if it does not exist @@ -38,6 +38,6 @@ for file in [b]oot/{grub.conf,menu.lst,device.map} [e]tc/grub.* [b]oot/grub/ tmp_layout=$LAYOUT_FILE LAYOUT_FILE="$file" - source $SHARE_DIR/layout/prepare/default/32_apply_mappings.sh + source $SHARE_DIR/layout/prepare/default/320_apply_mappings.sh LAYOUT_FILE=$tmp_layout done diff --git a/usr/share/rear/finalize/GNU/Linux/15_migrate_lun_wwid.sh b/usr/share/rear/finalize/GNU/Linux/150_migrate_lun_wwid.sh similarity index 100% rename from usr/share/rear/finalize/GNU/Linux/15_migrate_lun_wwid.sh rename to usr/share/rear/finalize/GNU/Linux/150_migrate_lun_wwid.sh diff --git a/usr/share/rear/finalize/GNU/Linux/15_migrate_uuid_tags.sh b/usr/share/rear/finalize/GNU/Linux/150_migrate_uuid_tags.sh similarity index 100% rename from usr/share/rear/finalize/GNU/Linux/15_migrate_uuid_tags.sh rename to usr/share/rear/finalize/GNU/Linux/150_migrate_uuid_tags.sh diff --git a/usr/share/rear/finalize/GNU/Linux/16_rename_diskbyid.sh b/usr/share/rear/finalize/GNU/Linux/160_rename_diskbyid.sh similarity index 95% rename from usr/share/rear/finalize/GNU/Linux/16_rename_diskbyid.sh rename to usr/share/rear/finalize/GNU/Linux/160_rename_diskbyid.sh index cf359e259b..50f57e3984 100644 --- a/usr/share/rear/finalize/GNU/Linux/16_rename_diskbyid.sh +++ b/usr/share/rear/finalize/GNU/Linux/160_rename_diskbyid.sh @@ -3,7 +3,7 @@ # We call sed once for each substituation # it would be better to build one sed script and use this later # (like verify/GNU/Linux/21_migrate_recovery_configuration.sh -# and finalize/GNU/Linux/15_migrate_disk_devices.sh) +# and finalize/GNU/Linux/150_migrate_disk_devices_layout.sh) # # OLD_ID_FILE contains entries like these (last 2 lines are multipath targets) # cciss-3600508b100104c3953573830524b0004 cciss/c0d0 @@ -30,7 +30,7 @@ UdevSymlinkName="" type -p udevinfo >/dev/null && UdevSymlinkName="udevinfo -r / -q symlink -n" type -p udevadm >/dev/null && UdevSymlinkName="udevadm info --root --query=symlink --name" [[ -z "$UdevSymlinkName" ]] && { - LogPrint "Could not find udevinfo nor udevadm (skip 16_remove_diskbyid.sh)" + LogPrint "Could not find udevinfo nor udevadm (skip 160_rename_diskbyid.sh)" return } diff --git a/usr/share/rear/finalize/GNU/Linux/30_create_mac_mapping.sh b/usr/share/rear/finalize/GNU/Linux/300_create_mac_mapping.sh similarity index 100% rename from usr/share/rear/finalize/GNU/Linux/30_create_mac_mapping.sh rename to usr/share/rear/finalize/GNU/Linux/300_create_mac_mapping.sh diff --git a/usr/share/rear/finalize/GNU/Linux/41_migrate_udev_rules.sh b/usr/share/rear/finalize/GNU/Linux/410_migrate_udev_rules.sh similarity index 100% rename from usr/share/rear/finalize/GNU/Linux/41_migrate_udev_rules.sh rename to usr/share/rear/finalize/GNU/Linux/410_migrate_udev_rules.sh diff --git a/usr/share/rear/finalize/GNU/Linux/42_migrate_network_configuration_files.sh b/usr/share/rear/finalize/GNU/Linux/420_migrate_network_configuration_files.sh similarity index 100% rename from usr/share/rear/finalize/GNU/Linux/42_migrate_network_configuration_files.sh rename to usr/share/rear/finalize/GNU/Linux/420_migrate_network_configuration_files.sh diff --git a/usr/share/rear/finalize/Linux-i386/21_install_grub.sh b/usr/share/rear/finalize/Linux-i386/210_install_grub.sh similarity index 93% rename from usr/share/rear/finalize/Linux-i386/21_install_grub.sh rename to usr/share/rear/finalize/Linux-i386/210_install_grub.sh index 8a16cf650d..e77d9215d3 100644 --- a/usr/share/rear/finalize/Linux-i386/21_install_grub.sh +++ b/usr/share/rear/finalize/Linux-i386/210_install_grub.sh @@ -12,23 +12,23 @@ # (eg. GRUB stage2 might not be at the exact same location). # Skip if another boot loader is already installed -# (then $NOBOOTLOADER is not a true value cf. finalize/default/01_prepare_checks.sh): +# (then $NOBOOTLOADER is not a true value cf. finalize/default/010_prepare_checks.sh): is_true $NOBOOTLOADER || return # For UEFI systems with grub legacy with should use efibootmgr instead: is_true $USING_UEFI_BOOTLOADER && return -# If the BOOTLOADER variable (read by finalize/default/01_prepare_checks.sh) +# If the BOOTLOADER variable (read by finalize/default/010_prepare_checks.sh) # is not "GRUB" (which means GRUB Legacy) skip this script (which is only for GRUB Legacy) -# because finalize/Linux-i386/22_install_grub2.sh is for installing GRUB 2 -# and finalize/Linux-i386/22_install_elilo.sh is for installing elilo: +# because finalize/Linux-i386/220_install_grub2.sh is for installing GRUB 2 +# and finalize/Linux-i386/220_install_elilo.sh is for installing elilo: test "GRUB" = "$BOOTLOADER" || return # If the BOOTLOADER variable is "GRUB" (which means GRUB Legacy) # do not unconditionally trust that because https://github.com/rear/rear/pull/589 # reads (excerpt): # Problems found: -# The 21_install_grub.sh checked for GRUB2 which is not part +# The 210_install_grub.sh checked for GRUB2 which is not part # of the first 2048 bytes of a disk - only GRUB was present - # thus the check for grub-probe/grub2-probe # and https://github.com/rear/rear/commit/079de45b3ad8edcf0e3df54ded53fe955abded3b @@ -42,7 +42,7 @@ test "GRUB" = "$BOOTLOADER" || return # grub-probe or grub2-probe is only installed in case of GRUB 2 # and when GRUB 2 is installed we assume GRUB 2 is used as boot loader # so that then we skip this script (which is only for GRUB Legacy) -# because finalize/Linux-i386/22_install_grub2.sh is for installing GRUB 2: +# because finalize/Linux-i386/220_install_grub2.sh is for installing GRUB 2: if type -p grub-probe >&2 || type -p grub2-probe >&2 ; then LogPrint "Skip installing GRUB Legacy boot loader because GRUB 2 is installed (grub-probe or grub2-probe exist)." return diff --git a/usr/share/rear/finalize/Linux-i386/22_install_elilo.sh b/usr/share/rear/finalize/Linux-i386/220_install_elilo.sh similarity index 100% rename from usr/share/rear/finalize/Linux-i386/22_install_elilo.sh rename to usr/share/rear/finalize/Linux-i386/220_install_elilo.sh diff --git a/usr/share/rear/finalize/Linux-i386/22_install_grub2.sh b/usr/share/rear/finalize/Linux-i386/220_install_grub2.sh similarity index 100% rename from usr/share/rear/finalize/Linux-i386/22_install_grub2.sh rename to usr/share/rear/finalize/Linux-i386/220_install_grub2.sh diff --git a/usr/share/rear/finalize/Linux-i386/23_run_efibootmgr.sh b/usr/share/rear/finalize/Linux-i386/230_run_efibootmgr.sh similarity index 100% rename from usr/share/rear/finalize/Linux-i386/23_run_efibootmgr.sh rename to usr/share/rear/finalize/Linux-i386/230_run_efibootmgr.sh diff --git a/usr/share/rear/finalize/Linux-ia64/20_install_elilo.sh b/usr/share/rear/finalize/Linux-ia64/200_install_elilo.sh similarity index 100% rename from usr/share/rear/finalize/Linux-ia64/20_install_elilo.sh rename to usr/share/rear/finalize/Linux-ia64/200_install_elilo.sh diff --git a/usr/share/rear/finalize/Linux-ppc64/20_install_yaboot.sh b/usr/share/rear/finalize/Linux-ppc64/200_install_yaboot.sh similarity index 100% rename from usr/share/rear/finalize/Linux-ppc64/20_install_yaboot.sh rename to usr/share/rear/finalize/Linux-ppc64/200_install_yaboot.sh diff --git a/usr/share/rear/finalize/Linux-ppc64/22_install_grub2.sh b/usr/share/rear/finalize/Linux-ppc64/220_install_grub2.sh similarity index 100% rename from usr/share/rear/finalize/Linux-ppc64/22_install_grub2.sh rename to usr/share/rear/finalize/Linux-ppc64/220_install_grub2.sh diff --git a/usr/share/rear/finalize/Linux-ppc64le/22_install_grub2.sh b/usr/share/rear/finalize/Linux-ppc64le/220_install_grub2.sh similarity index 100% rename from usr/share/rear/finalize/Linux-ppc64le/22_install_grub2.sh rename to usr/share/rear/finalize/Linux-ppc64le/220_install_grub2.sh diff --git a/usr/share/rear/finalize/NBU/default/99_copy_bplogrestorelog.sh b/usr/share/rear/finalize/NBU/default/990_copy_bplogrestorelog.sh similarity index 86% rename from usr/share/rear/finalize/NBU/default/99_copy_bplogrestorelog.sh rename to usr/share/rear/finalize/NBU/default/990_copy_bplogrestorelog.sh index 5dfef81861..b0364b3ab8 100644 --- a/usr/share/rear/finalize/NBU/default/99_copy_bplogrestorelog.sh +++ b/usr/share/rear/finalize/NBU/default/990_copy_bplogrestorelog.sh @@ -1,4 +1,4 @@ -# 99_copy_bprestorelog.sh +# 990_copy_bprestorelog.sh # copy the logfile to the recovered system, at least the part that has been written till now. mkdir -p $TARGET_FS_ROOT/root diff --git a/usr/share/rear/finalize/SUSE_LINUX/i386/17_rebuild_initramfs.sh b/usr/share/rear/finalize/SUSE_LINUX/i386/170_rebuild_initramfs.sh similarity index 100% rename from usr/share/rear/finalize/SUSE_LINUX/i386/17_rebuild_initramfs.sh rename to usr/share/rear/finalize/SUSE_LINUX/i386/170_rebuild_initramfs.sh diff --git a/usr/share/rear/finalize/SUSE_LINUX/ppc64/20_install_yaboot.sh b/usr/share/rear/finalize/SUSE_LINUX/ppc64/200_install_yaboot.sh similarity index 100% rename from usr/share/rear/finalize/SUSE_LINUX/ppc64/20_install_yaboot.sh rename to usr/share/rear/finalize/SUSE_LINUX/ppc64/200_install_yaboot.sh diff --git a/usr/share/rear/finalize/SUSE_LINUX/ppc64/50_rebuild_initramfs.sh b/usr/share/rear/finalize/SUSE_LINUX/ppc64/500_rebuild_initramfs.sh similarity index 100% rename from usr/share/rear/finalize/SUSE_LINUX/ppc64/50_rebuild_initramfs.sh rename to usr/share/rear/finalize/SUSE_LINUX/ppc64/500_rebuild_initramfs.sh diff --git a/usr/share/rear/finalize/default/01_prepare_checks.sh b/usr/share/rear/finalize/default/010_prepare_checks.sh similarity index 100% rename from usr/share/rear/finalize/default/01_prepare_checks.sh rename to usr/share/rear/finalize/default/010_prepare_checks.sh diff --git a/usr/share/rear/finalize/default/10_populate_dev.sh b/usr/share/rear/finalize/default/100_populate_dev.sh similarity index 100% rename from usr/share/rear/finalize/default/10_populate_dev.sh rename to usr/share/rear/finalize/default/100_populate_dev.sh diff --git a/usr/share/rear/finalize/default/88_check_for_mount_by_id.sh b/usr/share/rear/finalize/default/880_check_for_mount_by_id.sh similarity index 100% rename from usr/share/rear/finalize/default/88_check_for_mount_by_id.sh rename to usr/share/rear/finalize/default/880_check_for_mount_by_id.sh diff --git a/usr/share/rear/finalize/default/89_finish_checks.sh b/usr/share/rear/finalize/default/890_finish_checks.sh similarity index 92% rename from usr/share/rear/finalize/default/89_finish_checks.sh rename to usr/share/rear/finalize/default/890_finish_checks.sh index 4b18f950da..dd773befbc 100644 --- a/usr/share/rear/finalize/default/89_finish_checks.sh +++ b/usr/share/rear/finalize/default/890_finish_checks.sh @@ -13,8 +13,8 @@ that we have failed to install the boot loader correctly. Please contribute this code to the $PRODUCT project. To do so please take a look at the scripts in $SHARE_DIR/finalize, for an example you can use the script for Fedora (and RHEL/CentOS/SL) in -$SHARE_DIR/finalize/Linux-i386/21_install_grub.sh or -$SHARE_DIR/finalize/Linux-i386/22_install_grub2.sh +$SHARE_DIR/finalize/Linux-i386/210_install_grub.sh or +$SHARE_DIR/finalize/Linux-i386/220_install_grub2.sh -------------------- ATTENTION ATTENTION ATTENTION ------------------- | | diff --git a/usr/share/rear/finalize/default/90_remount_sync.sh b/usr/share/rear/finalize/default/900_remount_sync.sh similarity index 100% rename from usr/share/rear/finalize/default/90_remount_sync.sh rename to usr/share/rear/finalize/default/900_remount_sync.sh diff --git a/usr/share/rear/format/OBDR/BACULA/default/030_bextract_tape_device.sh b/usr/share/rear/format/OBDR/BACULA/default/030_bextract_tape_device.sh new file mode 120000 index 0000000000..83d5905120 --- /dev/null +++ b/usr/share/rear/format/OBDR/BACULA/default/030_bextract_tape_device.sh @@ -0,0 +1 @@ +../../../../prep/OBDR/BACULA/default/030_bextract_tape_device.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/BACULA/default/03_bextract_tape_device.sh b/usr/share/rear/format/OBDR/BACULA/default/03_bextract_tape_device.sh deleted file mode 120000 index 5d0df78ae9..0000000000 --- a/usr/share/rear/format/OBDR/BACULA/default/03_bextract_tape_device.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../prep/OBDR/BACULA/default/03_bextract_tape_device.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/020_translate_url.sh b/usr/share/rear/format/OBDR/default/020_translate_url.sh new file mode 120000 index 0000000000..6a25c1f48e --- /dev/null +++ b/usr/share/rear/format/OBDR/default/020_translate_url.sh @@ -0,0 +1 @@ +../../../prep/default/020_translate_url.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/02_translate_url.sh b/usr/share/rear/format/OBDR/default/02_translate_url.sh deleted file mode 120000 index c38239b53e..0000000000 --- a/usr/share/rear/format/OBDR/default/02_translate_url.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/default/02_translate_url.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/040_translate_tape.sh b/usr/share/rear/format/OBDR/default/040_translate_tape.sh new file mode 120000 index 0000000000..e46b52b1ef --- /dev/null +++ b/usr/share/rear/format/OBDR/default/040_translate_tape.sh @@ -0,0 +1 @@ +../../../prep/default/030_translate_tape.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/04_translate_tape.sh b/usr/share/rear/format/OBDR/default/04_translate_tape.sh deleted file mode 120000 index d9c31b54a1..0000000000 --- a/usr/share/rear/format/OBDR/default/04_translate_tape.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/default/03_translate_tape.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/050_change_tape_name.sh b/usr/share/rear/format/OBDR/default/050_change_tape_name.sh new file mode 120000 index 0000000000..8f403bdeb2 --- /dev/null +++ b/usr/share/rear/format/OBDR/default/050_change_tape_name.sh @@ -0,0 +1 @@ +../../../prep/OBDR/default/040_change_tape_name.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/05_change_tape_name.sh b/usr/share/rear/format/OBDR/default/05_change_tape_name.sh deleted file mode 120000 index 19c9ba6f49..0000000000 --- a/usr/share/rear/format/OBDR/default/05_change_tape_name.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/OBDR/default/04_change_tape_name.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/700_write_OBDR_header.sh b/usr/share/rear/format/OBDR/default/700_write_OBDR_header.sh new file mode 120000 index 0000000000..fcd78ad8d4 --- /dev/null +++ b/usr/share/rear/format/OBDR/default/700_write_OBDR_header.sh @@ -0,0 +1 @@ +../../../prep/OBDR/default/700_write_OBDR_header.sh \ No newline at end of file diff --git a/usr/share/rear/format/OBDR/default/70_write_OBDR_header.sh b/usr/share/rear/format/OBDR/default/70_write_OBDR_header.sh deleted file mode 120000 index 218453e1f4..0000000000 --- a/usr/share/rear/format/OBDR/default/70_write_OBDR_header.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/OBDR/default/70_write_OBDR_header.sh \ No newline at end of file diff --git a/usr/share/rear/format/USB/default/20_check_usb_layout.sh b/usr/share/rear/format/USB/default/200_check_usb_layout.sh similarity index 100% rename from usr/share/rear/format/USB/default/20_check_usb_layout.sh rename to usr/share/rear/format/USB/default/200_check_usb_layout.sh diff --git a/usr/share/rear/format/USB/default/30_format_usb_disk.sh b/usr/share/rear/format/USB/default/300_format_usb_disk.sh similarity index 96% rename from usr/share/rear/format/USB/default/30_format_usb_disk.sh rename to usr/share/rear/format/USB/default/300_format_usb_disk.sh index 3fbf7e9b49..50abf68f37 100644 --- a/usr/share/rear/format/USB/default/30_format_usb_disk.sh +++ b/usr/share/rear/format/USB/default/300_format_usb_disk.sh @@ -1,4 +1,4 @@ -# $answer is filled by 20_check_usb_layout.sh +# $answer is filled by 200_check_usb_layout.sh if [[ "$answer" == "Yes" || "$FORCE" ]]; then umount $REAL_USB_DEVICE >&8 2>&1 @@ -9,12 +9,12 @@ if [[ "$answer" == "Yes" || "$FORCE" ]]; then if [[ "$EFI" == "y" ]]; then LogPrint "The --efi toggle was used with format - make an EFI bootable USB disk" - + # Prompt user for size of EFI partition on USB disk # Pressing Enter (\n) will use default value from default.conf echo -n "Please enter size of EFI partition on USB device in MB [default ${USB_UEFI_PART_SIZE} MB]: " read efi_part_size - + # Check if user entered unsigned integer larger than 0 if [[ "${efi_part_size}" =~ ^[0-9]+$ && ${efi_part_size} > 0 ]]; then USB_UEFI_PART_SIZE=${efi_part_size} @@ -26,9 +26,9 @@ if [[ "$answer" == "Yes" || "$FORCE" ]]; then else Error "Bad input for EFI partition size." fi - + echo "Yes" | parted -s $RAW_USB_DEVICE -- mklabel gpt mkpart primary 0 ${USB_UEFI_PART_SIZE}Mib mkpart primary ${USB_UEFI_PART_SIZE}Mib 100% >&2 - + StopIfError "Could not create primary partitions on '$REAL_USB_DEVICE'" # partition 1 is the ESP (vfat partition) on which EFI/BOOT/BOOTX86.EFI resides ParNr=2 @@ -37,10 +37,10 @@ if [[ "$answer" == "Yes" || "$FORCE" ]]; then StopIfError "Could not create a primary partition on '$REAL_USB_DEVICE'" ParNr=1 fi - + echo "Yes" | parted -s $RAW_USB_DEVICE set 1 boot on >&2 StopIfError "Could not make primary partition boot-able on '$REAL_USB_DEVICE'" - + partprobe $RAW_USB_DEVICE # Wait until udev has had the time to kick in @@ -49,7 +49,7 @@ if [[ "$answer" == "Yes" || "$FORCE" ]]; then if [[ "$EFI" == "y" ]]; then LogPrint "Creating new vfat filesystem on ${RAW_USB_DEVICE}1" mkfs.vfat $v -F 16 -n REAR-EFI ${RAW_USB_DEVICE}1 >&2 - + # create link for EFI partition in /dev/disk/by-label partprobe $RAW_USB_DEVICE sleep 5 diff --git a/usr/share/rear/format/USB/default/35_label_usb_disk.sh b/usr/share/rear/format/USB/default/350_label_usb_disk.sh similarity index 100% rename from usr/share/rear/format/USB/default/35_label_usb_disk.sh rename to usr/share/rear/format/USB/default/350_label_usb_disk.sh diff --git a/usr/share/rear/init/default/01_set_drlm_env.sh b/usr/share/rear/init/default/010_set_drlm_env.sh similarity index 100% rename from usr/share/rear/init/default/01_set_drlm_env.sh rename to usr/share/rear/init/default/010_set_drlm_env.sh diff --git a/usr/share/rear/init/default/03_update_recovery_system.sh b/usr/share/rear/init/default/030_update_recovery_system.sh similarity index 100% rename from usr/share/rear/init/default/03_update_recovery_system.sh rename to usr/share/rear/init/default/030_update_recovery_system.sh diff --git a/usr/share/rear/init/default/05_check_rear-recover_mode.sh b/usr/share/rear/init/default/050_check_rear-recover_mode.sh similarity index 100% rename from usr/share/rear/init/default/05_check_rear-recover_mode.sh rename to usr/share/rear/init/default/050_check_rear-recover_mode.sh diff --git a/usr/share/rear/layout/compare/default/50_compare_layout.sh b/usr/share/rear/layout/compare/default/500_compare_layout.sh similarity index 100% rename from usr/share/rear/layout/compare/default/50_compare_layout.sh rename to usr/share/rear/layout/compare/default/500_compare_layout.sh diff --git a/usr/share/rear/layout/compare/default/51_compare_files.sh b/usr/share/rear/layout/compare/default/510_compare_files.sh similarity index 100% rename from usr/share/rear/layout/compare/default/51_compare_files.sh rename to usr/share/rear/layout/compare/default/510_compare_files.sh diff --git a/usr/share/rear/layout/precompare/default/11_check_layout_file.sh b/usr/share/rear/layout/precompare/default/110_check_layout_file.sh similarity index 100% rename from usr/share/rear/layout/precompare/default/11_check_layout_file.sh rename to usr/share/rear/layout/precompare/default/110_check_layout_file.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/10_include_partition_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/100_include_partition_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/10_include_partition_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/100_include_partition_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/11_include_lvm_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/11_include_lvm_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/12_include_raid_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/120_include_raid_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/12_include_raid_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/120_include_raid_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/13_include_filesystem_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/130_include_filesystem_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/13_include_filesystem_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/130_include_filesystem_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/13_include_mount_filesystem_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/130_include_mount_filesystem_code.sh similarity index 95% rename from usr/share/rear/layout/prepare/GNU/Linux/13_include_mount_filesystem_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/130_include_mount_filesystem_code.sh index f71eee9496..2d96ee27e7 100644 --- a/usr/share/rear/layout/prepare/GNU/Linux/13_include_mount_filesystem_code.sh +++ b/usr/share/rear/layout/prepare/GNU/Linux/130_include_mount_filesystem_code.sh @@ -1,5 +1,5 @@ # code to mount a file system -# 13_mount_filesystem_code.sh contains the generic function 'mount_fs' +# 130_mount_filesystem_code.sh contains the generic function 'mount_fs' # each distro may overrule the 'mount_fs' function with its proper way to do it # especially the case for btrfs related file systems @@ -34,7 +34,7 @@ mount_fs() { # from the old system cannot work here for recovery because btrfs subvolumes # are not yet created (and when created their subvolid is likely different) # so that those mount options are removed here. All btrfs subvolume handling - # happens in the btrfs_subvolumes_setup function in 13_include_mount_subvolumes_code.sh + # happens in the btrfs_subvolumes_setup function in 130_include_mount_subvolumes_code.sh # First add a comma at the end so that it is easier to remove a mount option at the end: value=${value/%/,} # Remove all subvolid= and subvol= mount options (the extglob shell option is enabled in rear): @@ -56,7 +56,7 @@ mount_fs() { (btrfs) # The following commands are basically the same as in the default/fallback case. # The explicite case for btrfs is only there to be prepared for special adaptions for btrfs related file systems. - # Because the btrfs filesystem was created anew just before by the create_fs function in 13_include_filesystem_code.sh + # Because the btrfs filesystem was created anew just before by the create_fs function in 130_include_filesystem_code.sh # the code here mounts the whole btrfs filesystem because by default when creating a btrfs filesystem # its top-level/root subvolume is the btrfs default subvolume which gets mounted when no other subvolume is specified. # For a plain btrfs filesystem without subvolumes it is effectively the same as for other filesystems (like ext2/3/4). @@ -69,7 +69,7 @@ mount_fs() { # that different subvolume needs to be first created, then set to be the default subvolume, and # finally that btrfs filesystem needs to be unmounted and mounted again so that in the end # that special different default subvolume is mounted at the mountpoint $TARGET_FS_ROOT$mountpoint. - # All btrfs subvolume handling happens in the btrfs_subvolumes_setup function in 13_include_mount_subvolumes_code.sh + # All btrfs subvolume handling happens in the btrfs_subvolumes_setup function in 130_include_mount_subvolumes_code.sh # For a plain btrfs filesystem without subvolumes the btrfs_subvolumes_setup function does nothing. # Call the btrfs_subvolumes_setup function for the btrfs filesystem that was mounted above: btrfs_subvolumes_setup $device $mountpoint $mountopts diff --git a/usr/share/rear/layout/prepare/GNU/Linux/13_include_mount_subvolumes_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/130_include_mount_subvolumes_code.sh similarity index 98% rename from usr/share/rear/layout/prepare/GNU/Linux/13_include_mount_subvolumes_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/130_include_mount_subvolumes_code.sh index 7dc764217f..81fb969282 100644 --- a/usr/share/rear/layout/prepare/GNU/Linux/13_include_mount_subvolumes_code.sh +++ b/usr/share/rear/layout/prepare/GNU/Linux/130_include_mount_subvolumes_code.sh @@ -1,8 +1,8 @@ # Code for btrfs subvolume handling. -# 13_include_mount_subvolumes_code.sh contains the function btrfs_subvolumes_setup for all btrfs subvolume handling. +# 130_include_mount_subvolumes_code.sh contains the function btrfs_subvolumes_setup for all btrfs subvolume handling. # Btrfs filesystems with subvolumes need a special handling. -# All btrfs subvolume handling happens in the btrfs_subvolumes_setup function in 13_include_mount_subvolumes_code.sh +# All btrfs subvolume handling happens in the btrfs_subvolumes_setup function in 130_include_mount_subvolumes_code.sh # For a plain btrfs filesystem without subvolumes the btrfs_subvolumes_setup function does nothing. btrfs_subvolumes_setup() { @@ -14,13 +14,13 @@ btrfs_subvolumes_setup() { local snapshot_subvolumes_devices_and_paths snapshot_subvolume_device_and_path snapshot_subvolume_device snapshot_subvolume_path local default_subvolume_path # Assign function arguments to meaningful variable names: - # This function is called in 13_include_mount_filesystem_code.sh as follows: + # This function is called in 130_include_mount_filesystem_code.sh as follows: # btrfs_subvolumes_setup $device $mountpoint $mountopts - # where $device is the device node where the filesystem was already created by 13_include_filesystem_code.sh + # where $device is the device node where the filesystem was already created by 130_include_filesystem_code.sh # (usually a harddisk partition like e.g. /dev/sda1): device=$1 mountpoint=$2 - # mountopts are of the form "-o foo,bar,baz" (see 13_include_mount_filesystem_code.sh) + # mountopts are of the form "-o foo,bar,baz" (see 130_include_mount_filesystem_code.sh) # which means $3 is '-o' and 'foo,bar,baz' is $4: mountopts="$3 $4" # Empty device or mountpoint may indicate an error. In this case be verbose and inform the user: @@ -61,7 +61,7 @@ btrfs_subvolumes_setup() { ########################################### # Btrfs snapshot subvolumes handling: # Remember all btrfs snapshot subvolumes to exclude them when mounting all btrfs normal subvolumes below. - # The btrfs snapshot subvolumes entries that are created by 23_filesystem_layout.sh + # The btrfs snapshot subvolumes entries that are created by 230_filesystem_layout.sh # are deactivated (as '#btrfssnapshotsubvol ...') in the LAYOUT_FILE (disklayout.conf). # When there are active btrfs snapshot subvolumes entries, the user has manually # activated them (as 'btrfssnapshotsubvol ...') in the LAYOUT_FILE (disklayout.conf). @@ -115,7 +115,7 @@ btrfs_subvolumes_setup() { # Any normal btrfs subvolume under snapper's base subvolume is wrong # (see https://github.com/rear/rear/issues/944#issuecomment-238239926 # and https://github.com/rear/rear/issues/963 - # and layout/save/GNU/Linux/23_filesystem_layout.sh). + # and layout/save/GNU/Linux/230_filesystem_layout.sh). # Because any btrfs subvolume under '@/.snapshots/' lets "snapper/installation-helper --step 1" fail # any btrfs subvolume under '@/.snapshots/' is excluded here from being recreated # to not let "rear recover" fail because of such kind of wrong btrfs subvolumes diff --git a/usr/share/rear/layout/prepare/GNU/Linux/14_include_swap_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/140_include_swap_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/14_include_swap_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/140_include_swap_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/15_include_drbd_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/150_include_drbd_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/15_include_drbd_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/150_include_drbd_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/16_include_luks_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/160_include_luks_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/16_include_luks_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/160_include_luks_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/17_include_hpraid_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/170_include_hpraid_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/17_include_hpraid_code.sh rename to usr/share/rear/layout/prepare/GNU/Linux/170_include_hpraid_code.sh diff --git a/usr/share/rear/layout/prepare/GNU/Linux/21_load_multipath.sh b/usr/share/rear/layout/prepare/GNU/Linux/210_load_multipath.sh similarity index 100% rename from usr/share/rear/layout/prepare/GNU/Linux/21_load_multipath.sh rename to usr/share/rear/layout/prepare/GNU/Linux/210_load_multipath.sh diff --git a/usr/share/rear/layout/prepare/default/01_prepare_files.sh b/usr/share/rear/layout/prepare/default/010_prepare_files.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/01_prepare_files.sh rename to usr/share/rear/layout/prepare/default/010_prepare_files.sh diff --git a/usr/share/rear/layout/prepare/default/20_recreate_hpraid.sh b/usr/share/rear/layout/prepare/default/200_recreate_hpraid.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/20_recreate_hpraid.sh rename to usr/share/rear/layout/prepare/default/200_recreate_hpraid.sh diff --git a/usr/share/rear/layout/prepare/default/25_compare_disks.sh b/usr/share/rear/layout/prepare/default/250_compare_disks.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/25_compare_disks.sh rename to usr/share/rear/layout/prepare/default/250_compare_disks.sh diff --git a/usr/share/rear/layout/prepare/default/30_map_disks.sh b/usr/share/rear/layout/prepare/default/300_map_disks.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/30_map_disks.sh rename to usr/share/rear/layout/prepare/default/300_map_disks.sh diff --git a/usr/share/rear/layout/prepare/default/310_remove_exclusions.sh b/usr/share/rear/layout/prepare/default/310_remove_exclusions.sh new file mode 120000 index 0000000000..3f30cba852 --- /dev/null +++ b/usr/share/rear/layout/prepare/default/310_remove_exclusions.sh @@ -0,0 +1 @@ +../../save/default/330_remove_exclusions.sh \ No newline at end of file diff --git a/usr/share/rear/layout/prepare/default/31_remove_exclusions.sh b/usr/share/rear/layout/prepare/default/31_remove_exclusions.sh deleted file mode 120000 index 9186965970..0000000000 --- a/usr/share/rear/layout/prepare/default/31_remove_exclusions.sh +++ /dev/null @@ -1 +0,0 @@ -../../save/default/33_remove_exclusions.sh \ No newline at end of file diff --git a/usr/share/rear/layout/prepare/default/32_apply_mappings.sh b/usr/share/rear/layout/prepare/default/320_apply_mappings.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/32_apply_mappings.sh rename to usr/share/rear/layout/prepare/default/320_apply_mappings.sh diff --git a/usr/share/rear/layout/prepare/default/40_autoresize_disks.sh b/usr/share/rear/layout/prepare/default/400_autoresize_disks.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/40_autoresize_disks.sh rename to usr/share/rear/layout/prepare/default/400_autoresize_disks.sh diff --git a/usr/share/rear/layout/prepare/default/50_confirm_layout.sh b/usr/share/rear/layout/prepare/default/500_confirm_layout.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/50_confirm_layout.sh rename to usr/share/rear/layout/prepare/default/500_confirm_layout.sh diff --git a/usr/share/rear/layout/prepare/default/51_list_dependencies.sh b/usr/share/rear/layout/prepare/default/510_list_dependencies.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/51_list_dependencies.sh rename to usr/share/rear/layout/prepare/default/510_list_dependencies.sh diff --git a/usr/share/rear/layout/prepare/default/52_exclude_components.sh b/usr/share/rear/layout/prepare/default/520_exclude_components.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/52_exclude_components.sh rename to usr/share/rear/layout/prepare/default/520_exclude_components.sh diff --git a/usr/share/rear/layout/prepare/default/54_generate_device_code.sh b/usr/share/rear/layout/prepare/default/540_generate_device_code.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/54_generate_device_code.sh rename to usr/share/rear/layout/prepare/default/540_generate_device_code.sh diff --git a/usr/share/rear/layout/prepare/default/55_finalize_script.sh b/usr/share/rear/layout/prepare/default/550_finalize_script.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/55_finalize_script.sh rename to usr/share/rear/layout/prepare/default/550_finalize_script.sh diff --git a/usr/share/rear/layout/prepare/default/60_show_unprocessed.sh b/usr/share/rear/layout/prepare/default/600_show_unprocessed.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/60_show_unprocessed.sh rename to usr/share/rear/layout/prepare/default/600_show_unprocessed.sh diff --git a/usr/share/rear/layout/prepare/default/61_exclude_from_restore.sh b/usr/share/rear/layout/prepare/default/610_exclude_from_restore.sh similarity index 100% rename from usr/share/rear/layout/prepare/default/61_exclude_from_restore.sh rename to usr/share/rear/layout/prepare/default/610_exclude_from_restore.sh diff --git a/usr/share/rear/layout/recreate/default/10_ask_confirmation.sh b/usr/share/rear/layout/recreate/default/100_ask_confirmation.sh similarity index 100% rename from usr/share/rear/layout/recreate/default/10_ask_confirmation.sh rename to usr/share/rear/layout/recreate/default/100_ask_confirmation.sh diff --git a/usr/share/rear/layout/recreate/default/20_run_script.sh b/usr/share/rear/layout/recreate/default/200_run_script.sh similarity index 100% rename from usr/share/rear/layout/recreate/default/20_run_script.sh rename to usr/share/rear/layout/recreate/default/200_run_script.sh diff --git a/usr/share/rear/layout/recreate/default/25_verify_mount.sh b/usr/share/rear/layout/recreate/default/250_verify_mount.sh similarity index 100% rename from usr/share/rear/layout/recreate/default/25_verify_mount.sh rename to usr/share/rear/layout/recreate/default/250_verify_mount.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/10_create_layout_file.sh b/usr/share/rear/layout/save/GNU/Linux/100_create_layout_file.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/10_create_layout_file.sh rename to usr/share/rear/layout/save/GNU/Linux/100_create_layout_file.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/15_save_diskbyid_mappings.sh b/usr/share/rear/layout/save/GNU/Linux/150_save_diskbyid_mappings.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/15_save_diskbyid_mappings.sh rename to usr/share/rear/layout/save/GNU/Linux/150_save_diskbyid_mappings.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/20_partition_layout.sh b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/20_partition_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/21_raid_layout.sh b/usr/share/rear/layout/save/GNU/Linux/210_raid_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/21_raid_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/210_raid_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/22_lvm_layout.sh b/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/22_lvm_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/23_filesystem_layout.sh b/usr/share/rear/layout/save/GNU/Linux/230_filesystem_layout.sh similarity index 99% rename from usr/share/rear/layout/save/GNU/Linux/23_filesystem_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/230_filesystem_layout.sh index cce4f64c3f..54b569e726 100644 --- a/usr/share/rear/layout/save/GNU/Linux/23_filesystem_layout.sh +++ b/usr/share/rear/layout/save/GNU/Linux/230_filesystem_layout.sh @@ -1,11 +1,11 @@ # Save Filesystem layout Log "Begin saving filesystem layout" -# If available wipefs is used in the recovery system by 13_include_filesystem_code.sh +# If available wipefs is used in the recovery system by 130_include_filesystem_code.sh # as a generic way to cleanup disk partitions before creating a filesystem on a disk partition, # see https://github.com/rear/rear/issues/540 # and https://github.com/rear/rear/issues/649#issuecomment-148725865 # Therefore if wipefs exists here in the original system it is added to REQUIRED_PROGS -# so that it will become also available in the recovery system (cf. 26_crypt_layout.sh): +# so that it will become also available in the recovery system (cf. 260_crypt_layout.sh): has_binary wipefs && REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}" wipefs ) || true # Comma separated list of filesystems that is used for "mount/findmnt -t " below: supported_filesystems="ext2,ext3,ext4,vfat,xfs,reiserfs,btrfs" @@ -240,7 +240,7 @@ read_filesystems_command="$read_filesystems_command | sort -t ' ' -k 1,1 -u" # SLES 12 SP1 and SP2 normal subvolumes that belong to snapper are excluded from being recreated: # Snapper's base subvolume '/@/.snapshots' is excluded because during "rear recover" # that one will be created by "snapper/installation-helper --step 1" which fails if it already exists - # (see the code in layout/prepare/GNU/Linux/13_include_mount_subvolumes_code.sh). + # (see the code in layout/prepare/GNU/Linux/130_include_mount_subvolumes_code.sh). # Furthermore any normal btrfs subvolume under snapper's base subvolume '/@/.snapshots' is wrong # (see https://github.com/rear/rear/issues/944#issuecomment-238239926 # and https://github.com/rear/rear/issues/963). diff --git a/usr/share/rear/layout/save/GNU/Linux/24_swaps_layout.sh b/usr/share/rear/layout/save/GNU/Linux/240_swaps_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/24_swaps_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/240_swaps_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/25_drbd_layout.sh b/usr/share/rear/layout/save/GNU/Linux/250_drbd_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/25_drbd_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/250_drbd_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/26_crypt_layout.sh b/usr/share/rear/layout/save/GNU/Linux/260_crypt_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/26_crypt_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/260_crypt_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/27_hpraid_layout.sh b/usr/share/rear/layout/save/GNU/Linux/270_hpraid_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/27_hpraid_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/270_hpraid_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/28_multipath_layout.sh b/usr/share/rear/layout/save/GNU/Linux/280_multipath_layout.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/28_multipath_layout.sh rename to usr/share/rear/layout/save/GNU/Linux/280_multipath_layout.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/34_false_blacklisted.sh b/usr/share/rear/layout/save/GNU/Linux/340_false_blacklisted.sh similarity index 78% rename from usr/share/rear/layout/save/GNU/Linux/34_false_blacklisted.sh rename to usr/share/rear/layout/save/GNU/Linux/340_false_blacklisted.sh index 4d7840261f..b6390d3cb0 100644 --- a/usr/share/rear/layout/save/GNU/Linux/34_false_blacklisted.sh +++ b/usr/share/rear/layout/save/GNU/Linux/340_false_blacklisted.sh @@ -1,7 +1,8 @@ -# this script must run after 32_autoexclude.sh; therefore the nr 34_false_blacklisted.sh -# be careful, script 34_generate_mountpoint_device.sh generates the mountpoint devices -# which is used to generate the backup-include.txt file. Therefore, this script must be -# run before 34_generate_mountpoint_device.sh +# this script must run after layout/save/default/320_autoexclude.sh +# therefore the number 340 in layout/save/GNU/Linux/340_false_blacklisted.sh +# be careful, layout/save/default/340_generate_mountpoint_device.sh generates +# the mountpoint devices which is used to generate the backup-include.txt file. +# Therefore, this script must be run before 340_generate_mountpoint_device.sh # check if we have the multipath executable if ! has_binary multipath ; then diff --git a/usr/share/rear/layout/save/GNU/Linux/35_copy_drbdtab.sh b/usr/share/rear/layout/save/GNU/Linux/350_copy_drbdtab.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/35_copy_drbdtab.sh rename to usr/share/rear/layout/save/GNU/Linux/350_copy_drbdtab.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/50_extract_vgcfg.sh b/usr/share/rear/layout/save/GNU/Linux/500_extract_vgcfg.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/50_extract_vgcfg.sh rename to usr/share/rear/layout/save/GNU/Linux/500_extract_vgcfg.sh diff --git a/usr/share/rear/layout/save/GNU/Linux/51_current_disk_usage.sh b/usr/share/rear/layout/save/GNU/Linux/510_current_disk_usage.sh similarity index 100% rename from usr/share/rear/layout/save/GNU/Linux/51_current_disk_usage.sh rename to usr/share/rear/layout/save/GNU/Linux/510_current_disk_usage.sh diff --git a/usr/share/rear/layout/save/NSR/default/65_check_iso_recoverable.sh b/usr/share/rear/layout/save/NSR/default/650_check_iso_recoverable.sh similarity index 100% rename from usr/share/rear/layout/save/NSR/default/65_check_iso_recoverable.sh rename to usr/share/rear/layout/save/NSR/default/650_check_iso_recoverable.sh diff --git a/usr/share/rear/layout/save/default/300_list_dependencies.sh b/usr/share/rear/layout/save/default/300_list_dependencies.sh new file mode 120000 index 0000000000..514cde7134 --- /dev/null +++ b/usr/share/rear/layout/save/default/300_list_dependencies.sh @@ -0,0 +1 @@ +../../prepare/default/510_list_dependencies.sh \ No newline at end of file diff --git a/usr/share/rear/layout/save/default/30_list_dependencies.sh b/usr/share/rear/layout/save/default/30_list_dependencies.sh deleted file mode 120000 index c3f97005bd..0000000000 --- a/usr/share/rear/layout/save/default/30_list_dependencies.sh +++ /dev/null @@ -1 +0,0 @@ -../../prepare/default/51_list_dependencies.sh \ No newline at end of file diff --git a/usr/share/rear/layout/save/default/31_autoexclude_usb.sh b/usr/share/rear/layout/save/default/310_autoexclude_usb.sh similarity index 98% rename from usr/share/rear/layout/save/default/31_autoexclude_usb.sh rename to usr/share/rear/layout/save/default/310_autoexclude_usb.sh index 75b4080588..35a00b4f46 100644 --- a/usr/share/rear/layout/save/default/31_autoexclude_usb.sh +++ b/usr/share/rear/layout/save/default/310_autoexclude_usb.sh @@ -1,4 +1,4 @@ -# 31_autoexclude_usb.sh +# 310_autoexclude_usb.sh # Reason: issue #645 # /dev/sdb1 240234164 2996672 225027564 2% /mnt # is not detected as an USB path which causing rsync to loop until usb output_url is full diff --git a/usr/share/rear/layout/save/default/31_include_exclude.sh b/usr/share/rear/layout/save/default/310_include_exclude.sh similarity index 100% rename from usr/share/rear/layout/save/default/31_include_exclude.sh rename to usr/share/rear/layout/save/default/310_include_exclude.sh diff --git a/usr/share/rear/layout/save/default/32_autoexclude.sh b/usr/share/rear/layout/save/default/320_autoexclude.sh similarity index 100% rename from usr/share/rear/layout/save/default/32_autoexclude.sh rename to usr/share/rear/layout/save/default/320_autoexclude.sh diff --git a/usr/share/rear/layout/save/default/33_remove_exclusions.sh b/usr/share/rear/layout/save/default/330_remove_exclusions.sh similarity index 100% rename from usr/share/rear/layout/save/default/33_remove_exclusions.sh rename to usr/share/rear/layout/save/default/330_remove_exclusions.sh diff --git a/usr/share/rear/layout/save/default/34_generate_mountpoint_device.sh b/usr/share/rear/layout/save/default/340_generate_mountpoint_device.sh similarity index 100% rename from usr/share/rear/layout/save/default/34_generate_mountpoint_device.sh rename to usr/share/rear/layout/save/default/340_generate_mountpoint_device.sh diff --git a/usr/share/rear/layout/save/default/40_check_backup_special_files.sh b/usr/share/rear/layout/save/default/400_check_backup_special_files.sh similarity index 88% rename from usr/share/rear/layout/save/default/40_check_backup_special_files.sh rename to usr/share/rear/layout/save/default/400_check_backup_special_files.sh index 1b84c0d672..acf44b99b8 100644 --- a/usr/share/rear/layout/save/default/40_check_backup_special_files.sh +++ b/usr/share/rear/layout/save/default/400_check_backup_special_files.sh @@ -1,4 +1,4 @@ -# 40_check_backup_special_files.sh +# 400_check_backup_special_files.sh # tell "rear checklayout" to watch over special backup related files case $BACKUP in TSM ) CHECK_CONFIG_FILES=( ${CHECK_CONFIG_FILES[@]} /etc/adsm/TSM.PWD ) ;; diff --git a/usr/share/rear/layout/save/default/45_check_bootloader_files.sh b/usr/share/rear/layout/save/default/450_check_bootloader_files.sh similarity index 91% rename from usr/share/rear/layout/save/default/45_check_bootloader_files.sh rename to usr/share/rear/layout/save/default/450_check_bootloader_files.sh index 933cf5bc86..c39711a683 100644 --- a/usr/share/rear/layout/save/default/45_check_bootloader_files.sh +++ b/usr/share/rear/layout/save/default/450_check_bootloader_files.sh @@ -2,7 +2,7 @@ # Public License. Refer to the included COPYING for full text of license. # If any of our bootloader files changes then we should trigger a new savelayout or mkrescue -# prep/default/50_guess_bootloader.sh script created $VAR_DIR/recovery/bootloader file +# prep/default/500_guess_bootloader.sh script created $VAR_DIR/recovery/bootloader file myBOOTloader=$( cat $VAR_DIR/recovery/bootloader ) case $myBOOTloader in diff --git a/usr/share/rear/layout/save/default/45_check_network_files.sh b/usr/share/rear/layout/save/default/450_check_network_files.sh similarity index 100% rename from usr/share/rear/layout/save/default/45_check_network_files.sh rename to usr/share/rear/layout/save/default/450_check_network_files.sh diff --git a/usr/share/rear/layout/save/default/60_snapshot_files.sh b/usr/share/rear/layout/save/default/600_snapshot_files.sh similarity index 100% rename from usr/share/rear/layout/save/default/60_snapshot_files.sh rename to usr/share/rear/layout/save/default/600_snapshot_files.sh diff --git a/usr/share/rear/lib/framework-functions.sh b/usr/share/rear/lib/framework-functions.sh index 5fd3e01edd..d82fb3479e 100644 --- a/usr/share/rear/lib/framework-functions.sh +++ b/usr/share/rear/lib/framework-functions.sh @@ -69,10 +69,10 @@ function SourceStage () { "$BACKUP"/{default,"$ARCH","$OS","$OS_MASTER_VENDOR","$OS_MASTER_VENDOR_ARCH","$OS_MASTER_VENDOR_VERSION","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ "$OUTPUT"/{default,"$ARCH","$OS","$OS_MASTER_VENDOR","$OS_MASTER_VENDOR_ARCH","$OS_MASTER_VENDOR_VERSION","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ "$OUTPUT"/"$BACKUP"/{default,"$ARCH","$OS","$OS_MASTER_VENDOR","$OS_MASTER_VENDOR_ARCH","$OS_MASTER_VENDOR_VERSION","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ - | sed -e 's#/\([0-9][0-9]\)_#/!\1!_#g' | sort -t \! -k 2 | tr -d \! + | sed -e 's#/\([0-9][0-9][0-9]\)_#/!\1!_#g' | sort -t \! -k 2 | tr -d \! ) - # This sed hack is neccessary to sort the scripts by their 2-digit number INSIDE indepentand of the - # directory depth of the script. Basicall sed inserts a ! before and after the number which makes the + # This sed hack is neccessary to sort the scripts by their 3-digit number INSIDE independent of the + # directory depth of the script. Basically sed inserts a ! before and after the number which makes the # number always field nr. 2 when dividing lines into fields by !. The following tr removes the ! to # restore the original script name. But now the scripts are already in the correct order. ) diff --git a/usr/share/rear/lib/global-functions.sh b/usr/share/rear/lib/global-functions.sh index e9d5888c46..50c2c8f3e4 100644 --- a/usr/share/rear/lib/global-functions.sh +++ b/usr/share/rear/lib/global-functions.sh @@ -77,7 +77,7 @@ function url_scheme() { # the scheme is the leading part up to '://' local scheme=${url%%://*} # rsync scheme does not have to start with rsync:// it can also be scp style - # see the comments in usr/share/rear/prep/RSYNC/default/10_check_rsync.sh + # see the comments in usr/share/rear/prep/RSYNC/default/100_check_rsync.sh echo $scheme | grep -q ":" && echo rsync || echo $scheme } diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh index 2c34f94a32..75a59bb0da 100644 --- a/usr/share/rear/lib/layout-functions.sh +++ b/usr/share/rear/lib/layout-functions.sh @@ -506,7 +506,7 @@ get_device_name() { # check $VAR_LIB/recovery/diskbyid_mappings file to see whether we find # a disk/by-id mapping to dm style (the by-id dev is not translated # properly by get_device_name function - dm dev are better) -# 22_lvm_layout.sh uses get_device_mapping to translate lvmdev better +# 220_lvm_layout.sh uses get_device_mapping to translate lvmdev better ### ciss-3600508b1001fffffa004f7b3f209000b-part2 -> cciss/c0d0p2 # see issue #305 get_device_mapping() { diff --git a/usr/share/rear/lib/sesam-functions.sh b/usr/share/rear/lib/sesam-functions.sh index c3230097d0..95f1585d21 100644 --- a/usr/share/rear/lib/sesam-functions.sh +++ b/usr/share/rear/lib/sesam-functions.sh @@ -1,6 +1,6 @@ # read sesam configuration values, referenced by # -# prep/SESAM/default/40_prep_sesam.sh +# prep/SESAM/default/400_prep_sesam.sh # skel/SESAM/etc/scripts/system-setup.d/59-start-sesam-client.sh sesam2000ini_file="/etc/sesam2000.ini" diff --git a/usr/share/rear/output/DP/default/95_dp_save_result_files.sh b/usr/share/rear/output/DP/default/950_dp_save_result_files.sh similarity index 100% rename from usr/share/rear/output/DP/default/95_dp_save_result_files.sh rename to usr/share/rear/output/DP/default/950_dp_save_result_files.sh diff --git a/usr/share/rear/output/ISO/Linux-i386/25_populate_efibootimg.sh b/usr/share/rear/output/ISO/Linux-i386/250_populate_efibootimg.sh similarity index 99% rename from usr/share/rear/output/ISO/Linux-i386/25_populate_efibootimg.sh rename to usr/share/rear/output/ISO/Linux-i386/250_populate_efibootimg.sh index 402ccc2754..b23e1dc314 100644 --- a/usr/share/rear/output/ISO/Linux-i386/25_populate_efibootimg.sh +++ b/usr/share/rear/output/ISO/Linux-i386/250_populate_efibootimg.sh @@ -1,4 +1,4 @@ -# 25_populate_efibootimg.sh +# 250_populate_efibootimg.sh is_true $USING_UEFI_BOOTLOADER || return # empty or 0 means NO UEFI diff --git a/usr/share/rear/output/ISO/Linux-i386/30_create_isolinux.sh b/usr/share/rear/output/ISO/Linux-i386/300_create_isolinux.sh similarity index 100% rename from usr/share/rear/output/ISO/Linux-i386/30_create_isolinux.sh rename to usr/share/rear/output/ISO/Linux-i386/300_create_isolinux.sh diff --git a/usr/share/rear/output/ISO/Linux-i386/70_create_efibootimg.sh b/usr/share/rear/output/ISO/Linux-i386/700_create_efibootimg.sh similarity index 97% rename from usr/share/rear/output/ISO/Linux-i386/70_create_efibootimg.sh rename to usr/share/rear/output/ISO/Linux-i386/700_create_efibootimg.sh index c47239cbf3..dc62c23066 100644 --- a/usr/share/rear/output/ISO/Linux-i386/70_create_efibootimg.sh +++ b/usr/share/rear/output/ISO/Linux-i386/700_create_efibootimg.sh @@ -1,4 +1,4 @@ -# 70_create_efibootimg.sh +# 700_create_efibootimg.sh is_true $USING_UEFI_BOOTLOADER || return # empty or 0 means NO UEFI # Calculate exact size of EFI virtual image (efiboot.img): diff --git a/usr/share/rear/output/ISO/Linux-i386/80_create_isofs.sh b/usr/share/rear/output/ISO/Linux-i386/800_create_isofs.sh similarity index 98% rename from usr/share/rear/output/ISO/Linux-i386/80_create_isofs.sh rename to usr/share/rear/output/ISO/Linux-i386/800_create_isofs.sh index e78b7b758b..168d38d4f4 100644 --- a/usr/share/rear/output/ISO/Linux-i386/80_create_isofs.sh +++ b/usr/share/rear/output/ISO/Linux-i386/800_create_isofs.sh @@ -1,4 +1,4 @@ -# 80_create_isofs.sh +# 800_create_isofs.sh # # create initramfs for Relax-and-Recover # diff --git a/usr/share/rear/output/ISO/Linux-i386/81_prepare_multiple_iso.sh b/usr/share/rear/output/ISO/Linux-i386/810_prepare_multiple_iso.sh similarity index 98% rename from usr/share/rear/output/ISO/Linux-i386/81_prepare_multiple_iso.sh rename to usr/share/rear/output/ISO/Linux-i386/810_prepare_multiple_iso.sh index 49b061bf76..93a2b6ccea 100644 --- a/usr/share/rear/output/ISO/Linux-i386/81_prepare_multiple_iso.sh +++ b/usr/share/rear/output/ISO/Linux-i386/810_prepare_multiple_iso.sh @@ -1,4 +1,4 @@ -# 81_prepare_multiple_iso.sh +# 810_prepare_multiple_iso.sh # # multiple isos preparation # diff --git a/usr/share/rear/output/ISO/Linux-i386/82_create_iso_image.sh b/usr/share/rear/output/ISO/Linux-i386/820_create_iso_image.sh similarity index 100% rename from usr/share/rear/output/ISO/Linux-i386/82_create_iso_image.sh rename to usr/share/rear/output/ISO/Linux-i386/820_create_iso_image.sh diff --git a/usr/share/rear/output/ISO/Linux-i386/85_check_for_errors.sh b/usr/share/rear/output/ISO/Linux-i386/850_check_for_errors.sh similarity index 100% rename from usr/share/rear/output/ISO/Linux-i386/85_check_for_errors.sh rename to usr/share/rear/output/ISO/Linux-i386/850_check_for_errors.sh diff --git a/usr/share/rear/output/ISO/Linux-ia64/20_mount_bootimg.sh b/usr/share/rear/output/ISO/Linux-ia64/200_mount_bootimg.sh similarity index 91% rename from usr/share/rear/output/ISO/Linux-ia64/20_mount_bootimg.sh rename to usr/share/rear/output/ISO/Linux-ia64/200_mount_bootimg.sh index d9e649c845..b5f603ec52 100644 --- a/usr/share/rear/output/ISO/Linux-ia64/20_mount_bootimg.sh +++ b/usr/share/rear/output/ISO/Linux-ia64/200_mount_bootimg.sh @@ -1,4 +1,4 @@ -# 20_mount_bootimg.sh +# 200_mount_bootimg.sh dd if=/dev/zero of=$TMP_DIR/boot.img count=64000 bs=1024 # make sure we select FAT16 instead of FAT12 as size >30MB mkfs.vfat $v -F 16 $TMP_DIR/boot.img >&2 diff --git a/usr/share/rear/output/ISO/Linux-ia64/30_create_bootimg.sh b/usr/share/rear/output/ISO/Linux-ia64/300_create_bootimg.sh similarity index 91% rename from usr/share/rear/output/ISO/Linux-ia64/30_create_bootimg.sh rename to usr/share/rear/output/ISO/Linux-ia64/300_create_bootimg.sh index 2e0efed0b5..61224bb3df 100644 --- a/usr/share/rear/output/ISO/Linux-ia64/30_create_bootimg.sh +++ b/usr/share/rear/output/ISO/Linux-ia64/300_create_bootimg.sh @@ -1,4 +1,4 @@ -# 30_create_bootimg.sh +# 300_create_bootimg.sh # # create elilo.conf for Relax-and-Recover # @@ -17,7 +17,7 @@ cp $v $TMP_DIR/initrd.cgz $TMP_DIR/mnt/boot #VMLINUX_KERNEL=`find / -xdev -name "vmlinu*-${KERNEL_VERSION}"` #cp "${VMLINUX_KERNEL}" $TMP_DIR/mnt/boot/kernel -# KERNEL_FILE is defined in pack/Linux-ia64/30_copy_kernel.sh script +# KERNEL_FILE is defined in pack/Linux-ia64/300_copy_kernel.sh script cp $v "${KERNEL_FILE}" $TMP_DIR/mnt/boot/kernel >&2 StopIfError "Could not find ${KERNEL_FILE}" diff --git a/usr/share/rear/output/ISO/Linux-ia64/40_create_local_efi_dir.sh b/usr/share/rear/output/ISO/Linux-ia64/400_create_local_efi_dir.sh similarity index 100% rename from usr/share/rear/output/ISO/Linux-ia64/40_create_local_efi_dir.sh rename to usr/share/rear/output/ISO/Linux-ia64/400_create_local_efi_dir.sh diff --git a/usr/share/rear/output/ISO/Linux-ia64/70_umount_bootimg.sh b/usr/share/rear/output/ISO/Linux-ia64/700_umount_bootimg.sh similarity index 72% rename from usr/share/rear/output/ISO/Linux-ia64/70_umount_bootimg.sh rename to usr/share/rear/output/ISO/Linux-ia64/700_umount_bootimg.sh index 9cf1c8e0aa..8342b48313 100644 --- a/usr/share/rear/output/ISO/Linux-ia64/70_umount_bootimg.sh +++ b/usr/share/rear/output/ISO/Linux-ia64/700_umount_bootimg.sh @@ -1,3 +1,3 @@ -# 90_umount_bootimg.sh +# 900_umount_bootimg.sh umount $v $TMP_DIR/boot.img >&2 #rm -f $v $TMP_DIR/boot.img >&2 diff --git a/usr/share/rear/output/ISO/Linux-ia64/80_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ia64/800_create_isofs.sh similarity index 98% rename from usr/share/rear/output/ISO/Linux-ia64/80_create_isofs.sh rename to usr/share/rear/output/ISO/Linux-ia64/800_create_isofs.sh index acd6833b70..15ca60c142 100644 --- a/usr/share/rear/output/ISO/Linux-ia64/80_create_isofs.sh +++ b/usr/share/rear/output/ISO/Linux-ia64/800_create_isofs.sh @@ -1,4 +1,4 @@ -# 80_create_isofs.sh +# 800_create_isofs.sh # # create initramfs for Relax-and-Recover # diff --git a/usr/share/rear/output/ISO/Linux-ppc64/30_create_yaboot.sh b/usr/share/rear/output/ISO/Linux-ppc64/300_create_yaboot.sh similarity index 98% rename from usr/share/rear/output/ISO/Linux-ppc64/30_create_yaboot.sh rename to usr/share/rear/output/ISO/Linux-ppc64/300_create_yaboot.sh index b3ecf9dc3b..30e1774c5d 100644 --- a/usr/share/rear/output/ISO/Linux-ppc64/30_create_yaboot.sh +++ b/usr/share/rear/output/ISO/Linux-ppc64/300_create_yaboot.sh @@ -1,4 +1,4 @@ -# 30_create_isolinux.sh +# 300_create_isolinux.sh # # create yaboot.cfg for Relax-and-Recover # diff --git a/usr/share/rear/output/ISO/Linux-ppc64/31_create_grub2.sh b/usr/share/rear/output/ISO/Linux-ppc64/310_create_grub2.sh similarity index 97% rename from usr/share/rear/output/ISO/Linux-ppc64/31_create_grub2.sh rename to usr/share/rear/output/ISO/Linux-ppc64/310_create_grub2.sh index e33c3a4cc8..2430569370 100644 --- a/usr/share/rear/output/ISO/Linux-ppc64/31_create_grub2.sh +++ b/usr/share/rear/output/ISO/Linux-ppc64/310_create_grub2.sh @@ -1,4 +1,4 @@ -# 31_create_grub2.sh +# 310_create_grub2.sh # # create grub.cfg for Relax-and-Recover # diff --git a/usr/share/rear/output/ISO/Linux-ppc64/80_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh similarity index 98% rename from usr/share/rear/output/ISO/Linux-ppc64/80_create_isofs.sh rename to usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh index cb2f9d40c9..81c749b7e4 100644 --- a/usr/share/rear/output/ISO/Linux-ppc64/80_create_isofs.sh +++ b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh @@ -1,4 +1,4 @@ -# 80_create_isofs.sh +# 800_create_isofs.sh # # create initramfs for Relax-and-Recover # diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/30_create_grub2.sh b/usr/share/rear/output/ISO/Linux-ppc64le/300_create_grub2.sh similarity index 97% rename from usr/share/rear/output/ISO/Linux-ppc64le/30_create_grub2.sh rename to usr/share/rear/output/ISO/Linux-ppc64le/300_create_grub2.sh index 882cb63175..fce81e1399 100644 --- a/usr/share/rear/output/ISO/Linux-ppc64le/30_create_grub2.sh +++ b/usr/share/rear/output/ISO/Linux-ppc64le/300_create_grub2.sh @@ -1,4 +1,4 @@ -# 30_create_grub2.sh +# 300_create_grub2.sh # # create grub.cfg for Relax-and-Recover # diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/80_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh similarity index 98% rename from usr/share/rear/output/ISO/Linux-ppc64le/80_create_isofs.sh rename to usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh index 1a2a0f976b..2303056851 100644 --- a/usr/share/rear/output/ISO/Linux-ppc64le/80_create_isofs.sh +++ b/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh @@ -1,4 +1,4 @@ -# 80_create_isofs.sh +# 800_create_isofs.sh # # create initramfs for Relax-and-Recover # diff --git a/usr/share/rear/output/NSR/default/95_nsr_save_result_files.sh b/usr/share/rear/output/NSR/default/950_nsr_save_result_files.sh similarity index 100% rename from usr/share/rear/output/NSR/default/95_nsr_save_result_files.sh rename to usr/share/rear/output/NSR/default/950_nsr_save_result_files.sh diff --git a/usr/share/rear/output/OBDR/Linux-i386/300_create_isolinux.sh b/usr/share/rear/output/OBDR/Linux-i386/300_create_isolinux.sh new file mode 120000 index 0000000000..35d472cbfd --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-i386/300_create_isolinux.sh @@ -0,0 +1 @@ +../../ISO/Linux-i386/300_create_isolinux.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-i386/30_create_isolinux.sh b/usr/share/rear/output/OBDR/Linux-i386/30_create_isolinux.sh deleted file mode 120000 index 824708c01e..0000000000 --- a/usr/share/rear/output/OBDR/Linux-i386/30_create_isolinux.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-i386/30_create_isolinux.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-i386/800_create_isofs.sh b/usr/share/rear/output/OBDR/Linux-i386/800_create_isofs.sh new file mode 120000 index 0000000000..c6867134b3 --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-i386/800_create_isofs.sh @@ -0,0 +1 @@ +../../ISO/Linux-i386/800_create_isofs.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-i386/80_create_isofs.sh b/usr/share/rear/output/OBDR/Linux-i386/80_create_isofs.sh deleted file mode 120000 index 2e3f508c07..0000000000 --- a/usr/share/rear/output/OBDR/Linux-i386/80_create_isofs.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-i386/80_create_isofs.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/200_mount_bootimg.sh b/usr/share/rear/output/OBDR/Linux-ia64/200_mount_bootimg.sh new file mode 120000 index 0000000000..7fd0a8827c --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-ia64/200_mount_bootimg.sh @@ -0,0 +1 @@ +../../ISO/Linux-ia64/200_mount_bootimg.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/20_mount_bootimg.sh b/usr/share/rear/output/OBDR/Linux-ia64/20_mount_bootimg.sh deleted file mode 120000 index 28d990dba0..0000000000 --- a/usr/share/rear/output/OBDR/Linux-ia64/20_mount_bootimg.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ia64/20_mount_bootimg.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/300_create_bootimg.sh b/usr/share/rear/output/OBDR/Linux-ia64/300_create_bootimg.sh new file mode 120000 index 0000000000..73bf866c8c --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-ia64/300_create_bootimg.sh @@ -0,0 +1 @@ +../../ISO/Linux-ia64/300_create_bootimg.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/30_create_bootimg.sh b/usr/share/rear/output/OBDR/Linux-ia64/30_create_bootimg.sh deleted file mode 120000 index fbb08bb9c4..0000000000 --- a/usr/share/rear/output/OBDR/Linux-ia64/30_create_bootimg.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ia64/30_create_bootimg.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/400_create_local_efi_dir.sh b/usr/share/rear/output/OBDR/Linux-ia64/400_create_local_efi_dir.sh new file mode 120000 index 0000000000..4266ea724b --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-ia64/400_create_local_efi_dir.sh @@ -0,0 +1 @@ +../../ISO/Linux-ia64/400_create_local_efi_dir.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/40_create_local_efi_dir.sh b/usr/share/rear/output/OBDR/Linux-ia64/40_create_local_efi_dir.sh deleted file mode 120000 index d842782616..0000000000 --- a/usr/share/rear/output/OBDR/Linux-ia64/40_create_local_efi_dir.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ia64/40_create_local_efi_dir.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/700_umount_bootimg.sh b/usr/share/rear/output/OBDR/Linux-ia64/700_umount_bootimg.sh new file mode 120000 index 0000000000..e295225414 --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-ia64/700_umount_bootimg.sh @@ -0,0 +1 @@ +../../ISO/Linux-ia64/700_umount_bootimg.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/70_umount_bootimg.sh b/usr/share/rear/output/OBDR/Linux-ia64/70_umount_bootimg.sh deleted file mode 120000 index aa4673096a..0000000000 --- a/usr/share/rear/output/OBDR/Linux-ia64/70_umount_bootimg.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ia64/70_umount_bootimg.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/800_create_isofs.sh b/usr/share/rear/output/OBDR/Linux-ia64/800_create_isofs.sh new file mode 120000 index 0000000000..4977cc2b5b --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-ia64/800_create_isofs.sh @@ -0,0 +1 @@ +../../ISO/Linux-ia64/800_create_isofs.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ia64/80_create_isofs.sh b/usr/share/rear/output/OBDR/Linux-ia64/80_create_isofs.sh deleted file mode 120000 index 023a147f7f..0000000000 --- a/usr/share/rear/output/OBDR/Linux-ia64/80_create_isofs.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ia64/80_create_isofs.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ppc64/300_create_yaboot.sh b/usr/share/rear/output/OBDR/Linux-ppc64/300_create_yaboot.sh new file mode 120000 index 0000000000..367cb310b9 --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-ppc64/300_create_yaboot.sh @@ -0,0 +1 @@ +../../ISO/Linux-ppc64/300_create_yaboot.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ppc64/30_create_yaboot.sh b/usr/share/rear/output/OBDR/Linux-ppc64/30_create_yaboot.sh deleted file mode 120000 index caeaa7d33f..0000000000 --- a/usr/share/rear/output/OBDR/Linux-ppc64/30_create_yaboot.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ppc64/30_create_yaboot.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ppc64/800_create_isofs.sh b/usr/share/rear/output/OBDR/Linux-ppc64/800_create_isofs.sh new file mode 120000 index 0000000000..218236ef65 --- /dev/null +++ b/usr/share/rear/output/OBDR/Linux-ppc64/800_create_isofs.sh @@ -0,0 +1 @@ +../../ISO/Linux-ppc64/800_create_isofs.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/Linux-ppc64/80_create_isofs.sh b/usr/share/rear/output/OBDR/Linux-ppc64/80_create_isofs.sh deleted file mode 120000 index 1f57586099..0000000000 --- a/usr/share/rear/output/OBDR/Linux-ppc64/80_create_isofs.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ppc64/80_create_isofs.sh \ No newline at end of file diff --git a/usr/share/rear/output/OBDR/default/50_set_obdr_blocksize.sh b/usr/share/rear/output/OBDR/default/500_set_obdr_blocksize.sh similarity index 100% rename from usr/share/rear/output/OBDR/default/50_set_obdr_blocksize.sh rename to usr/share/rear/output/OBDR/default/500_set_obdr_blocksize.sh diff --git a/usr/share/rear/output/OBDR/default/81_write_image.sh b/usr/share/rear/output/OBDR/default/810_write_image.sh similarity index 100% rename from usr/share/rear/output/OBDR/default/81_write_image.sh rename to usr/share/rear/output/OBDR/default/810_write_image.sh diff --git a/usr/share/rear/output/PXE/default/80_copy_to_tftp.sh b/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh similarity index 97% rename from usr/share/rear/output/PXE/default/80_copy_to_tftp.sh rename to usr/share/rear/output/PXE/default/800_copy_to_tftp.sh index 9563dfd739..60e83cf708 100644 --- a/usr/share/rear/output/PXE/default/80_copy_to_tftp.sh +++ b/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh @@ -1,4 +1,4 @@ -# 80_copy_to_tftp.sh +# 800_copy_to_tftp.sh # # copy kernel and initrd to TFTP server for Relax-and-Recover # diff --git a/usr/share/rear/output/PXE/default/81_create_pxelinux_cfg.sh b/usr/share/rear/output/PXE/default/810_create_pxelinux_cfg.sh similarity index 98% rename from usr/share/rear/output/PXE/default/81_create_pxelinux_cfg.sh rename to usr/share/rear/output/PXE/default/810_create_pxelinux_cfg.sh index 08c4f8a0d0..fc312b9907 100644 --- a/usr/share/rear/output/PXE/default/81_create_pxelinux_cfg.sh +++ b/usr/share/rear/output/PXE/default/810_create_pxelinux_cfg.sh @@ -1,4 +1,4 @@ -# 81_create_pxelinux_cfg.sh +# 810_create_pxelinux_cfg.sh # # create pxelinux config on PXE server for Relax-and-Recover # diff --git a/usr/share/rear/output/PXE/default/82_copy_to_net.sh b/usr/share/rear/output/PXE/default/820_copy_to_net.sh similarity index 97% rename from usr/share/rear/output/PXE/default/82_copy_to_net.sh rename to usr/share/rear/output/PXE/default/820_copy_to_net.sh index 749af88af3..6baa5cedc7 100644 --- a/usr/share/rear/output/PXE/default/82_copy_to_net.sh +++ b/usr/share/rear/output/PXE/default/820_copy_to_net.sh @@ -1,5 +1,5 @@ -# 82_copy_to_net.sh +# 820_copy_to_net.sh # Check if we have a target location OUTPUT_URL test "$OUTPUT_URL" || return diff --git a/usr/share/rear/output/RAMDISK/Linux-i386/90_copy_ramdisk.sh b/usr/share/rear/output/RAMDISK/Linux-i386/900_copy_ramdisk.sh similarity index 100% rename from usr/share/rear/output/RAMDISK/Linux-i386/90_copy_ramdisk.sh rename to usr/share/rear/output/RAMDISK/Linux-i386/900_copy_ramdisk.sh diff --git a/usr/share/rear/output/RSYNC/default/20_make_prefix_dir.sh b/usr/share/rear/output/RSYNC/default/200_make_prefix_dir.sh similarity index 100% rename from usr/share/rear/output/RSYNC/default/20_make_prefix_dir.sh rename to usr/share/rear/output/RSYNC/default/200_make_prefix_dir.sh diff --git a/usr/share/rear/output/RSYNC/default/90_copy_result_files.sh b/usr/share/rear/output/RSYNC/default/900_copy_result_files.sh similarity index 100% rename from usr/share/rear/output/RSYNC/default/90_copy_result_files.sh rename to usr/share/rear/output/RSYNC/default/900_copy_result_files.sh diff --git a/usr/share/rear/output/TSM/default/95_dsmc_save_result_files.sh b/usr/share/rear/output/TSM/default/950_dsmc_save_result_files.sh similarity index 100% rename from usr/share/rear/output/TSM/default/95_dsmc_save_result_files.sh rename to usr/share/rear/output/TSM/default/950_dsmc_save_result_files.sh diff --git a/usr/share/rear/output/TSM/default/96_dsmc_verify_isofile.sh b/usr/share/rear/output/TSM/default/960_dsmc_verify_isofile.sh similarity index 96% rename from usr/share/rear/output/TSM/default/96_dsmc_verify_isofile.sh rename to usr/share/rear/output/TSM/default/960_dsmc_verify_isofile.sh index 771ea19b0d..274336dbbf 100644 --- a/usr/share/rear/output/TSM/default/96_dsmc_verify_isofile.sh +++ b/usr/share/rear/output/TSM/default/960_dsmc_verify_isofile.sh @@ -1,4 +1,4 @@ -# 96_dsmc_verify_isofile.sh +# 960_dsmc_verify_isofile.sh if [[ ! "$TSM_RM_ISOFILE" =~ [yY1] ]] ; then return fi diff --git a/usr/share/rear/output/USB/Linux-i386/10_create_efiboot.sh b/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh similarity index 99% rename from usr/share/rear/output/USB/Linux-i386/10_create_efiboot.sh rename to usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh index 4122d493f3..0900877cd3 100644 --- a/usr/share/rear/output/USB/Linux-i386/10_create_efiboot.sh +++ b/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh @@ -1,4 +1,4 @@ -# 10_create_efiboot.sh +# 100_create_efiboot.sh # USB device needs to be formated with command `rear format -- --efi /dev/' is_true $USING_UEFI_BOOTLOADER || return diff --git a/usr/share/rear/output/USB/Linux-i386/30_create_extlinux.sh b/usr/share/rear/output/USB/Linux-i386/300_create_extlinux.sh similarity index 100% rename from usr/share/rear/output/USB/Linux-i386/30_create_extlinux.sh rename to usr/share/rear/output/USB/Linux-i386/300_create_extlinux.sh diff --git a/usr/share/rear/output/USB/Linux-i386/83_copy_kernel_initrd.sh b/usr/share/rear/output/USB/Linux-i386/830_copy_kernel_initrd.sh similarity index 100% rename from usr/share/rear/output/USB/Linux-i386/83_copy_kernel_initrd.sh rename to usr/share/rear/output/USB/Linux-i386/830_copy_kernel_initrd.sh diff --git a/usr/share/rear/output/USB/Linux-i386/85_make_USB_bootable.sh b/usr/share/rear/output/USB/Linux-i386/850_make_USB_bootable.sh similarity index 97% rename from usr/share/rear/output/USB/Linux-i386/85_make_USB_bootable.sh rename to usr/share/rear/output/USB/Linux-i386/850_make_USB_bootable.sh index 3cffc940c3..68614c1071 100644 --- a/usr/share/rear/output/USB/Linux-i386/85_make_USB_bootable.sh +++ b/usr/share/rear/output/USB/Linux-i386/850_make_USB_bootable.sh @@ -8,7 +8,7 @@ if version_newer "$dd_version" 5.3.0; then fi # we assume that REAL_USB_DEVICE and RAW_USB_DEVICE are both set from the script -# in prep/USB/Linux-i386/35_check_usb_disk.sh +# in prep/USB/Linux-i386/350_check_usb_disk.sh [ "$RAW_USB_DEVICE" -a "$REAL_USB_DEVICE" ] BugIfError "RAW_USB_DEVICE and REAL_USB_DEVICE should be already set" diff --git a/usr/share/rear/output/default/01_set_umask.sh b/usr/share/rear/output/default/010_set_umask.sh similarity index 100% rename from usr/share/rear/output/default/01_set_umask.sh rename to usr/share/rear/output/default/010_set_umask.sh diff --git a/usr/share/rear/output/default/10_mount_output_path.sh b/usr/share/rear/output/default/100_mount_output_path.sh similarity index 100% rename from usr/share/rear/output/default/10_mount_output_path.sh rename to usr/share/rear/output/default/100_mount_output_path.sh diff --git a/usr/share/rear/output/default/15_save_copy_of_prefix_dir.sh b/usr/share/rear/output/default/150_save_copy_of_prefix_dir.sh similarity index 95% rename from usr/share/rear/output/default/15_save_copy_of_prefix_dir.sh rename to usr/share/rear/output/default/150_save_copy_of_prefix_dir.sh index f514d6ca1c..00339a960c 100644 --- a/usr/share/rear/output/default/15_save_copy_of_prefix_dir.sh +++ b/usr/share/rear/output/default/150_save_copy_of_prefix_dir.sh @@ -17,8 +17,8 @@ local opath=$(output_path $scheme $path) if test -d "${opath}" ; then rm -rf $v "${opath}.old" >&2 StopIfError "Could not remove '${opath}.old'" - # below statement was 'cp -af' instead of 'mv -f' (see issue #192) + # below statement was 'cp -af' instead of 'mv -f' (see issue #192) mv -f $v "${opath}" "${opath}.old" >&2 StopIfError "Could not move '${opath}'" fi -# the ${BUILD_DIR}/outputfs/${OUTPUT_PREFIX} will be created by output/default/20_make_prefix_dir.sh +# the ${BUILD_DIR}/outputfs/${OUTPUT_PREFIX} will be created by output/default/200_make_prefix_dir.sh diff --git a/usr/share/rear/output/default/20_make_boot_dir.sh b/usr/share/rear/output/default/200_make_boot_dir.sh similarity index 100% rename from usr/share/rear/output/default/20_make_boot_dir.sh rename to usr/share/rear/output/default/200_make_boot_dir.sh diff --git a/usr/share/rear/output/default/20_make_prefix_dir.sh b/usr/share/rear/output/default/200_make_prefix_dir.sh similarity index 100% rename from usr/share/rear/output/default/20_make_prefix_dir.sh rename to usr/share/rear/output/default/200_make_prefix_dir.sh diff --git a/usr/share/rear/output/default/25_create_lock.sh b/usr/share/rear/output/default/250_create_lock.sh similarity index 100% rename from usr/share/rear/output/default/25_create_lock.sh rename to usr/share/rear/output/default/250_create_lock.sh diff --git a/usr/share/rear/output/default/94_grub2_rescue.sh b/usr/share/rear/output/default/940_grub2_rescue.sh similarity index 99% rename from usr/share/rear/output/default/94_grub2_rescue.sh rename to usr/share/rear/output/default/940_grub2_rescue.sh index df3b29395f..7522dd0d57 100644 --- a/usr/share/rear/output/default/94_grub2_rescue.sh +++ b/usr/share/rear/output/default/940_grub2_rescue.sh @@ -1,4 +1,4 @@ -# 94_grub2_rescue.sh +# 940_grub2_rescue.sh # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. @@ -10,7 +10,7 @@ is_true "$GRUB_RESCUE" || return # Only run this script when GRUB 2 is there # (grub-probe or grub2-probe only exist in GRUB 2) # in particular do not run this script when GRUB Legacy is used -# (for GRUB Legacy output/default/94_grub_rescue.sh is run): +# (for GRUB Legacy output/default/940_grub_rescue.sh is run): if [[ ! $( type -p grub-probe ) && ! $( type -p grub2-probe ) ]] ; then LogPrint "Skipping GRUB_RESCUE setup for GRUB 2 (no GRUB 2 found)." return diff --git a/usr/share/rear/output/default/94_grub_rescue.sh b/usr/share/rear/output/default/940_grub_rescue.sh similarity index 99% rename from usr/share/rear/output/default/94_grub_rescue.sh rename to usr/share/rear/output/default/940_grub_rescue.sh index 5e1ffda6ba..0c38d04207 100644 --- a/usr/share/rear/output/default/94_grub_rescue.sh +++ b/usr/share/rear/output/default/940_grub_rescue.sh @@ -1,4 +1,4 @@ -# 94_grub_rescue.sh +# 940_grub_rescue.sh # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. diff --git a/usr/share/rear/output/default/95_copy_result_files.sh b/usr/share/rear/output/default/950_copy_result_files.sh similarity index 98% rename from usr/share/rear/output/default/95_copy_result_files.sh rename to usr/share/rear/output/default/950_copy_result_files.sh index ea88ae2d29..49e59fab1c 100644 --- a/usr/share/rear/output/default/95_copy_result_files.sh +++ b/usr/share/rear/output/default/950_copy_result_files.sh @@ -41,7 +41,7 @@ case "$scheme" in ;; (rsync) - [[ "$BACKUP" = "RSYNC" ]] && return 0 # output/RSYNC/default/90_copy_result_files.sh took care of it + [[ "$BACKUP" = "RSYNC" ]] && return 0 # output/RSYNC/default/900_copy_result_files.sh took care of it LogPrint "Copying result files '${RESULT_FILES[@]}' to $scheme location" Log "rsync -a $v ${RESULT_FILES[@]} ${host}:${path}" rsync -a $v "${RESULT_FILES[@]}" "${host}:${path}" || Error "Problem transferring result files to $OUTPUT_URL" diff --git a/usr/share/rear/output/default/95_email_result_files.sh b/usr/share/rear/output/default/950_email_result_files.sh similarity index 100% rename from usr/share/rear/output/default/95_email_result_files.sh rename to usr/share/rear/output/default/950_email_result_files.sh diff --git a/usr/share/rear/output/default/97_remove_lock.sh b/usr/share/rear/output/default/970_remove_lock.sh similarity index 100% rename from usr/share/rear/output/default/97_remove_lock.sh rename to usr/share/rear/output/default/970_remove_lock.sh diff --git a/usr/share/rear/output/default/98_umount_output_dir.sh b/usr/share/rear/output/default/980_umount_output_dir.sh similarity index 100% rename from usr/share/rear/output/default/98_umount_output_dir.sh rename to usr/share/rear/output/default/980_umount_output_dir.sh diff --git a/usr/share/rear/pack/Debian/ia64/30_copy_kernel.sh b/usr/share/rear/pack/Debian/ia64/300_copy_kernel.sh similarity index 98% rename from usr/share/rear/pack/Debian/ia64/30_copy_kernel.sh rename to usr/share/rear/pack/Debian/ia64/300_copy_kernel.sh index c9bfb695ed..b04b206f3f 100644 --- a/usr/share/rear/pack/Debian/ia64/30_copy_kernel.sh +++ b/usr/share/rear/pack/Debian/ia64/300_copy_kernel.sh @@ -1,4 +1,4 @@ -# 30_copy_kernel.sh +# 300_copy_kernel.sh # # copy kernel for Relax-and-Recover # diff --git a/usr/share/rear/pack/Fedora/ia64/30_copy_kernel.sh b/usr/share/rear/pack/Fedora/ia64/300_copy_kernel.sh similarity index 98% rename from usr/share/rear/pack/Fedora/ia64/30_copy_kernel.sh rename to usr/share/rear/pack/Fedora/ia64/300_copy_kernel.sh index 5e9948e750..8d2214b6e8 100644 --- a/usr/share/rear/pack/Fedora/ia64/30_copy_kernel.sh +++ b/usr/share/rear/pack/Fedora/ia64/300_copy_kernel.sh @@ -1,4 +1,4 @@ -# 30_copy_kernel.sh +# 300_copy_kernel.sh # # copy kernel for Relax-and-Recover # diff --git a/usr/share/rear/pack/GNU/Linux/90_create_initramfs.sh b/usr/share/rear/pack/GNU/Linux/900_create_initramfs.sh similarity index 94% rename from usr/share/rear/pack/GNU/Linux/90_create_initramfs.sh rename to usr/share/rear/pack/GNU/Linux/900_create_initramfs.sh index da8ba4a515..377dfbcf12 100644 --- a/usr/share/rear/pack/GNU/Linux/90_create_initramfs.sh +++ b/usr/share/rear/pack/GNU/Linux/900_create_initramfs.sh @@ -1,4 +1,4 @@ -# 10_create_initramfs.sh +# 100_create_initramfs.sh # # create initramfs for Relax-and-Recover # diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/300_copy_kernel.sh similarity index 99% rename from usr/share/rear/pack/Linux-i386/30_copy_kernel.sh rename to usr/share/rear/pack/Linux-i386/300_copy_kernel.sh index 8d5d421b71..95f6494a49 100644 --- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh +++ b/usr/share/rear/pack/Linux-i386/300_copy_kernel.sh @@ -1,4 +1,4 @@ -# 30_copy_kernel.sh +# 300_copy_kernel.sh # # copy kernel for Relax-and-Recover # diff --git a/usr/share/rear/pack/Linux-ppc64/30_copy_kernel.sh b/usr/share/rear/pack/Linux-ppc64/300_copy_kernel.sh similarity index 98% rename from usr/share/rear/pack/Linux-ppc64/30_copy_kernel.sh rename to usr/share/rear/pack/Linux-ppc64/300_copy_kernel.sh index aad7c5e35d..439bea6388 100644 --- a/usr/share/rear/pack/Linux-ppc64/30_copy_kernel.sh +++ b/usr/share/rear/pack/Linux-ppc64/300_copy_kernel.sh @@ -1,4 +1,4 @@ -# 30_copy_kernel.sh +# 300_copy_kernel.sh # # copy kernel for Relax-and-Recover # diff --git a/usr/share/rear/pack/Linux-ppc64le/30_copy_kernel.sh b/usr/share/rear/pack/Linux-ppc64le/300_copy_kernel.sh similarity index 98% rename from usr/share/rear/pack/Linux-ppc64le/30_copy_kernel.sh rename to usr/share/rear/pack/Linux-ppc64le/300_copy_kernel.sh index 2e5cc07dc3..a84c051720 100644 --- a/usr/share/rear/pack/Linux-ppc64le/30_copy_kernel.sh +++ b/usr/share/rear/pack/Linux-ppc64le/300_copy_kernel.sh @@ -1,4 +1,4 @@ -# 30_copy_kernel.sh +# 300_copy_kernel.sh # # copy kernel for Relax-and-Recover # diff --git a/usr/share/rear/prep/BACULA/default/40_prep_bacula.sh b/usr/share/rear/prep/BACULA/default/400_prep_bacula.sh similarity index 100% rename from usr/share/rear/prep/BACULA/default/40_prep_bacula.sh rename to usr/share/rear/prep/BACULA/default/400_prep_bacula.sh diff --git a/usr/share/rear/prep/BACULA/default/45_check_BACULA_client_configured.sh b/usr/share/rear/prep/BACULA/default/450_check_BACULA_client_configured.sh similarity index 100% rename from usr/share/rear/prep/BACULA/default/45_check_BACULA_client_configured.sh rename to usr/share/rear/prep/BACULA/default/450_check_BACULA_client_configured.sh diff --git a/usr/share/rear/prep/BACULA/default/50_check_BACULA_bconsole_results.sh b/usr/share/rear/prep/BACULA/default/500_check_BACULA_bconsole_results.sh similarity index 100% rename from usr/share/rear/prep/BACULA/default/50_check_BACULA_bconsole_results.sh rename to usr/share/rear/prep/BACULA/default/500_check_BACULA_bconsole_results.sh diff --git a/usr/share/rear/prep/BAREOS/default/40_prep_bareos.sh b/usr/share/rear/prep/BAREOS/default/400_prep_bareos.sh similarity index 100% rename from usr/share/rear/prep/BAREOS/default/40_prep_bareos.sh rename to usr/share/rear/prep/BAREOS/default/400_prep_bareos.sh diff --git a/usr/share/rear/prep/BAREOS/default/45_check_BAREOS_client_configured.sh b/usr/share/rear/prep/BAREOS/default/450_check_BAREOS_client_configured.sh similarity index 100% rename from usr/share/rear/prep/BAREOS/default/45_check_BAREOS_client_configured.sh rename to usr/share/rear/prep/BAREOS/default/450_check_BAREOS_client_configured.sh diff --git a/usr/share/rear/prep/BAREOS/default/50_check_BAREOS_bconsole_results.sh b/usr/share/rear/prep/BAREOS/default/500_check_BAREOS_bconsole_results.sh similarity index 100% rename from usr/share/rear/prep/BAREOS/default/50_check_BAREOS_bconsole_results.sh rename to usr/share/rear/prep/BAREOS/default/500_check_BAREOS_bconsole_results.sh diff --git a/usr/share/rear/prep/BAREOS/default/55_check_bareos_restore_jobs.sh b/usr/share/rear/prep/BAREOS/default/550_check_bareos_restore_jobs.sh similarity index 97% rename from usr/share/rear/prep/BAREOS/default/55_check_bareos_restore_jobs.sh rename to usr/share/rear/prep/BAREOS/default/550_check_bareos_restore_jobs.sh index dc3ff5900d..9364a5f25a 100644 --- a/usr/share/rear/prep/BAREOS/default/55_check_bareos_restore_jobs.sh +++ b/usr/share/rear/prep/BAREOS/default/550_check_bareos_restore_jobs.sh @@ -1,4 +1,4 @@ -# 55_check_bareos_restore_jobs.sh +# 550_check_bareos_restore_jobs.sh [[ ! -z "$BAREOS_RESTORE_JOB" ]] && return # variable filled in already (via local.conf?) diff --git a/usr/share/rear/prep/BAREOS/default/56_check_bareos_filesets.sh b/usr/share/rear/prep/BAREOS/default/560_check_bareos_filesets.sh similarity index 97% rename from usr/share/rear/prep/BAREOS/default/56_check_bareos_filesets.sh rename to usr/share/rear/prep/BAREOS/default/560_check_bareos_filesets.sh index 2ba90220af..97581a0fde 100644 --- a/usr/share/rear/prep/BAREOS/default/56_check_bareos_filesets.sh +++ b/usr/share/rear/prep/BAREOS/default/560_check_bareos_filesets.sh @@ -1,4 +1,4 @@ -# 56_check_bareos_filesets.sh +# 560_check_bareos_filesets.sh [[ ! -z "$BAREOS_FILESET" ]] && return # variable filled in already (via local.conf?) diff --git a/usr/share/rear/prep/BORG/default/10_set_vars.sh b/usr/share/rear/prep/BORG/default/100_set_vars.sh similarity index 90% rename from usr/share/rear/prep/BORG/default/10_set_vars.sh rename to usr/share/rear/prep/BORG/default/100_set_vars.sh index 9866773fcb..1136f163d7 100644 --- a/usr/share/rear/prep/BORG/default/10_set_vars.sh +++ b/usr/share/rear/prep/BORG/default/100_set_vars.sh @@ -1,6 +1,6 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 10_set_vars.sh +# 100_set_vars.sh borg_set_vars diff --git a/usr/share/rear/prep/BORG/default/20_prep_borg.sh b/usr/share/rear/prep/BORG/default/200_prep_borg.sh similarity index 98% rename from usr/share/rear/prep/BORG/default/20_prep_borg.sh rename to usr/share/rear/prep/BORG/default/200_prep_borg.sh index ec82c73896..79fd214463 100644 --- a/usr/share/rear/prep/BORG/default/20_prep_borg.sh +++ b/usr/share/rear/prep/BORG/default/200_prep_borg.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 20_prep_borg.sh +# 200_prep_borg.sh # Check if BORGBACKUP_ARCHIVE_PREFIX is correctly set. # Using '_' could result to some unpleasant side effects, diff --git a/usr/share/rear/prep/BORG/default/30_init_archive.sh b/usr/share/rear/prep/BORG/default/300_init_archive.sh similarity index 98% rename from usr/share/rear/prep/BORG/default/30_init_archive.sh rename to usr/share/rear/prep/BORG/default/300_init_archive.sh index 957965a716..b2a0ef026d 100644 --- a/usr/share/rear/prep/BORG/default/30_init_archive.sh +++ b/usr/share/rear/prep/BORG/default/300_init_archive.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 30_init_archive.sh +# 300_init_archive.sh # Do we have Borg binary? has_binary borg diff --git a/usr/share/rear/prep/DP/default/40_prep_dp.sh b/usr/share/rear/prep/DP/default/400_prep_dp.sh similarity index 100% rename from usr/share/rear/prep/DP/default/40_prep_dp.sh rename to usr/share/rear/prep/DP/default/400_prep_dp.sh diff --git a/usr/share/rear/prep/DP/default/45_check_dp_client_configured.sh b/usr/share/rear/prep/DP/default/450_check_dp_client_configured.sh similarity index 93% rename from usr/share/rear/prep/DP/default/45_check_dp_client_configured.sh rename to usr/share/rear/prep/DP/default/450_check_dp_client_configured.sh index e6f2e74456..87da988404 100644 --- a/usr/share/rear/prep/DP/default/45_check_dp_client_configured.sh +++ b/usr/share/rear/prep/DP/default/450_check_dp_client_configured.sh @@ -1,4 +1,4 @@ -# 45_check_dp_client_configured.sh +# 450_check_dp_client_configured.sh # this script has a simple goal: check if this client system has been properly # defined on the DP cell server and that a backup specification has been # made for this client - no more no less diff --git a/usr/share/rear/prep/DUPLICITY/default/05_prep_duplicity.sh b/usr/share/rear/prep/DUPLICITY/default/050_prep_duplicity.sh similarity index 100% rename from usr/share/rear/prep/DUPLICITY/default/05_prep_duplicity.sh rename to usr/share/rear/prep/DUPLICITY/default/050_prep_duplicity.sh diff --git a/usr/share/rear/prep/DUPLICITY/default/20_find_duply_profile.sh b/usr/share/rear/prep/DUPLICITY/default/200_find_duply_profile.sh similarity index 96% rename from usr/share/rear/prep/DUPLICITY/default/20_find_duply_profile.sh rename to usr/share/rear/prep/DUPLICITY/default/200_find_duply_profile.sh index 9357b32d06..b9e21de2d1 100644 --- a/usr/share/rear/prep/DUPLICITY/default/20_find_duply_profile.sh +++ b/usr/share/rear/prep/DUPLICITY/default/200_find_duply_profile.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. -# 20_find_duply_profile.sh (use 20 as with 10 we would loose our DUPLY_PROFILE setting) +# 200_find_duply_profile.sh (use 20 as with 10 we would loose our DUPLY_PROFILE setting) # purpose is to see we're using duply wrapper and if there is an existing profile defined # if that is the case then we define an internal variable DUPLY_PROFILE="profile" diff --git a/usr/share/rear/prep/DUPLICITY/default/22_define_backup_prog.sh b/usr/share/rear/prep/DUPLICITY/default/220_define_backup_prog.sh similarity index 100% rename from usr/share/rear/prep/DUPLICITY/default/22_define_backup_prog.sh rename to usr/share/rear/prep/DUPLICITY/default/220_define_backup_prog.sh diff --git a/usr/share/rear/prep/DUPLICITY/default/25_find_all_libs.sh b/usr/share/rear/prep/DUPLICITY/default/250_find_all_libs.sh similarity index 98% rename from usr/share/rear/prep/DUPLICITY/default/25_find_all_libs.sh rename to usr/share/rear/prep/DUPLICITY/default/250_find_all_libs.sh index 0ae1c3ab51..0bedf0c2e2 100644 --- a/usr/share/rear/prep/DUPLICITY/default/25_find_all_libs.sh +++ b/usr/share/rear/prep/DUPLICITY/default/250_find_all_libs.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. -# 25_find_all_libs.sh +# 250_find_all_libs.sh # This is to FInd Out Missing Librarys with Strace, if Strace isnt installed this is skipped # Check if Strace Readlink File Is available and Backup_PROG=Duply diff --git a/usr/share/rear/prep/EXTERNAL/default/05_check_external.sh b/usr/share/rear/prep/EXTERNAL/default/050_check_external.sh similarity index 100% rename from usr/share/rear/prep/EXTERNAL/default/05_check_external.sh rename to usr/share/rear/prep/EXTERNAL/default/050_check_external.sh diff --git a/usr/share/rear/prep/FDRUPSTREAM/default/40_prep_fdrupstream.sh b/usr/share/rear/prep/FDRUPSTREAM/default/400_prep_fdrupstream.sh similarity index 100% rename from usr/share/rear/prep/FDRUPSTREAM/default/40_prep_fdrupstream.sh rename to usr/share/rear/prep/FDRUPSTREAM/default/400_prep_fdrupstream.sh diff --git a/usr/share/rear/prep/GALAXY/default/40_prep_galaxy.sh b/usr/share/rear/prep/GALAXY/default/400_prep_galaxy.sh similarity index 100% rename from usr/share/rear/prep/GALAXY/default/40_prep_galaxy.sh rename to usr/share/rear/prep/GALAXY/default/400_prep_galaxy.sh diff --git a/usr/share/rear/prep/GALAXY10/default/40_prep_galaxy.sh b/usr/share/rear/prep/GALAXY10/default/400_prep_galaxy.sh similarity index 100% rename from usr/share/rear/prep/GALAXY10/default/40_prep_galaxy.sh rename to usr/share/rear/prep/GALAXY10/default/400_prep_galaxy.sh diff --git a/usr/share/rear/prep/GALAXY7/default/40_prep_galaxy.sh b/usr/share/rear/prep/GALAXY7/default/400_prep_galaxy.sh similarity index 100% rename from usr/share/rear/prep/GALAXY7/default/40_prep_galaxy.sh rename to usr/share/rear/prep/GALAXY7/default/400_prep_galaxy.sh diff --git a/usr/share/rear/prep/GNU/Linux/20_include_getty.sh b/usr/share/rear/prep/GNU/Linux/200_include_getty.sh similarity index 87% rename from usr/share/rear/prep/GNU/Linux/20_include_getty.sh rename to usr/share/rear/prep/GNU/Linux/200_include_getty.sh index 8d515d32ce..65ecf3a132 100644 --- a/usr/share/rear/prep/GNU/Linux/20_include_getty.sh +++ b/usr/share/rear/prep/GNU/Linux/200_include_getty.sh @@ -1,4 +1,4 @@ -# 20_include_getty.sh +# 200_include_getty.sh # investigate which getty this system has in use and add it to the REQUIRED_PROGS array # older Linux distro's use usually mingetty, but newer ones stick to agetty to spawn ttys # except debian and ubuntu who are using getty instead @@ -12,5 +12,5 @@ pgrep -nx getty 1>/dev/null && REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}" getty # if above commands do not find any getty in the process tables (which is posssible thanks # to systemd stuff) then we have a fall back as these getty's are also defined in the # PROGS array in conf/GNU/Linux.conf -# Script build/GNU/Linux/45_symlink_mingetty.sh will link a getty to mingetty to foresee +# Script build/GNU/Linux/450_symlink_mingetty.sh will link a getty to mingetty to foresee # backwards compatibility diff --git a/usr/share/rear/prep/GNU/Linux/20_include_serial_console.sh b/usr/share/rear/prep/GNU/Linux/200_include_serial_console.sh similarity index 93% rename from usr/share/rear/prep/GNU/Linux/20_include_serial_console.sh rename to usr/share/rear/prep/GNU/Linux/200_include_serial_console.sh index ad17ed9e86..4b66c968bf 100644 --- a/usr/share/rear/prep/GNU/Linux/20_include_serial_console.sh +++ b/usr/share/rear/prep/GNU/Linux/200_include_serial_console.sh @@ -20,7 +20,7 @@ elif has_binary agetty; then else # being desperate (not sure this is the best choice?) BugError "Could not find a suitable (a)getty for serial console. Please fix -$SHARE_DIR/prep/GNU/Linux/20_include_agetty.sh" +$SHARE_DIR/prep/GNU/Linux/200_include_serial_console.sh" fi REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}" "${GETTY}" stty ) diff --git a/usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh b/usr/share/rear/prep/GNU/Linux/210_include_dhclient.sh similarity index 98% rename from usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh rename to usr/share/rear/prep/GNU/Linux/210_include_dhclient.sh index cf5541e2a8..53902e3a19 100644 --- a/usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh +++ b/usr/share/rear/prep/GNU/Linux/210_include_dhclient.sh @@ -91,7 +91,7 @@ PROGS=( "${PROGS[@]}" arping ipcalc usleep "${dhclients[@]}" ) if [ ! -z "$USE_DHCLIENT" ]; then REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}" $DHCLIENT_BIN $DHCLIENT6_BIN ) cat - <> "$ROOTFS_DIR/etc/rear/rescue.conf" -# The following 3 lines were added through 21_include_dhclient.sh +# The following 3 lines were added through 210_include_dhclient.sh USE_DHCLIENT=$USE_DHCLIENT DHCLIENT_BIN=$DHCLIENT_BIN DHCLIENT6_BIN=$DHCLIENT6_BIN diff --git a/usr/share/rear/prep/GNU/Linux/22_include_lvm_tools.sh b/usr/share/rear/prep/GNU/Linux/220_include_lvm_tools.sh similarity index 100% rename from usr/share/rear/prep/GNU/Linux/22_include_lvm_tools.sh rename to usr/share/rear/prep/GNU/Linux/220_include_lvm_tools.sh diff --git a/usr/share/rear/prep/GNU/Linux/23_include_md_tools.sh b/usr/share/rear/prep/GNU/Linux/230_include_md_tools.sh similarity index 100% rename from usr/share/rear/prep/GNU/Linux/23_include_md_tools.sh rename to usr/share/rear/prep/GNU/Linux/230_include_md_tools.sh diff --git a/usr/share/rear/prep/GNU/Linux/24_include_multipath_tools.sh b/usr/share/rear/prep/GNU/Linux/240_include_multipath_tools.sh similarity index 88% rename from usr/share/rear/prep/GNU/Linux/24_include_multipath_tools.sh rename to usr/share/rear/prep/GNU/Linux/240_include_multipath_tools.sh index 6aeaa4fd68..733a7415ed 100644 --- a/usr/share/rear/prep/GNU/Linux/24_include_multipath_tools.sh +++ b/usr/share/rear/prep/GNU/Linux/240_include_multipath_tools.sh @@ -1,4 +1,4 @@ -# 24_include_multipath_tools.sh +# 240_include_multipath_tools.sh # Boot Over SAN executables and other goodies [[ $BOOT_OVER_SAN != ^[yY1] ]] && return diff --git a/usr/share/rear/prep/GNU/Linux/28_include_systemd.sh b/usr/share/rear/prep/GNU/Linux/280_include_systemd.sh similarity index 100% rename from usr/share/rear/prep/GNU/Linux/28_include_systemd.sh rename to usr/share/rear/prep/GNU/Linux/280_include_systemd.sh diff --git a/usr/share/rear/prep/GNU/Linux/28_include_vmware_tools.sh b/usr/share/rear/prep/GNU/Linux/280_include_vmware_tools.sh similarity index 100% rename from usr/share/rear/prep/GNU/Linux/28_include_vmware_tools.sh rename to usr/share/rear/prep/GNU/Linux/280_include_vmware_tools.sh diff --git a/usr/share/rear/prep/GNU/Linux/29_include_drbd.sh b/usr/share/rear/prep/GNU/Linux/290_include_drbd.sh similarity index 100% rename from usr/share/rear/prep/GNU/Linux/29_include_drbd.sh rename to usr/share/rear/prep/GNU/Linux/290_include_drbd.sh diff --git a/usr/share/rear/prep/GNU/Linux/30_check_backup_and_output_url.sh b/usr/share/rear/prep/GNU/Linux/300_check_backup_and_output_url.sh similarity index 88% rename from usr/share/rear/prep/GNU/Linux/30_check_backup_and_output_url.sh rename to usr/share/rear/prep/GNU/Linux/300_check_backup_and_output_url.sh index a77b6f9bfa..ebf8315bfd 100644 --- a/usr/share/rear/prep/GNU/Linux/30_check_backup_and_output_url.sh +++ b/usr/share/rear/prep/GNU/Linux/300_check_backup_and_output_url.sh @@ -1,7 +1,7 @@ # Check file:// tape:// usb:// BACKUP_URL and OUTPUT_URL for incorrect usage -# Use generic wording in error messages because prep/default/02_translate_url.sh +# Use generic wording in error messages because prep/default/020_translate_url.sh # may translate a BACKUP_URL into an OUTPUT_URL so that errors in a BACKUP_URL # may appear when testing the translated/derived OUTPUT_URL # see https://github.com/rear/rear/issues/925 @@ -11,7 +11,7 @@ # with COMMAND || Error ... # See lib/global-functions.sh what the url_* functions actually result and -# see prep/NETFS/default/05_check_NETFS_requirements.sh for vaild BACKUP_URLs +# see prep/NETFS/default/050_check_NETFS_requirements.sh for vaild BACKUP_URLs local url="" for url in "$BACKUP_URL" "$OUTPUT_URL" ; do diff --git a/usr/share/rear/prep/GNU/Linux/30_include_grub_tools.sh b/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh similarity index 100% rename from usr/share/rear/prep/GNU/Linux/30_include_grub_tools.sh rename to usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh diff --git a/usr/share/rear/prep/GNU/Linux/31_include_cap_utils.sh b/usr/share/rear/prep/GNU/Linux/310_include_cap_utils.sh similarity index 100% rename from usr/share/rear/prep/GNU/Linux/31_include_cap_utils.sh rename to usr/share/rear/prep/GNU/Linux/310_include_cap_utils.sh diff --git a/usr/share/rear/prep/ISO/GNU/Linux/32_verify_mkisofs.sh b/usr/share/rear/prep/ISO/GNU/Linux/320_verify_mkisofs.sh similarity index 100% rename from usr/share/rear/prep/ISO/GNU/Linux/32_verify_mkisofs.sh rename to usr/share/rear/prep/ISO/GNU/Linux/320_verify_mkisofs.sh diff --git a/usr/share/rear/prep/ISO/GNU/Linux/34_add_isofs_module.sh b/usr/share/rear/prep/ISO/GNU/Linux/340_add_isofs_module.sh similarity index 100% rename from usr/share/rear/prep/ISO/GNU/Linux/34_add_isofs_module.sh rename to usr/share/rear/prep/ISO/GNU/Linux/340_add_isofs_module.sh diff --git a/usr/share/rear/prep/ISO/Linux-i386/33_find_isolinux.sh b/usr/share/rear/prep/ISO/Linux-i386/330_find_isolinux.sh similarity index 100% rename from usr/share/rear/prep/ISO/Linux-i386/33_find_isolinux.sh rename to usr/share/rear/prep/ISO/Linux-i386/330_find_isolinux.sh diff --git a/usr/share/rear/prep/ISO/Linux-ia64/33_find_elilo_efi.sh b/usr/share/rear/prep/ISO/Linux-ia64/330_find_elilo_efi.sh similarity index 100% rename from usr/share/rear/prep/ISO/Linux-ia64/33_find_elilo_efi.sh rename to usr/share/rear/prep/ISO/Linux-ia64/330_find_elilo_efi.sh diff --git a/usr/share/rear/prep/ISO/Linux-ia64/34_define_console_ia64.sh b/usr/share/rear/prep/ISO/Linux-ia64/340_define_console_ia64.sh similarity index 100% rename from usr/share/rear/prep/ISO/Linux-ia64/34_define_console_ia64.sh rename to usr/share/rear/prep/ISO/Linux-ia64/340_define_console_ia64.sh diff --git a/usr/share/rear/prep/ISO/default/30_check_iso_dir.sh b/usr/share/rear/prep/ISO/default/300_check_iso_dir.sh similarity index 100% rename from usr/share/rear/prep/ISO/default/30_check_iso_dir.sh rename to usr/share/rear/prep/ISO/default/300_check_iso_dir.sh diff --git a/usr/share/rear/prep/ISO/default/32_check_cdrom_size.sh b/usr/share/rear/prep/ISO/default/320_check_cdrom_size.sh similarity index 95% rename from usr/share/rear/prep/ISO/default/32_check_cdrom_size.sh rename to usr/share/rear/prep/ISO/default/320_check_cdrom_size.sh index 147f5bc1a3..be49e7d540 100644 --- a/usr/share/rear/prep/ISO/default/32_check_cdrom_size.sh +++ b/usr/share/rear/prep/ISO/default/320_check_cdrom_size.sh @@ -1,4 +1,4 @@ -# 32_check_cdrom_size.sh +# 320_check_cdrom_size.sh # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. while read DEV total used available junk diff --git a/usr/share/rear/prep/NBKDC/default/40_prep_nbkdc.sh b/usr/share/rear/prep/NBKDC/default/400_prep_nbkdc.sh similarity index 100% rename from usr/share/rear/prep/NBKDC/default/40_prep_nbkdc.sh rename to usr/share/rear/prep/NBKDC/default/400_prep_nbkdc.sh diff --git a/usr/share/rear/prep/NBU/default/40_prep_nbu.sh b/usr/share/rear/prep/NBU/default/400_prep_nbu.sh similarity index 100% rename from usr/share/rear/prep/NBU/default/40_prep_nbu.sh rename to usr/share/rear/prep/NBU/default/400_prep_nbu.sh diff --git a/usr/share/rear/prep/NBU/default/45_check_nbu_client_configured.sh b/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh similarity index 100% rename from usr/share/rear/prep/NBU/default/45_check_nbu_client_configured.sh rename to usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh diff --git a/usr/share/rear/prep/NETFS/GNU/Linux/200_selinux_in_use.sh b/usr/share/rear/prep/NETFS/GNU/Linux/200_selinux_in_use.sh new file mode 120000 index 0000000000..69150ac1ba --- /dev/null +++ b/usr/share/rear/prep/NETFS/GNU/Linux/200_selinux_in_use.sh @@ -0,0 +1 @@ +../../../RSYNC/GNU/Linux/200_selinux_in_use.sh \ No newline at end of file diff --git a/usr/share/rear/prep/NETFS/GNU/Linux/20_selinux_in_use.sh b/usr/share/rear/prep/NETFS/GNU/Linux/20_selinux_in_use.sh deleted file mode 120000 index b4e1ada300..0000000000 --- a/usr/share/rear/prep/NETFS/GNU/Linux/20_selinux_in_use.sh +++ /dev/null @@ -1 +0,0 @@ -../../../RSYNC/GNU/Linux/20_selinux_in_use.sh \ No newline at end of file diff --git a/usr/share/rear/prep/NETFS/default/05_check_NETFS_requirements.sh b/usr/share/rear/prep/NETFS/default/050_check_NETFS_requirements.sh similarity index 100% rename from usr/share/rear/prep/NETFS/default/05_check_NETFS_requirements.sh rename to usr/share/rear/prep/NETFS/default/050_check_NETFS_requirements.sh diff --git a/usr/share/rear/prep/NETFS/default/060_mount_NETFS_path.sh b/usr/share/rear/prep/NETFS/default/060_mount_NETFS_path.sh new file mode 120000 index 0000000000..7995fbbfdb --- /dev/null +++ b/usr/share/rear/prep/NETFS/default/060_mount_NETFS_path.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/100_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/prep/NETFS/default/06_mount_NETFS_path.sh b/usr/share/rear/prep/NETFS/default/06_mount_NETFS_path.sh deleted file mode 120000 index 84e4486875..0000000000 --- a/usr/share/rear/prep/NETFS/default/06_mount_NETFS_path.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/10_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/prep/NETFS/default/07_set_backup_archive.sh b/usr/share/rear/prep/NETFS/default/070_set_backup_archive.sh similarity index 100% rename from usr/share/rear/prep/NETFS/default/07_set_backup_archive.sh rename to usr/share/rear/prep/NETFS/default/070_set_backup_archive.sh diff --git a/usr/share/rear/prep/NETFS/default/09_check_encrypted_backup.sh b/usr/share/rear/prep/NETFS/default/090_check_encrypted_backup.sh similarity index 100% rename from usr/share/rear/prep/NETFS/default/09_check_encrypted_backup.sh rename to usr/share/rear/prep/NETFS/default/090_check_encrypted_backup.sh diff --git a/usr/share/rear/prep/NETFS/default/10_check_nfs_version.sh b/usr/share/rear/prep/NETFS/default/100_check_nfs_version.sh similarity index 97% rename from usr/share/rear/prep/NETFS/default/10_check_nfs_version.sh rename to usr/share/rear/prep/NETFS/default/100_check_nfs_version.sh index 15fa7d52b9..2a4aadbcc3 100644 --- a/usr/share/rear/prep/NETFS/default/10_check_nfs_version.sh +++ b/usr/share/rear/prep/NETFS/default/100_check_nfs_version.sh @@ -1,4 +1,4 @@ -# 10_check_nfs_version.sh +# 100_check_nfs_version.sh # save the output of mount mount | grep nfs > "$TMP_DIR/nfs.mount.info" diff --git a/usr/share/rear/prep/NETFS/default/150_save_rsync_version.sh b/usr/share/rear/prep/NETFS/default/150_save_rsync_version.sh new file mode 100644 index 0000000000..746a833aa2 --- /dev/null +++ b/usr/share/rear/prep/NETFS/default/150_save_rsync_version.sh @@ -0,0 +1,9 @@ +case $( basename $BACKUP_PROG ) in + (rsync) + # $TMP_DIR/rsync_protocol used by 200_selinux_in_use.sh script + $BACKUP_PROG --version > "$TMP_DIR/rsync_protocol" 2>&1 + ;; + (*) + : # no action required + ;; +esac diff --git a/usr/share/rear/prep/NETFS/default/15_save_rsync_version.sh b/usr/share/rear/prep/NETFS/default/15_save_rsync_version.sh deleted file mode 100644 index 395c1f2d97..0000000000 --- a/usr/share/rear/prep/NETFS/default/15_save_rsync_version.sh +++ /dev/null @@ -1,12 +0,0 @@ -case $(basename $BACKUP_PROG) in - - (rsync) - # $TMP_DIR/rsync_protocol used by 20_selinux_in_use.sh script - $BACKUP_PROG --version > "$TMP_DIR/rsync_protocol" 2>&1 - ;; - - (*) - : # no action required - ;; - -esac diff --git a/usr/share/rear/prep/NETFS/default/40_automatic_exclude_recreate.sh b/usr/share/rear/prep/NETFS/default/400_automatic_exclude_recreate.sh similarity index 98% rename from usr/share/rear/prep/NETFS/default/40_automatic_exclude_recreate.sh rename to usr/share/rear/prep/NETFS/default/400_automatic_exclude_recreate.sh index 16cc6199a3..3481212da6 100644 --- a/usr/share/rear/prep/NETFS/default/40_automatic_exclude_recreate.sh +++ b/usr/share/rear/prep/NETFS/default/400_automatic_exclude_recreate.sh @@ -1,4 +1,4 @@ -# 40_automatic_exclude_recreate.sh +# 400_automatic_exclude_recreate.sh # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. diff --git a/usr/share/rear/prep/NETFS/default/980_umount_NETFS_dir.sh b/usr/share/rear/prep/NETFS/default/980_umount_NETFS_dir.sh new file mode 120000 index 0000000000..18d6cdb0e3 --- /dev/null +++ b/usr/share/rear/prep/NETFS/default/980_umount_NETFS_dir.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/980_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/prep/NETFS/default/98_umount_NETFS_dir.sh b/usr/share/rear/prep/NETFS/default/98_umount_NETFS_dir.sh deleted file mode 120000 index 70ebdbcc43..0000000000 --- a/usr/share/rear/prep/NETFS/default/98_umount_NETFS_dir.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/98_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/prep/NSR/default/40_prep_nsr.sh b/usr/share/rear/prep/NSR/default/400_prep_nsr.sh similarity index 100% rename from usr/share/rear/prep/NSR/default/40_prep_nsr.sh rename to usr/share/rear/prep/NSR/default/400_prep_nsr.sh diff --git a/usr/share/rear/prep/NSR/default/45_check_nsr_client.sh b/usr/share/rear/prep/NSR/default/450_check_nsr_client.sh similarity index 93% rename from usr/share/rear/prep/NSR/default/45_check_nsr_client.sh rename to usr/share/rear/prep/NSR/default/450_check_nsr_client.sh index d89afa7d9f..62b79539c7 100644 --- a/usr/share/rear/prep/NSR/default/45_check_nsr_client.sh +++ b/usr/share/rear/prep/NSR/default/450_check_nsr_client.sh @@ -1,4 +1,4 @@ -# 45_check_nsr_client.sh +# 450_check_nsr_client.sh # this script has a simple goal: check if this client system knows the networker server? Log "Backup method is NetWorker (NSR): check nsrexecd" diff --git a/usr/share/rear/prep/OBDR/BACULA/default/03_bextract_tape_device.sh b/usr/share/rear/prep/OBDR/BACULA/default/030_bextract_tape_device.sh similarity index 100% rename from usr/share/rear/prep/OBDR/BACULA/default/03_bextract_tape_device.sh rename to usr/share/rear/prep/OBDR/BACULA/default/030_bextract_tape_device.sh diff --git a/usr/share/rear/prep/OBDR/GNU/Linux/320_verify_mkisofs.sh b/usr/share/rear/prep/OBDR/GNU/Linux/320_verify_mkisofs.sh new file mode 120000 index 0000000000..9c8141bcba --- /dev/null +++ b/usr/share/rear/prep/OBDR/GNU/Linux/320_verify_mkisofs.sh @@ -0,0 +1 @@ +../../../ISO/GNU/Linux/320_verify_mkisofs.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/GNU/Linux/32_verify_mkisofs.sh b/usr/share/rear/prep/OBDR/GNU/Linux/32_verify_mkisofs.sh deleted file mode 120000 index e4133b41c6..0000000000 --- a/usr/share/rear/prep/OBDR/GNU/Linux/32_verify_mkisofs.sh +++ /dev/null @@ -1 +0,0 @@ -../../../ISO/GNU/Linux/32_verify_mkisofs.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/Linux-i386/330_find_isolinux.sh b/usr/share/rear/prep/OBDR/Linux-i386/330_find_isolinux.sh new file mode 120000 index 0000000000..11fca79d70 --- /dev/null +++ b/usr/share/rear/prep/OBDR/Linux-i386/330_find_isolinux.sh @@ -0,0 +1 @@ +../../ISO/Linux-i386/330_find_isolinux.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/Linux-i386/33_find_isolinux.sh b/usr/share/rear/prep/OBDR/Linux-i386/33_find_isolinux.sh deleted file mode 120000 index 2b52b8cc6b..0000000000 --- a/usr/share/rear/prep/OBDR/Linux-i386/33_find_isolinux.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-i386/33_find_isolinux.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/Linux-ia64/330_find_elilo_efi.sh b/usr/share/rear/prep/OBDR/Linux-ia64/330_find_elilo_efi.sh new file mode 120000 index 0000000000..68a6fe7071 --- /dev/null +++ b/usr/share/rear/prep/OBDR/Linux-ia64/330_find_elilo_efi.sh @@ -0,0 +1 @@ +../../ISO/Linux-ia64/330_find_elilo_efi.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/Linux-ia64/33_find_elilo_efi.sh b/usr/share/rear/prep/OBDR/Linux-ia64/33_find_elilo_efi.sh deleted file mode 120000 index c78412b68f..0000000000 --- a/usr/share/rear/prep/OBDR/Linux-ia64/33_find_elilo_efi.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ia64/33_find_elilo_efi.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/Linux-ia64/340_define_console_ia64.sh b/usr/share/rear/prep/OBDR/Linux-ia64/340_define_console_ia64.sh new file mode 120000 index 0000000000..e56412b248 --- /dev/null +++ b/usr/share/rear/prep/OBDR/Linux-ia64/340_define_console_ia64.sh @@ -0,0 +1 @@ +../../ISO/Linux-ia64/340_define_console_ia64.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/Linux-ia64/34_define_console_ia64.sh b/usr/share/rear/prep/OBDR/Linux-ia64/34_define_console_ia64.sh deleted file mode 120000 index 1934e6deca..0000000000 --- a/usr/share/rear/prep/OBDR/Linux-ia64/34_define_console_ia64.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/Linux-ia64/34_define_console_ia64.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/default/04_change_tape_name.sh b/usr/share/rear/prep/OBDR/default/040_change_tape_name.sh similarity index 100% rename from usr/share/rear/prep/OBDR/default/04_change_tape_name.sh rename to usr/share/rear/prep/OBDR/default/040_change_tape_name.sh diff --git a/usr/share/rear/prep/OBDR/default/300_check_iso_dir.sh b/usr/share/rear/prep/OBDR/default/300_check_iso_dir.sh new file mode 120000 index 0000000000..00d6c9a304 --- /dev/null +++ b/usr/share/rear/prep/OBDR/default/300_check_iso_dir.sh @@ -0,0 +1 @@ +../../ISO/default/300_check_iso_dir.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/default/30_check_iso_dir.sh b/usr/share/rear/prep/OBDR/default/30_check_iso_dir.sh deleted file mode 120000 index 38f17c440e..0000000000 --- a/usr/share/rear/prep/OBDR/default/30_check_iso_dir.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/default/30_check_iso_dir.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/default/320_check_cdrom_size.sh b/usr/share/rear/prep/OBDR/default/320_check_cdrom_size.sh new file mode 120000 index 0000000000..9e94543711 --- /dev/null +++ b/usr/share/rear/prep/OBDR/default/320_check_cdrom_size.sh @@ -0,0 +1 @@ +../../ISO/default/320_check_cdrom_size.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/default/32_check_cdrom_size.sh b/usr/share/rear/prep/OBDR/default/32_check_cdrom_size.sh deleted file mode 120000 index ec0c04736a..0000000000 --- a/usr/share/rear/prep/OBDR/default/32_check_cdrom_size.sh +++ /dev/null @@ -1 +0,0 @@ -../../ISO/default/32_check_cdrom_size.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/default/400_check_tape_drive.sh b/usr/share/rear/prep/OBDR/default/400_check_tape_drive.sh new file mode 120000 index 0000000000..5a96a03671 --- /dev/null +++ b/usr/share/rear/prep/OBDR/default/400_check_tape_drive.sh @@ -0,0 +1 @@ +../../TAPE/default/400_check_tape_drive.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/default/40_check_tape_drive.sh b/usr/share/rear/prep/OBDR/default/40_check_tape_drive.sh deleted file mode 120000 index 070ab0b967..0000000000 --- a/usr/share/rear/prep/OBDR/default/40_check_tape_drive.sh +++ /dev/null @@ -1 +0,0 @@ -../../TAPE/default/40_check_tape_drive.sh \ No newline at end of file diff --git a/usr/share/rear/prep/OBDR/default/50_check_tape_label.sh b/usr/share/rear/prep/OBDR/default/500_check_tape_label.sh similarity index 100% rename from usr/share/rear/prep/OBDR/default/50_check_tape_label.sh rename to usr/share/rear/prep/OBDR/default/500_check_tape_label.sh diff --git a/usr/share/rear/prep/OBDR/default/70_write_OBDR_header.sh b/usr/share/rear/prep/OBDR/default/700_write_OBDR_header.sh similarity index 100% rename from usr/share/rear/prep/OBDR/default/70_write_OBDR_header.sh rename to usr/share/rear/prep/OBDR/default/700_write_OBDR_header.sh diff --git a/usr/share/rear/prep/RBME/default/05_include_rbme_requirements.sh b/usr/share/rear/prep/RBME/default/050_include_rbme_requirements.sh similarity index 100% rename from usr/share/rear/prep/RBME/default/05_include_rbme_requirements.sh rename to usr/share/rear/prep/RBME/default/050_include_rbme_requirements.sh diff --git a/usr/share/rear/prep/RSYNC/GNU/Linux/20_selinux_in_use.sh b/usr/share/rear/prep/RSYNC/GNU/Linux/200_selinux_in_use.sh similarity index 100% rename from usr/share/rear/prep/RSYNC/GNU/Linux/20_selinux_in_use.sh rename to usr/share/rear/prep/RSYNC/GNU/Linux/200_selinux_in_use.sh diff --git a/usr/share/rear/prep/RSYNC/default/05_prep_rsync.sh b/usr/share/rear/prep/RSYNC/default/050_prep_rsync.sh similarity index 96% rename from usr/share/rear/prep/RSYNC/default/05_prep_rsync.sh rename to usr/share/rear/prep/RSYNC/default/050_prep_rsync.sh index 28aa955501..6c24f7e626 100644 --- a/usr/share/rear/prep/RSYNC/default/05_prep_rsync.sh +++ b/usr/share/rear/prep/RSYNC/default/050_prep_rsync.sh @@ -1,4 +1,4 @@ -# 05_prep_rsync.sh : prepare rsync usage +# 050_prep_rsync.sh : prepare rsync usage # define rsync as BACKUP_PROG and not tar (which is the default) # $BACKUP_PROG could contain full path to executable on purpose case $BACKUP_PROG in diff --git a/usr/share/rear/prep/RSYNC/default/10_check_rsync.sh b/usr/share/rear/prep/RSYNC/default/100_check_rsync.sh similarity index 98% rename from usr/share/rear/prep/RSYNC/default/10_check_rsync.sh rename to usr/share/rear/prep/RSYNC/default/100_check_rsync.sh index bd7f471663..9c967d219e 100644 --- a/usr/share/rear/prep/RSYNC/default/10_check_rsync.sh +++ b/usr/share/rear/prep/RSYNC/default/100_check_rsync.sh @@ -1,4 +1,4 @@ -# 10_check_rsync.sh - analyze the BACKUP_URL +# 100_check_rsync.sh - analyze the BACKUP_URL # # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. diff --git a/usr/share/rear/prep/RSYNC/default/15_check_rsync_protocol_version.sh b/usr/share/rear/prep/RSYNC/default/150_check_rsync_protocol_version.sh similarity index 98% rename from usr/share/rear/prep/RSYNC/default/15_check_rsync_protocol_version.sh rename to usr/share/rear/prep/RSYNC/default/150_check_rsync_protocol_version.sh index da5b809a2c..437bcbc747 100644 --- a/usr/share/rear/prep/RSYNC/default/15_check_rsync_protocol_version.sh +++ b/usr/share/rear/prep/RSYNC/default/150_check_rsync_protocol_version.sh @@ -1,4 +1,4 @@ -# 15_check_rsync_protocol_version.sh +# 150_check_rsync_protocol_version.sh # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # try to grab the rsync protocol version of rsync on the remote server diff --git a/usr/share/rear/prep/SESAM/default/40_prep_sesam.sh b/usr/share/rear/prep/SESAM/default/400_prep_sesam.sh similarity index 100% rename from usr/share/rear/prep/SESAM/default/40_prep_sesam.sh rename to usr/share/rear/prep/SESAM/default/400_prep_sesam.sh diff --git a/usr/share/rear/prep/TAPE/default/40_check_tape_drive.sh b/usr/share/rear/prep/TAPE/default/400_check_tape_drive.sh similarity index 100% rename from usr/share/rear/prep/TAPE/default/40_check_tape_drive.sh rename to usr/share/rear/prep/TAPE/default/400_check_tape_drive.sh diff --git a/usr/share/rear/prep/TAPE/default/50_set_tape_blocksize.sh b/usr/share/rear/prep/TAPE/default/500_set_tape_blocksize.sh similarity index 100% rename from usr/share/rear/prep/TAPE/default/50_set_tape_blocksize.sh rename to usr/share/rear/prep/TAPE/default/500_set_tape_blocksize.sh diff --git a/usr/share/rear/prep/TSM/default/40_prep_tsm.sh b/usr/share/rear/prep/TSM/default/400_prep_tsm.sh similarity index 100% rename from usr/share/rear/prep/TSM/default/40_prep_tsm.sh rename to usr/share/rear/prep/TSM/default/400_prep_tsm.sh diff --git a/usr/share/rear/prep/USB/Linux-i386/34_find_mbr_bin.sh b/usr/share/rear/prep/USB/Linux-i386/340_find_mbr_bin.sh similarity index 100% rename from usr/share/rear/prep/USB/Linux-i386/34_find_mbr_bin.sh rename to usr/share/rear/prep/USB/Linux-i386/340_find_mbr_bin.sh diff --git a/usr/share/rear/prep/USB/Linux-i386/35_check_usb_disk.sh b/usr/share/rear/prep/USB/Linux-i386/350_check_usb_disk.sh similarity index 100% rename from usr/share/rear/prep/USB/Linux-i386/35_check_usb_disk.sh rename to usr/share/rear/prep/USB/Linux-i386/350_check_usb_disk.sh diff --git a/usr/share/rear/prep/USB/Linux-i386/35_find_syslinux_modules.sh b/usr/share/rear/prep/USB/Linux-i386/350_find_syslinux_modules.sh similarity index 94% rename from usr/share/rear/prep/USB/Linux-i386/35_find_syslinux_modules.sh rename to usr/share/rear/prep/USB/Linux-i386/350_find_syslinux_modules.sh index e4f88c4719..9cea9eb9c9 100644 --- a/usr/share/rear/prep/USB/Linux-i386/35_find_syslinux_modules.sh +++ b/usr/share/rear/prep/USB/Linux-i386/350_find_syslinux_modules.sh @@ -1,4 +1,4 @@ -# 35_find_syslinux_modules.sh +# 350_find_syslinux_modules.sh # syslinux version 5 and higher moved the com32 image files to modules directories and for the moment # there are 3 forms of these (efi32, efi64 and bios) # Purpose here is to define the proper SYSLINUX_DIR (which was already defined to the path were isolinux.bin lives) diff --git a/usr/share/rear/prep/USB/Linux-i386/40_check_extlinux.sh b/usr/share/rear/prep/USB/Linux-i386/400_check_extlinux.sh similarity index 83% rename from usr/share/rear/prep/USB/Linux-i386/40_check_extlinux.sh rename to usr/share/rear/prep/USB/Linux-i386/400_check_extlinux.sh index eea712929d..6f2ab88734 100644 --- a/usr/share/rear/prep/USB/Linux-i386/40_check_extlinux.sh +++ b/usr/share/rear/prep/USB/Linux-i386/400_check_extlinux.sh @@ -1,4 +1,4 @@ -# 40_check_extlinux.sh +# 400_check_extlinux.sh if ! has_binary extlinux; then Error "Executable extlinux is missing! Please install syslinux-extlinux or alike" fi diff --git a/usr/share/rear/prep/USB/default/04_set_NETFS_requirements.sh b/usr/share/rear/prep/USB/default/040_set_NETFS_requirements.sh similarity index 100% rename from usr/share/rear/prep/USB/default/04_set_NETFS_requirements.sh rename to usr/share/rear/prep/USB/default/040_set_NETFS_requirements.sh diff --git a/usr/share/rear/prep/USB/default/06_set_usb_device.sh b/usr/share/rear/prep/USB/default/060_set_usb_device.sh similarity index 100% rename from usr/share/rear/prep/USB/default/06_set_usb_device.sh rename to usr/share/rear/prep/USB/default/060_set_usb_device.sh diff --git a/usr/share/rear/prep/USB/default/38_copy_usb_fs_module.sh b/usr/share/rear/prep/USB/default/380_copy_usb_fs_module.sh similarity index 100% rename from usr/share/rear/prep/USB/default/38_copy_usb_fs_module.sh rename to usr/share/rear/prep/USB/default/380_copy_usb_fs_module.sh diff --git a/usr/share/rear/prep/default/00_remove_workflow_conf.sh b/usr/share/rear/prep/default/005_remove_workflow_conf.sh similarity index 100% rename from usr/share/rear/prep/default/00_remove_workflow_conf.sh rename to usr/share/rear/prep/default/005_remove_workflow_conf.sh diff --git a/usr/share/rear/prep/default/02_translate_url.sh b/usr/share/rear/prep/default/020_translate_url.sh similarity index 100% rename from usr/share/rear/prep/default/02_translate_url.sh rename to usr/share/rear/prep/default/020_translate_url.sh diff --git a/usr/share/rear/prep/default/03_translate_tape.sh b/usr/share/rear/prep/default/030_translate_tape.sh similarity index 100% rename from usr/share/rear/prep/default/03_translate_tape.sh rename to usr/share/rear/prep/default/030_translate_tape.sh diff --git a/usr/share/rear/prep/default/04_check_output_scheme.sh b/usr/share/rear/prep/default/040_check_output_scheme.sh similarity index 100% rename from usr/share/rear/prep/default/04_check_output_scheme.sh rename to usr/share/rear/prep/default/040_check_output_scheme.sh diff --git a/usr/share/rear/prep/default/05_check_keep_old_output_copy_var.sh b/usr/share/rear/prep/default/050_check_keep_old_output_copy_var.sh similarity index 100% rename from usr/share/rear/prep/default/05_check_keep_old_output_copy_var.sh rename to usr/share/rear/prep/default/050_check_keep_old_output_copy_var.sh diff --git a/usr/share/rear/prep/default/10_init_workflow_conf.sh b/usr/share/rear/prep/default/100_init_workflow_conf.sh similarity index 100% rename from usr/share/rear/prep/default/10_init_workflow_conf.sh rename to usr/share/rear/prep/default/100_init_workflow_conf.sh diff --git a/usr/share/rear/prep/default/31_include_uefi_tools.sh b/usr/share/rear/prep/default/310_include_uefi_tools.sh similarity index 100% rename from usr/share/rear/prep/default/31_include_uefi_tools.sh rename to usr/share/rear/prep/default/310_include_uefi_tools.sh diff --git a/usr/share/rear/prep/default/32_include_uefi_env.sh b/usr/share/rear/prep/default/320_include_uefi_env.sh similarity index 100% rename from usr/share/rear/prep/default/32_include_uefi_env.sh rename to usr/share/rear/prep/default/320_include_uefi_env.sh diff --git a/usr/share/rear/prep/default/40_save_mountpoint_details.sh b/usr/share/rear/prep/default/400_save_mountpoint_details.sh similarity index 84% rename from usr/share/rear/prep/default/40_save_mountpoint_details.sh rename to usr/share/rear/prep/default/400_save_mountpoint_details.sh index 27de0c3a20..d891cbca11 100644 --- a/usr/share/rear/prep/default/40_save_mountpoint_details.sh +++ b/usr/share/rear/prep/default/400_save_mountpoint_details.sh @@ -1,8 +1,8 @@ -# 40_save_mountpoint_details.sh +# 400_save_mountpoint_details.sh # Purpose of this script is to save the ownership and permissions of the mount points in a file # That file will be read during recovery time to recreate missing directories and set up the proper # permissions again (for the moment it is scattered across different flows) -# Script restore/default/90_create_missing_directories.sh will recreate the missing dirs (all other +# Script restore/default/900_create_missing_directories.sh will recreate the missing dirs (all other # script may be deleted) : > "$VAR_DIR/recovery/mountpoint_permissions" diff --git a/usr/share/rear/prep/default/50_guess_bootloader.sh b/usr/share/rear/prep/default/500_guess_bootloader.sh similarity index 100% rename from usr/share/rear/prep/default/50_guess_bootloader.sh rename to usr/share/rear/prep/default/500_guess_bootloader.sh diff --git a/usr/share/rear/prep/default/95_check_missing_programs.sh b/usr/share/rear/prep/default/950_check_missing_programs.sh similarity index 100% rename from usr/share/rear/prep/default/95_check_missing_programs.sh rename to usr/share/rear/prep/default/950_check_missing_programs.sh diff --git a/usr/share/rear/rescue/DP/default/45_prepare_omni_xinetd.sh b/usr/share/rear/rescue/DP/default/450_prepare_omni_xinetd.sh similarity index 100% rename from usr/share/rear/rescue/DP/default/45_prepare_omni_xinetd.sh rename to usr/share/rear/rescue/DP/default/450_prepare_omni_xinetd.sh diff --git a/usr/share/rear/rescue/GALAXY10/default/60_add_galaxy_group.sh b/usr/share/rear/rescue/GALAXY10/default/600_add_galaxy_group.sh similarity index 100% rename from usr/share/rear/rescue/GALAXY10/default/60_add_galaxy_group.sh rename to usr/share/rear/rescue/GALAXY10/default/600_add_galaxy_group.sh diff --git a/usr/share/rear/rescue/GALAXY7/default/60_add_galaxy_group.sh b/usr/share/rear/rescue/GALAXY7/default/600_add_galaxy_group.sh similarity index 100% rename from usr/share/rear/rescue/GALAXY7/default/60_add_galaxy_group.sh rename to usr/share/rear/rescue/GALAXY7/default/600_add_galaxy_group.sh diff --git a/usr/share/rear/rescue/GNU/Linux/23_storage_and_network_modules.sh b/usr/share/rear/rescue/GNU/Linux/230_storage_and_network_modules.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/23_storage_and_network_modules.sh rename to usr/share/rear/rescue/GNU/Linux/230_storage_and_network_modules.sh diff --git a/usr/share/rear/rescue/GNU/Linux/24_kernel_modules.sh b/usr/share/rear/rescue/GNU/Linux/240_kernel_modules.sh similarity index 96% rename from usr/share/rear/rescue/GNU/Linux/24_kernel_modules.sh rename to usr/share/rear/rescue/GNU/Linux/240_kernel_modules.sh index 7b1ea174e3..093c180b90 100644 --- a/usr/share/rear/rescue/GNU/Linux/24_kernel_modules.sh +++ b/usr/share/rear/rescue/GNU/Linux/240_kernel_modules.sh @@ -1,4 +1,4 @@ -# 40_kernel_modules.sh +# 400_kernel_modules.sh # # find kernel and modules for Relax-and-Recover # diff --git a/usr/share/rear/rescue/GNU/Linux/25_udev.sh b/usr/share/rear/rescue/GNU/Linux/250_udev.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/25_udev.sh rename to usr/share/rear/rescue/GNU/Linux/250_udev.sh diff --git a/usr/share/rear/rescue/GNU/Linux/26_collect_initrd_modules.sh b/usr/share/rear/rescue/GNU/Linux/260_collect_initrd_modules.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/26_collect_initrd_modules.sh rename to usr/share/rear/rescue/GNU/Linux/260_collect_initrd_modules.sh diff --git a/usr/share/rear/rescue/GNU/Linux/26_storage_drivers.sh b/usr/share/rear/rescue/GNU/Linux/260_storage_drivers.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/26_storage_drivers.sh rename to usr/share/rear/rescue/GNU/Linux/260_storage_drivers.sh diff --git a/usr/share/rear/rescue/GNU/Linux/27_fc_transport_info.sh b/usr/share/rear/rescue/GNU/Linux/270_fc_transport_info.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/27_fc_transport_info.sh rename to usr/share/rear/rescue/GNU/Linux/270_fc_transport_info.sh diff --git a/usr/share/rear/rescue/GNU/Linux/30_dns.sh b/usr/share/rear/rescue/GNU/Linux/300_dns.sh similarity index 95% rename from usr/share/rear/rescue/GNU/Linux/30_dns.sh rename to usr/share/rear/rescue/GNU/Linux/300_dns.sh index d62510578f..b383e7aeae 100644 --- a/usr/share/rear/rescue/GNU/Linux/30_dns.sh +++ b/usr/share/rear/rescue/GNU/Linux/300_dns.sh @@ -1,4 +1,4 @@ -# 30_dns.sh +# 300_dns.sh # # copy resolver info for Relax-and-Recover # diff --git a/usr/share/rear/rescue/GNU/Linux/31_network_devices.sh b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh similarity index 98% rename from usr/share/rear/rescue/GNU/Linux/31_network_devices.sh rename to usr/share/rear/rescue/GNU/Linux/310_network_devices.sh index cb6ab36251..5f9f00e5d3 100644 --- a/usr/share/rear/rescue/GNU/Linux/31_network_devices.sh +++ b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh @@ -1,4 +1,4 @@ -# 31_network_devices.sh +# 310_network_devices.sh # # record network device configuration for Relax-and-Recover # @@ -17,12 +17,12 @@ # is run to setup the network devices: network_devices_setup_script=$ROOTFS_DIR/etc/scripts/system-setup.d/60-network-devices.sh -# This script (rescue/GNU/Linux/31_network_devices.sh) is intended to +# This script (rescue/GNU/Linux/310_network_devices.sh) is intended to # autogenerate network devices setup code in the network_devices_setup_script # according to the network devices setup in the currently running system # to get an automated network devices setup in the rescue/recovery system # that matches the network devices setup in the currently running system. -# This 31_network_devices.sh script should always run completely until its end +# This 310_network_devices.sh script should always run completely until its end # to acieve that the network_devices_setup_script contains autogenerated code # for a complete network devices setup that matches the currently running system. # Therefore the autogenerated code in the network_devices_setup_script @@ -328,7 +328,7 @@ else # Die Konfiguration des zweiten Devices schlaegt fehl und dieses laesst sich auch nicht manuell # nachinstallieren. Daher wurde diese script so angepasst, dass die Rear-Iso-Datei kein Bonding # konfiguriert, sondern die jeweiligen IP-Adressen einer Netzwerkkarte des Bondingdevices - # zuordnet. Dadurch musste aber auch das script 35_routing.sh angepasst werden. + # zuordnet. Dadurch musste aber auch das script 350_routing.sh angepasst werden. # # Go over bondX and record information: bonding_interface_number=0 diff --git a/usr/share/rear/rescue/GNU/Linux/32_inet6.sh b/usr/share/rear/rescue/GNU/Linux/320_inet6.sh similarity index 87% rename from usr/share/rear/rescue/GNU/Linux/32_inet6.sh rename to usr/share/rear/rescue/GNU/Linux/320_inet6.sh index 64c34703ea..4f4e2cf6ce 100644 --- a/usr/share/rear/rescue/GNU/Linux/32_inet6.sh +++ b/usr/share/rear/rescue/GNU/Linux/320_inet6.sh @@ -1,4 +1,4 @@ -# 32_inet6.sh +# 320_inet6.sh if [[ -f /proc/net/if_inet6 ]]; then cat $v /proc/net/if_inet6 > "$VAR_DIR/recovery/if_inet6" >&2 diff --git a/usr/share/rear/rescue/GNU/Linux/35_routing.sh b/usr/share/rear/rescue/GNU/Linux/350_routing.sh similarity index 99% rename from usr/share/rear/rescue/GNU/Linux/35_routing.sh rename to usr/share/rear/rescue/GNU/Linux/350_routing.sh index 117b7d9fde..e9fbdaebfc 100644 --- a/usr/share/rear/rescue/GNU/Linux/35_routing.sh +++ b/usr/share/rear/rescue/GNU/Linux/350_routing.sh @@ -1,4 +1,4 @@ -# 35_routing.sh +# 350_routing.sh # # record routing configuration for Relax-and-Recover # diff --git a/usr/share/rear/rescue/GNU/Linux/36_teaming.sh b/usr/share/rear/rescue/GNU/Linux/360_teaming.sh similarity index 98% rename from usr/share/rear/rescue/GNU/Linux/36_teaming.sh rename to usr/share/rear/rescue/GNU/Linux/360_teaming.sh index 116f0ea802..490140aa6e 100644 --- a/usr/share/rear/rescue/GNU/Linux/36_teaming.sh +++ b/usr/share/rear/rescue/GNU/Linux/360_teaming.sh @@ -1,4 +1,4 @@ -# 36_teaming.sh +# 360_teaming.sh # # record teaming information (network and routing) for Relax-and-Recover # @@ -77,7 +77,7 @@ do echo "ip link set dev ${FIRST_PORT} mtu ${PORT_MTU}" >>${netscript} fi - # catch the routing for the teaming interface as we disabled it in 35_routing.sh + # catch the routing for the teaming interface as we disabled it in 350_routing.sh for table in $( { echo "254 main" ; cat /etc/iproute2/rt_tables ; } |\ grep -E '^[0-9]+' |\ tr -s " \t" " " |\ diff --git a/usr/share/rear/rescue/GNU/Linux/39_check_usb_modules.sh b/usr/share/rear/rescue/GNU/Linux/390_check_usb_modules.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/39_check_usb_modules.sh rename to usr/share/rear/rescue/GNU/Linux/390_check_usb_modules.sh diff --git a/usr/share/rear/rescue/GNU/Linux/40_use_serial_console.sh b/usr/share/rear/rescue/GNU/Linux/400_use_serial_console.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/40_use_serial_console.sh rename to usr/share/rear/rescue/GNU/Linux/400_use_serial_console.sh diff --git a/usr/share/rear/rescue/GNU/Linux/41_use_xen_console.sh b/usr/share/rear/rescue/GNU/Linux/410_use_xen_console.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/41_use_xen_console.sh rename to usr/share/rear/rescue/GNU/Linux/410_use_xen_console.sh diff --git a/usr/share/rear/rescue/GNU/Linux/50_clone_keyboard_mappings.sh b/usr/share/rear/rescue/GNU/Linux/500_clone_keyboard_mappings.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/50_clone_keyboard_mappings.sh rename to usr/share/rear/rescue/GNU/Linux/500_clone_keyboard_mappings.sh diff --git a/usr/share/rear/rescue/GNU/Linux/55_copy_ldconfig.sh b/usr/share/rear/rescue/GNU/Linux/550_copy_ldconfig.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/55_copy_ldconfig.sh rename to usr/share/rear/rescue/GNU/Linux/550_copy_ldconfig.sh diff --git a/usr/share/rear/rescue/GNU/Linux/60_unset_TMPDIR_in_rescue_conf.sh b/usr/share/rear/rescue/GNU/Linux/600_unset_TMPDIR_in_rescue_conf.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/60_unset_TMPDIR_in_rescue_conf.sh rename to usr/share/rear/rescue/GNU/Linux/600_unset_TMPDIR_in_rescue_conf.sh diff --git a/usr/share/rear/rescue/GNU/Linux/95_cfg2html.sh b/usr/share/rear/rescue/GNU/Linux/950_cfg2html.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/95_cfg2html.sh rename to usr/share/rear/rescue/GNU/Linux/950_cfg2html.sh diff --git a/usr/share/rear/rescue/GNU/Linux/96_collect_MC_serviceguard_infos.sh b/usr/share/rear/rescue/GNU/Linux/960_collect_MC_serviceguard_infos.sh similarity index 96% rename from usr/share/rear/rescue/GNU/Linux/96_collect_MC_serviceguard_infos.sh rename to usr/share/rear/rescue/GNU/Linux/960_collect_MC_serviceguard_infos.sh index 38e917a185..9115c51f70 100644 --- a/usr/share/rear/rescue/GNU/Linux/96_collect_MC_serviceguard_infos.sh +++ b/usr/share/rear/rescue/GNU/Linux/960_collect_MC_serviceguard_infos.sh @@ -1,4 +1,4 @@ -# 96_collect_MC_serviceguard_infos.sh +# 960_collect_MC_serviceguard_infos.sh # Purpose of this script is to gather MC/SG related config files # in order to prepare a smooth rolling upgrade diff --git a/usr/share/rear/rescue/GNU/Linux/99_sysreqs.sh b/usr/share/rear/rescue/GNU/Linux/990_sysreqs.sh similarity index 100% rename from usr/share/rear/rescue/GNU/Linux/99_sysreqs.sh rename to usr/share/rear/rescue/GNU/Linux/990_sysreqs.sh diff --git a/usr/share/rear/rescue/Linux-ppc64/41_use_hvc_console.sh b/usr/share/rear/rescue/Linux-ppc64/410_use_hvc_console.sh similarity index 100% rename from usr/share/rear/rescue/Linux-ppc64/41_use_hvc_console.sh rename to usr/share/rear/rescue/Linux-ppc64/410_use_hvc_console.sh diff --git a/usr/share/rear/rescue/Linux-ppc64le/41_use_hvc_console.sh b/usr/share/rear/rescue/Linux-ppc64le/410_use_hvc_console.sh similarity index 100% rename from usr/share/rear/rescue/Linux-ppc64le/41_use_hvc_console.sh rename to usr/share/rear/rescue/Linux-ppc64le/410_use_hvc_console.sh diff --git a/usr/share/rear/rescue/NBU/default/45_prepare_netbackup.sh b/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh similarity index 95% rename from usr/share/rear/rescue/NBU/default/45_prepare_netbackup.sh rename to usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh index 927489af2a..d6f36b763b 100644 --- a/usr/share/rear/rescue/NBU/default/45_prepare_netbackup.sh +++ b/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh @@ -1,4 +1,4 @@ -# 45_prepare_netbackup.sh +# 450_prepare_netbackup.sh # prepare environment for NBU (only if NBU version >=7.x) [ -f /usr/openv/netbackup/bin/version ] && \ diff --git a/usr/share/rear/rescue/NBU/default/45_prepare_xinetd.sh b/usr/share/rear/rescue/NBU/default/450_prepare_xinetd.sh similarity index 97% rename from usr/share/rear/rescue/NBU/default/45_prepare_xinetd.sh rename to usr/share/rear/rescue/NBU/default/450_prepare_xinetd.sh index 9b5788c0ca..dcdd075ac8 100644 --- a/usr/share/rear/rescue/NBU/default/45_prepare_xinetd.sh +++ b/usr/share/rear/rescue/NBU/default/450_prepare_xinetd.sh @@ -1,4 +1,4 @@ -# 45_prepare_xinetd.sh +# 450_prepare_xinetd.sh # prepare environment for xinetd for NBU services (only if NBU version <7.x) # NBU only supports RHEL/SLES distributions and both use xinetd daemon diff --git a/usr/share/rear/rescue/NETFS/default/60_store_NETFS_variables.sh b/usr/share/rear/rescue/NETFS/default/600_store_NETFS_variables.sh similarity index 100% rename from usr/share/rear/rescue/NETFS/default/60_store_NETFS_variables.sh rename to usr/share/rear/rescue/NETFS/default/600_store_NETFS_variables.sh diff --git a/usr/share/rear/rescue/NETFS/default/61_save_capabilities.sh b/usr/share/rear/rescue/NETFS/default/610_save_capabilities.sh similarity index 100% rename from usr/share/rear/rescue/NETFS/default/61_save_capabilities.sh rename to usr/share/rear/rescue/NETFS/default/610_save_capabilities.sh diff --git a/usr/share/rear/rescue/NSR/default/45_prepare_networker_startup.sh b/usr/share/rear/rescue/NSR/default/450_prepare_networker_startup.sh similarity index 94% rename from usr/share/rear/rescue/NSR/default/45_prepare_networker_startup.sh rename to usr/share/rear/rescue/NSR/default/450_prepare_networker_startup.sh index 0a227d7494..91b38a5e2b 100644 --- a/usr/share/rear/rescue/NSR/default/45_prepare_networker_startup.sh +++ b/usr/share/rear/rescue/NSR/default/450_prepare_networker_startup.sh @@ -1,4 +1,4 @@ -# 45_prepare_networker_startup.sh +# 450_prepare_networker_startup.sh # make sure nsrecexd gets started up in the rescue image cat >$ROOTFS_DIR/etc/scripts/system-setup.d/90-networker.sh <<-EOF diff --git a/usr/share/rear/rescue/NSR/default/46_save_nsr_server_name.sh b/usr/share/rear/rescue/NSR/default/460_save_nsr_server_name.sh similarity index 95% rename from usr/share/rear/rescue/NSR/default/46_save_nsr_server_name.sh rename to usr/share/rear/rescue/NSR/default/460_save_nsr_server_name.sh index 1a802c74c6..61ca258805 100644 --- a/usr/share/rear/rescue/NSR/default/46_save_nsr_server_name.sh +++ b/usr/share/rear/rescue/NSR/default/460_save_nsr_server_name.sh @@ -1,4 +1,4 @@ -# 46_save_nsr_server_name.sh +# 460_save_nsr_server_name.sh if [[ ! -z "$NSRSERVER" ]]; then : # do nothing elif [[ -f $NSR_ROOT_DIR/res/servers ]]; then diff --git a/usr/share/rear/rescue/NSR/default/47_safe_filesystems.sh b/usr/share/rear/rescue/NSR/default/470_safe_filesystems.sh similarity index 92% rename from usr/share/rear/rescue/NSR/default/47_safe_filesystems.sh rename to usr/share/rear/rescue/NSR/default/470_safe_filesystems.sh index 5798fffa78..0129dc1ccd 100644 --- a/usr/share/rear/rescue/NSR/default/47_safe_filesystems.sh +++ b/usr/share/rear/rescue/NSR/default/470_safe_filesystems.sh @@ -1,4 +1,4 @@ -# 47_safe_filesystems.sh +# 470_safe_filesystems.sh savefs -p -s $NSRSERVER 2>&1 | awk -F '(=|,)' '/path/ { printf ("%s ", $2) }' > $VAR_DIR/recovery/nsr_paths [[ ! -s $VAR_DIR/recovery/nsr_paths ]] && Error "The savefs command could not retrieve the \"save sets\" from this client" diff --git a/usr/share/rear/rescue/RSYNC/default/60_store_RSYNC_variables.sh b/usr/share/rear/rescue/RSYNC/default/600_store_RSYNC_variables.sh similarity index 100% rename from usr/share/rear/rescue/RSYNC/default/60_store_RSYNC_variables.sh rename to usr/share/rear/rescue/RSYNC/default/600_store_RSYNC_variables.sh diff --git a/usr/share/rear/rescue/default/01_merge_skeletons.sh b/usr/share/rear/rescue/default/010_merge_skeletons.sh similarity index 97% rename from usr/share/rear/rescue/default/01_merge_skeletons.sh rename to usr/share/rear/rescue/default/010_merge_skeletons.sh index 458d498152..a3a6ebb081 100644 --- a/usr/share/rear/rescue/default/01_merge_skeletons.sh +++ b/usr/share/rear/rescue/default/010_merge_skeletons.sh @@ -1,4 +1,4 @@ -# 00_merge_skeletons.sh +# 010_merge_skeletons.sh # # merge skeleton directories for Relax-and-Recover # diff --git a/usr/share/rear/rescue/default/10_hostname.sh b/usr/share/rear/rescue/default/100_hostname.sh similarity index 92% rename from usr/share/rear/rescue/default/10_hostname.sh rename to usr/share/rear/rescue/default/100_hostname.sh index 987a6c85c4..26547d0bf4 100644 --- a/usr/share/rear/rescue/default/10_hostname.sh +++ b/usr/share/rear/rescue/default/100_hostname.sh @@ -1,4 +1,4 @@ -# 10_hostname.sh +# 100_hostname.sh # # take hostname for Relax-and-Recover # diff --git a/usr/share/rear/rescue/default/20_etc_issue.sh b/usr/share/rear/rescue/default/200_etc_issue.sh similarity index 94% rename from usr/share/rear/rescue/default/20_etc_issue.sh rename to usr/share/rear/rescue/default/200_etc_issue.sh index ec29cdbde9..c6feff0170 100644 --- a/usr/share/rear/rescue/default/20_etc_issue.sh +++ b/usr/share/rear/rescue/default/200_etc_issue.sh @@ -1,4 +1,4 @@ -# 20_etc_issue.sh +# 200_etc_issue.sh # # write out /etc/issue for Relax-and-Recover # diff --git a/usr/share/rear/rescue/default/43_prepare_timesync.sh b/usr/share/rear/rescue/default/430_prepare_timesync.sh similarity index 100% rename from usr/share/rear/rescue/default/43_prepare_timesync.sh rename to usr/share/rear/rescue/default/430_prepare_timesync.sh diff --git a/usr/share/rear/rescue/default/50_ssh.sh b/usr/share/rear/rescue/default/500_ssh.sh similarity index 99% rename from usr/share/rear/rescue/default/50_ssh.sh rename to usr/share/rear/rescue/default/500_ssh.sh index 27fd835723..67c0542e23 100644 --- a/usr/share/rear/rescue/default/50_ssh.sh +++ b/usr/share/rear/rescue/default/500_ssh.sh @@ -1,4 +1,4 @@ -# 50_ssh.sh +# 500_ssh.sh # # take ssh for Relax-and-Recover # diff --git a/usr/share/rear/rescue/default/55_vagrant.sh b/usr/share/rear/rescue/default/550_vagrant.sh similarity index 100% rename from usr/share/rear/rescue/default/55_vagrant.sh rename to usr/share/rear/rescue/default/550_vagrant.sh diff --git a/usr/share/rear/rescue/default/85_save_sysfs_uefi_vars.sh b/usr/share/rear/rescue/default/850_save_sysfs_uefi_vars.sh similarity index 100% rename from usr/share/rear/rescue/default/85_save_sysfs_uefi_vars.sh rename to usr/share/rear/rescue/default/850_save_sysfs_uefi_vars.sh diff --git a/usr/share/rear/rescue/default/90_clone_users_and_groups.sh b/usr/share/rear/rescue/default/900_clone_users_and_groups.sh similarity index 100% rename from usr/share/rear/rescue/default/90_clone_users_and_groups.sh rename to usr/share/rear/rescue/default/900_clone_users_and_groups.sh diff --git a/usr/share/rear/rescue/default/91_copy_logfile.sh b/usr/share/rear/rescue/default/910_copy_logfile.sh similarity index 100% rename from usr/share/rear/rescue/default/91_copy_logfile.sh rename to usr/share/rear/rescue/default/910_copy_logfile.sh diff --git a/usr/share/rear/restore/BACULA/default/40_restore_backup.sh b/usr/share/rear/restore/BACULA/default/400_restore_backup.sh similarity index 100% rename from usr/share/rear/restore/BACULA/default/40_restore_backup.sh rename to usr/share/rear/restore/BACULA/default/400_restore_backup.sh diff --git a/usr/share/rear/restore/BAREOS/default/40_restore_backup.sh b/usr/share/rear/restore/BAREOS/default/400_restore_backup.sh similarity index 100% rename from usr/share/rear/restore/BAREOS/default/40_restore_backup.sh rename to usr/share/rear/restore/BAREOS/default/400_restore_backup.sh diff --git a/usr/share/rear/restore/BORG/default/100_set_vars.sh b/usr/share/rear/restore/BORG/default/100_set_vars.sh new file mode 120000 index 0000000000..aaae499285 --- /dev/null +++ b/usr/share/rear/restore/BORG/default/100_set_vars.sh @@ -0,0 +1 @@ +../../../prep/BORG/default/100_set_vars.sh \ No newline at end of file diff --git a/usr/share/rear/restore/BORG/default/10_set_vars.sh b/usr/share/rear/restore/BORG/default/10_set_vars.sh deleted file mode 120000 index 20d207e186..0000000000 --- a/usr/share/rear/restore/BORG/default/10_set_vars.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/BORG/default/10_set_vars.sh \ No newline at end of file diff --git a/usr/share/rear/restore/BORG/default/30_load_archives.sh b/usr/share/rear/restore/BORG/default/300_load_archives.sh similarity index 98% rename from usr/share/rear/restore/BORG/default/30_load_archives.sh rename to usr/share/rear/restore/BORG/default/300_load_archives.sh index 18942e990e..cdc8ef2550 100644 --- a/usr/share/rear/restore/BORG/default/30_load_archives.sh +++ b/usr/share/rear/restore/BORG/default/300_load_archives.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 30_load_archives.sh +# 300_load_archives.sh LogPrint "Starting Borg restore" diff --git a/usr/share/rear/restore/BORG/default/40_restore_backup.sh b/usr/share/rear/restore/BORG/default/400_restore_backup.sh similarity index 97% rename from usr/share/rear/restore/BORG/default/40_restore_backup.sh rename to usr/share/rear/restore/BORG/default/400_restore_backup.sh index 818108b9da..bdeafa78e4 100644 --- a/usr/share/rear/restore/BORG/default/40_restore_backup.sh +++ b/usr/share/rear/restore/BORG/default/400_restore_backup.sh @@ -1,7 +1,7 @@ # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # -# 40_restore_backup.sk +# 400_restore_backup.sk # Borg restores to cwd. # Switch current working directory or die. diff --git a/usr/share/rear/restore/DP/default/30_create_dp_restore_fs_list.sh b/usr/share/rear/restore/DP/default/300_create_dp_restore_fs_list.sh similarity index 96% rename from usr/share/rear/restore/DP/default/30_create_dp_restore_fs_list.sh rename to usr/share/rear/restore/DP/default/300_create_dp_restore_fs_list.sh index 513fce14bf..44f824f503 100644 --- a/usr/share/rear/restore/DP/default/30_create_dp_restore_fs_list.sh +++ b/usr/share/rear/restore/DP/default/300_create_dp_restore_fs_list.sh @@ -1,4 +1,4 @@ -# 30_create_dp_restore_fs_list.sh +# 300_create_dp_restore_fs_list.sh # Purpose: Generate a file system list of objects to restore # $ /opt/omni/bin/omnidb -filesystem | grep $(hostname) diff --git a/usr/share/rear/restore/DP/default/40_restore_with_dp.sh b/usr/share/rear/restore/DP/default/400_restore_with_dp.sh similarity index 98% rename from usr/share/rear/restore/DP/default/40_restore_with_dp.sh rename to usr/share/rear/restore/DP/default/400_restore_with_dp.sh index b095a3d378..18eaa4c8ff 100644 --- a/usr/share/rear/restore/DP/default/40_restore_with_dp.sh +++ b/usr/share/rear/restore/DP/default/400_restore_with_dp.sh @@ -1,4 +1,4 @@ -# 40_restore_with_dp.sh +# 400_restore_with_dp.sh # Purpose: Restore script to restore file systems with Data Protector # /opt/omni/bin/omnidb -filesystem test.internal.it3.be:/ '/' -latest -detail diff --git a/usr/share/rear/restore/DP/default/45_restore_via_gui.sh b/usr/share/rear/restore/DP/default/450_restore_via_gui.sh similarity index 96% rename from usr/share/rear/restore/DP/default/45_restore_via_gui.sh rename to usr/share/rear/restore/DP/default/450_restore_via_gui.sh index c3644525cb..f444f8a207 100644 --- a/usr/share/rear/restore/DP/default/45_restore_via_gui.sh +++ b/usr/share/rear/restore/DP/default/450_restore_via_gui.sh @@ -1,4 +1,4 @@ -# 45_restore_via_gui.sh +# 450_restore_via_gui.sh # id the automatic restore failed give the end-user the option to execute a retsore via GUI [ ! -f $TMP_DIR/DP_GUI_RESTORE ] && return # restore was OK - skip this option diff --git a/usr/share/rear/restore/DP/default/46_press_y_to_continue.sh b/usr/share/rear/restore/DP/default/460_press_y_to_continue.sh similarity index 100% rename from usr/share/rear/restore/DP/default/46_press_y_to_continue.sh rename to usr/share/rear/restore/DP/default/460_press_y_to_continue.sh diff --git a/usr/share/rear/restore/DUPLICITY/default/10_restore_duply.sh b/usr/share/rear/restore/DUPLICITY/default/100_restore_duply.sh similarity index 100% rename from usr/share/rear/restore/DUPLICITY/default/10_restore_duply.sh rename to usr/share/rear/restore/DUPLICITY/default/100_restore_duply.sh diff --git a/usr/share/rear/restore/DUPLICITY/default/20_prompt_user_to_start_restore.sh b/usr/share/rear/restore/DUPLICITY/default/200_prompt_user_to_start_restore.sh similarity index 95% rename from usr/share/rear/restore/DUPLICITY/default/20_prompt_user_to_start_restore.sh rename to usr/share/rear/restore/DUPLICITY/default/200_prompt_user_to_start_restore.sh index 4a4334ffaf..11a3a26522 100644 --- a/usr/share/rear/restore/DUPLICITY/default/20_prompt_user_to_start_restore.sh +++ b/usr/share/rear/restore/DUPLICITY/default/200_prompt_user_to_start_restore.sh @@ -1,4 +1,4 @@ -# 20_prompt_user_to_start_restore.sh +# 200_prompt_user_to_start_restore.sh # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # diff --git a/usr/share/rear/restore/DUPLICITY/default/40_restore_duplicity.sh b/usr/share/rear/restore/DUPLICITY/default/400_restore_duplicity.sh similarity index 99% rename from usr/share/rear/restore/DUPLICITY/default/40_restore_duplicity.sh rename to usr/share/rear/restore/DUPLICITY/default/400_restore_duplicity.sh index 18d96b1813..a53640cd4f 100644 --- a/usr/share/rear/restore/DUPLICITY/default/40_restore_duplicity.sh +++ b/usr/share/rear/restore/DUPLICITY/default/400_restore_duplicity.sh @@ -1,4 +1,4 @@ -# 40_restore_duplicity.sh +# 400_restore_duplicity.sh # This file is part of Relax-and-Recover, licensed under the GNU General # Public License. Refer to the included COPYING for full text of license. # diff --git a/usr/share/rear/restore/EXTERNAL/default/50_restore_with_external.sh b/usr/share/rear/restore/EXTERNAL/default/500_restore_with_external.sh similarity index 100% rename from usr/share/rear/restore/EXTERNAL/default/50_restore_with_external.sh rename to usr/share/rear/restore/EXTERNAL/default/500_restore_with_external.sh diff --git a/usr/share/rear/restore/FDRUPSTREAM/default/20_start_fdrupstream.sh b/usr/share/rear/restore/FDRUPSTREAM/default/200_start_fdrupstream.sh similarity index 100% rename from usr/share/rear/restore/FDRUPSTREAM/default/20_start_fdrupstream.sh rename to usr/share/rear/restore/FDRUPSTREAM/default/200_start_fdrupstream.sh diff --git a/usr/share/rear/restore/FDRUPSTREAM/default/25_wait_for_restore.sh b/usr/share/rear/restore/FDRUPSTREAM/default/250_wait_for_restore.sh similarity index 100% rename from usr/share/rear/restore/FDRUPSTREAM/default/25_wait_for_restore.sh rename to usr/share/rear/restore/FDRUPSTREAM/default/250_wait_for_restore.sh diff --git a/usr/share/rear/restore/FDRUPSTREAM/default/26_copy_log_and_report.sh b/usr/share/rear/restore/FDRUPSTREAM/default/260_copy_log_and_report.sh similarity index 100% rename from usr/share/rear/restore/FDRUPSTREAM/default/26_copy_log_and_report.sh rename to usr/share/rear/restore/FDRUPSTREAM/default/260_copy_log_and_report.sh diff --git a/usr/share/rear/restore/FDRUPSTREAM/default/27_selinux_considerations.sh b/usr/share/rear/restore/FDRUPSTREAM/default/270_selinux_considerations.sh similarity index 100% rename from usr/share/rear/restore/FDRUPSTREAM/default/27_selinux_considerations.sh rename to usr/share/rear/restore/FDRUPSTREAM/default/270_selinux_considerations.sh diff --git a/usr/share/rear/restore/Fedora/05_copy_dev_files.sh b/usr/share/rear/restore/Fedora/050_copy_dev_files.sh similarity index 100% rename from usr/share/rear/restore/Fedora/05_copy_dev_files.sh rename to usr/share/rear/restore/Fedora/050_copy_dev_files.sh diff --git a/usr/share/rear/restore/GALAXY/default/39_create_ramdisk.sh b/usr/share/rear/restore/GALAXY/default/390_create_ramdisk.sh similarity index 100% rename from usr/share/rear/restore/GALAXY/default/39_create_ramdisk.sh rename to usr/share/rear/restore/GALAXY/default/390_create_ramdisk.sh diff --git a/usr/share/rear/restore/GALAXY/default/40_restore_with_galaxy.sh b/usr/share/rear/restore/GALAXY/default/400_restore_with_galaxy.sh similarity index 100% rename from usr/share/rear/restore/GALAXY/default/40_restore_with_galaxy.sh rename to usr/share/rear/restore/GALAXY/default/400_restore_with_galaxy.sh diff --git a/usr/share/rear/restore/GALAXY10/default/40_restore_with_galaxy.sh b/usr/share/rear/restore/GALAXY10/default/400_restore_with_galaxy.sh similarity index 100% rename from usr/share/rear/restore/GALAXY10/default/40_restore_with_galaxy.sh rename to usr/share/rear/restore/GALAXY10/default/400_restore_with_galaxy.sh diff --git a/usr/share/rear/restore/GALAXY7/default/40_restore_with_galaxy.sh b/usr/share/rear/restore/GALAXY7/default/400_restore_with_galaxy.sh similarity index 100% rename from usr/share/rear/restore/GALAXY7/default/40_restore_with_galaxy.sh rename to usr/share/rear/restore/GALAXY7/default/400_restore_with_galaxy.sh diff --git a/usr/share/rear/restore/NBKDC/default/40_restore_backup.sh b/usr/share/rear/restore/NBKDC/default/400_restore_backup.sh similarity index 100% rename from usr/share/rear/restore/NBKDC/default/40_restore_backup.sh rename to usr/share/rear/restore/NBKDC/default/400_restore_backup.sh diff --git a/usr/share/rear/restore/NBU/default/30_create_nbu_restore_fs_list.sh b/usr/share/rear/restore/NBU/default/300_create_nbu_restore_fs_list.sh similarity index 97% rename from usr/share/rear/restore/NBU/default/30_create_nbu_restore_fs_list.sh rename to usr/share/rear/restore/NBU/default/300_create_nbu_restore_fs_list.sh index 17fa95a767..a7e792c3ec 100644 --- a/usr/share/rear/restore/NBU/default/30_create_nbu_restore_fs_list.sh +++ b/usr/share/rear/restore/NBU/default/300_create_nbu_restore_fs_list.sh @@ -1,4 +1,4 @@ -# 30_create_nbu_restore_fs_list.sh +# 300_create_nbu_restore_fs_list.sh ################################## # Part 1: create the restore file system list file diff --git a/usr/share/rear/restore/NBU/default/40_restore_with_nbu.sh b/usr/share/rear/restore/NBU/default/400_restore_with_nbu.sh similarity index 92% rename from usr/share/rear/restore/NBU/default/40_restore_with_nbu.sh rename to usr/share/rear/restore/NBU/default/400_restore_with_nbu.sh index de83bab210..e93420c6db 100644 --- a/usr/share/rear/restore/NBU/default/40_restore_with_nbu.sh +++ b/usr/share/rear/restore/NBU/default/400_restore_with_nbu.sh @@ -1,4 +1,4 @@ -# 40_restore_with_nbu.sh +# 400_restore_with_nbu.sh # restore files with NBU #-----<--------->------- export starposition=1 @@ -15,7 +15,7 @@ star () LogPrint "NetBackup: restoring / into $TARGET_FS_ROOT" -# $TMP_DIR/restore_fs_list was made by 30_create_nbu_restore_fs_list.sh +# $TMP_DIR/restore_fs_list was made by 300_create_nbu_restore_fs_list.sh echo "change / to $TARGET_FS_ROOT" > $TMP_DIR/nbu_change_file diff --git a/usr/share/rear/restore/NETFS/Linux-i386/51_selinux_fixfiles_exclude_dirs.sh b/usr/share/rear/restore/NETFS/Linux-i386/510_selinux_fixfiles_exclude_dirs.sh similarity index 100% rename from usr/share/rear/restore/NETFS/Linux-i386/51_selinux_fixfiles_exclude_dirs.sh rename to usr/share/rear/restore/NETFS/Linux-i386/510_selinux_fixfiles_exclude_dirs.sh diff --git a/usr/share/rear/restore/NETFS/default/100_mount_NETFS_path.sh b/usr/share/rear/restore/NETFS/default/100_mount_NETFS_path.sh new file mode 120000 index 0000000000..7995fbbfdb --- /dev/null +++ b/usr/share/rear/restore/NETFS/default/100_mount_NETFS_path.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/100_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/restore/NETFS/default/10_mount_NETFS_path.sh b/usr/share/rear/restore/NETFS/default/10_mount_NETFS_path.sh deleted file mode 120000 index 84e4486875..0000000000 --- a/usr/share/rear/restore/NETFS/default/10_mount_NETFS_path.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/10_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/restore/NETFS/default/38_prepare_multiple_isos.sh b/usr/share/rear/restore/NETFS/default/380_prepare_multiple_isos.sh similarity index 93% rename from usr/share/rear/restore/NETFS/default/38_prepare_multiple_isos.sh rename to usr/share/rear/restore/NETFS/default/380_prepare_multiple_isos.sh index 50f75a86b2..2d717a246c 100644 --- a/usr/share/rear/restore/NETFS/default/38_prepare_multiple_isos.sh +++ b/usr/share/rear/restore/NETFS/default/380_prepare_multiple_isos.sh @@ -1,4 +1,4 @@ -# 38_prepare_multiple_isos +# 380_prepare_multiple_isos # local scheme=$(url_scheme $BACKUP_URL) diff --git a/usr/share/rear/restore/NETFS/default/40_restore_backup.sh b/usr/share/rear/restore/NETFS/default/400_restore_backup.sh similarity index 99% rename from usr/share/rear/restore/NETFS/default/40_restore_backup.sh rename to usr/share/rear/restore/NETFS/default/400_restore_backup.sh index e803e7d3d2..86e1570451 100644 --- a/usr/share/rear/restore/NETFS/default/40_restore_backup.sh +++ b/usr/share/rear/restore/NETFS/default/400_restore_backup.sh @@ -1,4 +1,4 @@ -# 40_restore_backup.sh +# 400_restore_backup.sh # local scheme=$(url_scheme $BACKUP_URL) diff --git a/usr/share/rear/restore/NETFS/default/50_selinux_autorelabel.sh b/usr/share/rear/restore/NETFS/default/500_selinux_autorelabel.sh similarity index 100% rename from usr/share/rear/restore/NETFS/default/50_selinux_autorelabel.sh rename to usr/share/rear/restore/NETFS/default/500_selinux_autorelabel.sh diff --git a/usr/share/rear/restore/NETFS/default/51_set_capabilities.sh b/usr/share/rear/restore/NETFS/default/510_set_capabilities.sh similarity index 100% rename from usr/share/rear/restore/NETFS/default/51_set_capabilities.sh rename to usr/share/rear/restore/NETFS/default/510_set_capabilities.sh diff --git a/usr/share/rear/restore/NETFS/default/980_umount_NETFS_dir.sh b/usr/share/rear/restore/NETFS/default/980_umount_NETFS_dir.sh new file mode 120000 index 0000000000..18d6cdb0e3 --- /dev/null +++ b/usr/share/rear/restore/NETFS/default/980_umount_NETFS_dir.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/980_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/restore/NETFS/default/98_umount_NETFS_dir.sh b/usr/share/rear/restore/NETFS/default/98_umount_NETFS_dir.sh deleted file mode 120000 index 70ebdbcc43..0000000000 --- a/usr/share/rear/restore/NETFS/default/98_umount_NETFS_dir.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/98_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/restore/NSR/default/40_restore_with_nsr.sh b/usr/share/rear/restore/NSR/default/400_restore_with_nsr.sh similarity index 96% rename from usr/share/rear/restore/NSR/default/40_restore_with_nsr.sh rename to usr/share/rear/restore/NSR/default/400_restore_with_nsr.sh index 075fb1f56e..f263cfc899 100644 --- a/usr/share/rear/restore/NSR/default/40_restore_with_nsr.sh +++ b/usr/share/rear/restore/NSR/default/400_restore_with_nsr.sh @@ -1,4 +1,4 @@ -# 40_restore_with_nsr.sh +# 400_restore_with_nsr.sh LogPrint "Starting nsrwatch on console 8" TERM=linux nsrwatch -p 1 -s $(cat $VAR_DIR/recovery/nsr_server ) /dev/tty8 & diff --git a/usr/share/rear/restore/RBME/default/40_restore_backup.sh b/usr/share/rear/restore/RBME/default/400_restore_backup.sh similarity index 100% rename from usr/share/rear/restore/RBME/default/40_restore_backup.sh rename to usr/share/rear/restore/RBME/default/400_restore_backup.sh diff --git a/usr/share/rear/restore/RBME/default/980_umount_NETFS_dir.sh b/usr/share/rear/restore/RBME/default/980_umount_NETFS_dir.sh new file mode 120000 index 0000000000..18d6cdb0e3 --- /dev/null +++ b/usr/share/rear/restore/RBME/default/980_umount_NETFS_dir.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/980_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/restore/RBME/default/98_umount_NETFS_dir.sh b/usr/share/rear/restore/RBME/default/98_umount_NETFS_dir.sh deleted file mode 120000 index 70ebdbcc43..0000000000 --- a/usr/share/rear/restore/RBME/default/98_umount_NETFS_dir.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/98_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/restore/REQUESTRESTORE/default/20_prompt_user_to_start_restore.sh b/usr/share/rear/restore/REQUESTRESTORE/default/200_prompt_user_to_start_restore.sh similarity index 100% rename from usr/share/rear/restore/REQUESTRESTORE/default/20_prompt_user_to_start_restore.sh rename to usr/share/rear/restore/REQUESTRESTORE/default/200_prompt_user_to_start_restore.sh diff --git a/usr/share/rear/restore/RSYNC/default/20_remove_relative_rsync_option.sh b/usr/share/rear/restore/RSYNC/default/200_remove_relative_rsync_option.sh similarity index 95% rename from usr/share/rear/restore/RSYNC/default/20_remove_relative_rsync_option.sh rename to usr/share/rear/restore/RSYNC/default/200_remove_relative_rsync_option.sh index e32db597f9..e8106d37da 100644 --- a/usr/share/rear/restore/RSYNC/default/20_remove_relative_rsync_option.sh +++ b/usr/share/rear/restore/RSYNC/default/200_remove_relative_rsync_option.sh @@ -1,4 +1,4 @@ -# 20_remove_relative_rsync_option.sh +# 200_remove_relative_rsync_option.sh # See issue #871 # rsync restore was successfully tested by Vegas (see http://pikachu.3ti.be/pipermail/rear-users/2016-June/003350.html) # without the --relative option ; my feeling says it is better to remove it from array BACKUP_RSYNC_OPTIONS diff --git a/usr/share/rear/restore/RSYNC/default/40_restore_rsync_backup.sh b/usr/share/rear/restore/RSYNC/default/400_restore_rsync_backup.sh similarity index 100% rename from usr/share/rear/restore/RSYNC/default/40_restore_rsync_backup.sh rename to usr/share/rear/restore/RSYNC/default/400_restore_rsync_backup.sh diff --git a/usr/share/rear/restore/RSYNC/default/80_copy_restore_log.sh b/usr/share/rear/restore/RSYNC/default/800_copy_restore_log.sh similarity index 84% rename from usr/share/rear/restore/RSYNC/default/80_copy_restore_log.sh rename to usr/share/rear/restore/RSYNC/default/800_copy_restore_log.sh index c1203bbba2..2dbe8162a5 100644 --- a/usr/share/rear/restore/RSYNC/default/80_copy_restore_log.sh +++ b/usr/share/rear/restore/RSYNC/default/800_copy_restore_log.sh @@ -9,4 +9,4 @@ cp "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}-restore.log" $TARGET_FS_ROOT/root/restore- StopIfError "Could not copy ${BACKUP_PROG_ARCHIVE}-restore.log to $TARGET_FS_ROOT/root" gzip "$TARGET_FS_ROOT/root/restore-$(date +%Y%m%d.)*.log" -# the rear.log file will be copied later (by wrapup/default/99_copy_logfile.sh) +# the rear.log file will be copied later (by wrapup/default/990_copy_logfile.sh) diff --git a/usr/share/rear/restore/SESAM/default/40_restore_backup.sh b/usr/share/rear/restore/SESAM/default/400_restore_backup.sh similarity index 100% rename from usr/share/rear/restore/SESAM/default/40_restore_backup.sh rename to usr/share/rear/restore/SESAM/default/400_restore_backup.sh diff --git a/usr/share/rear/restore/SESAM/default/90_create_missing_directories.sh b/usr/share/rear/restore/SESAM/default/900_create_missing_directories.sh similarity index 100% rename from usr/share/rear/restore/SESAM/default/90_create_missing_directories.sh rename to usr/share/rear/restore/SESAM/default/900_create_missing_directories.sh diff --git a/usr/share/rear/restore/SUSE_LINUX/91_create_missing_directories.sh b/usr/share/rear/restore/SUSE_LINUX/910_create_missing_directories.sh similarity index 100% rename from usr/share/rear/restore/SUSE_LINUX/91_create_missing_directories.sh rename to usr/share/rear/restore/SUSE_LINUX/910_create_missing_directories.sh diff --git a/usr/share/rear/restore/TSM/default/40_restore_with_tsm.sh b/usr/share/rear/restore/TSM/default/400_restore_with_tsm.sh similarity index 100% rename from usr/share/rear/restore/TSM/default/40_restore_with_tsm.sh rename to usr/share/rear/restore/TSM/default/400_restore_with_tsm.sh diff --git a/usr/share/rear/restore/default/50_selinux_autorelabel.sh b/usr/share/rear/restore/default/500_selinux_autorelabel.sh similarity index 100% rename from usr/share/rear/restore/default/50_selinux_autorelabel.sh rename to usr/share/rear/restore/default/500_selinux_autorelabel.sh diff --git a/usr/share/rear/restore/default/90_create_missing_directories.sh b/usr/share/rear/restore/default/900_create_missing_directories.sh similarity index 100% rename from usr/share/rear/restore/default/90_create_missing_directories.sh rename to usr/share/rear/restore/default/900_create_missing_directories.sh diff --git a/usr/share/rear/restore/default/99_move_away_restored_files.sh b/usr/share/rear/restore/default/990_move_away_restored_files.sh similarity index 100% rename from usr/share/rear/restore/default/99_move_away_restored_files.sh rename to usr/share/rear/restore/default/990_move_away_restored_files.sh diff --git a/usr/share/rear/setup/default/01_pre_recovery_script.sh b/usr/share/rear/setup/default/010_pre_recovery_script.sh similarity index 100% rename from usr/share/rear/setup/default/01_pre_recovery_script.sh rename to usr/share/rear/setup/default/010_pre_recovery_script.sh diff --git a/usr/share/rear/verify/BACULA/default/030_bextract_tape_device.sh b/usr/share/rear/verify/BACULA/default/030_bextract_tape_device.sh new file mode 120000 index 0000000000..c8a8e581a8 --- /dev/null +++ b/usr/share/rear/verify/BACULA/default/030_bextract_tape_device.sh @@ -0,0 +1 @@ +../../../prep/OBDR/BACULA/default/030_bextract_tape_device.sh \ No newline at end of file diff --git a/usr/share/rear/verify/BACULA/default/03_bextract_tape_device.sh b/usr/share/rear/verify/BACULA/default/03_bextract_tape_device.sh deleted file mode 120000 index 0318c554c7..0000000000 --- a/usr/share/rear/verify/BACULA/default/03_bextract_tape_device.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/OBDR/BACULA/default/03_bextract_tape_device.sh \ No newline at end of file diff --git a/usr/share/rear/verify/BACULA/default/05_check_requirements.sh b/usr/share/rear/verify/BACULA/default/050_check_requirements.sh similarity index 100% rename from usr/share/rear/verify/BACULA/default/05_check_requirements.sh rename to usr/share/rear/verify/BACULA/default/050_check_requirements.sh diff --git a/usr/share/rear/verify/BACULA/default/10_start_bacula-fd.sh b/usr/share/rear/verify/BACULA/default/100_start_bacula-fd.sh similarity index 100% rename from usr/share/rear/verify/BACULA/default/10_start_bacula-fd.sh rename to usr/share/rear/verify/BACULA/default/100_start_bacula-fd.sh diff --git a/usr/share/rear/verify/BAREOS/default/03_bextract_tape_device.sh b/usr/share/rear/verify/BAREOS/default/030_bextract_tape_device.sh similarity index 100% rename from usr/share/rear/verify/BAREOS/default/03_bextract_tape_device.sh rename to usr/share/rear/verify/BAREOS/default/030_bextract_tape_device.sh diff --git a/usr/share/rear/verify/BAREOS/default/05_check_requirements.sh b/usr/share/rear/verify/BAREOS/default/050_check_requirements.sh similarity index 100% rename from usr/share/rear/verify/BAREOS/default/05_check_requirements.sh rename to usr/share/rear/verify/BAREOS/default/050_check_requirements.sh diff --git a/usr/share/rear/verify/BAREOS/default/10_start_bareos-fd.sh b/usr/share/rear/verify/BAREOS/default/100_start_bareos-fd.sh similarity index 100% rename from usr/share/rear/verify/BAREOS/default/10_start_bareos-fd.sh rename to usr/share/rear/verify/BAREOS/default/100_start_bareos-fd.sh diff --git a/usr/share/rear/verify/DP/default/40_verify_dp.sh b/usr/share/rear/verify/DP/default/400_verify_dp.sh similarity index 96% rename from usr/share/rear/verify/DP/default/40_verify_dp.sh rename to usr/share/rear/verify/DP/default/400_verify_dp.sh index bd34e2430c..6eeb0679ca 100644 --- a/usr/share/rear/verify/DP/default/40_verify_dp.sh +++ b/usr/share/rear/verify/DP/default/400_verify_dp.sh @@ -1,4 +1,4 @@ -# 40_verify_dp.sh +# 400_verify_dp.sh # read DP vars from config file CELL_SERVER="`cat /etc/opt/omni/client/cell_server`" diff --git a/usr/share/rear/verify/DP/default/45_request_gui_restore.sh b/usr/share/rear/verify/DP/default/450_request_gui_restore.sh similarity index 100% rename from usr/share/rear/verify/DP/default/45_request_gui_restore.sh rename to usr/share/rear/verify/DP/default/450_request_gui_restore.sh diff --git a/usr/share/rear/verify/DP/default/50_select_dp_restore.sh b/usr/share/rear/verify/DP/default/500_select_dp_restore.sh similarity index 100% rename from usr/share/rear/verify/DP/default/50_select_dp_restore.sh rename to usr/share/rear/verify/DP/default/500_select_dp_restore.sh diff --git a/usr/share/rear/verify/DUPLICITY/default/20_check_tmpfs.sh b/usr/share/rear/verify/DUPLICITY/default/200_check_tmpfs.sh similarity index 100% rename from usr/share/rear/verify/DUPLICITY/default/20_check_tmpfs.sh rename to usr/share/rear/verify/DUPLICITY/default/200_check_tmpfs.sh diff --git a/usr/share/rear/verify/DUPLICITY/default/25_check_duply_profile.sh b/usr/share/rear/verify/DUPLICITY/default/250_check_duply_profile.sh similarity index 100% rename from usr/share/rear/verify/DUPLICITY/default/25_check_duply_profile.sh rename to usr/share/rear/verify/DUPLICITY/default/250_check_duply_profile.sh diff --git a/usr/share/rear/verify/GALAXY/default/40_start_galaxy_daemons.sh b/usr/share/rear/verify/GALAXY/default/400_start_galaxy_daemons.sh similarity index 100% rename from usr/share/rear/verify/GALAXY/default/40_start_galaxy_daemons.sh rename to usr/share/rear/verify/GALAXY/default/400_start_galaxy_daemons.sh diff --git a/usr/share/rear/verify/GALAXY10/default/39_create_ramdisk.sh b/usr/share/rear/verify/GALAXY10/default/390_create_ramdisk.sh similarity index 100% rename from usr/share/rear/verify/GALAXY10/default/39_create_ramdisk.sh rename to usr/share/rear/verify/GALAXY10/default/390_create_ramdisk.sh diff --git a/usr/share/rear/verify/GALAXY10/default/40_start_galaxy_daemons.sh b/usr/share/rear/verify/GALAXY10/default/400_start_galaxy_daemons.sh similarity index 100% rename from usr/share/rear/verify/GALAXY10/default/40_start_galaxy_daemons.sh rename to usr/share/rear/verify/GALAXY10/default/400_start_galaxy_daemons.sh diff --git a/usr/share/rear/verify/GALAXY10/default/41_ping_commcell.sh b/usr/share/rear/verify/GALAXY10/default/410_ping_commcell.sh similarity index 100% rename from usr/share/rear/verify/GALAXY10/default/41_ping_commcell.sh rename to usr/share/rear/verify/GALAXY10/default/410_ping_commcell.sh diff --git a/usr/share/rear/verify/GALAXY10/default/42_login_to_galaxy_and_setup_environment.sh b/usr/share/rear/verify/GALAXY10/default/420_login_to_galaxy_and_setup_environment.sh similarity index 100% rename from usr/share/rear/verify/GALAXY10/default/42_login_to_galaxy_and_setup_environment.sh rename to usr/share/rear/verify/GALAXY10/default/420_login_to_galaxy_and_setup_environment.sh diff --git a/usr/share/rear/verify/GALAXY10/default/50_select_backupset.sh b/usr/share/rear/verify/GALAXY10/default/500_select_backupset.sh similarity index 100% rename from usr/share/rear/verify/GALAXY10/default/50_select_backupset.sh rename to usr/share/rear/verify/GALAXY10/default/500_select_backupset.sh diff --git a/usr/share/rear/verify/GALAXY10/default/55_request_point_in_time_restore_parameters.sh b/usr/share/rear/verify/GALAXY10/default/550_request_point_in_time_restore_parameters.sh similarity index 100% rename from usr/share/rear/verify/GALAXY10/default/55_request_point_in_time_restore_parameters.sh rename to usr/share/rear/verify/GALAXY10/default/550_request_point_in_time_restore_parameters.sh diff --git a/usr/share/rear/verify/GALAXY7/default/39_create_ramdisk.sh b/usr/share/rear/verify/GALAXY7/default/390_create_ramdisk.sh similarity index 100% rename from usr/share/rear/verify/GALAXY7/default/39_create_ramdisk.sh rename to usr/share/rear/verify/GALAXY7/default/390_create_ramdisk.sh diff --git a/usr/share/rear/verify/GALAXY7/default/40_start_galaxy_daemons.sh b/usr/share/rear/verify/GALAXY7/default/400_start_galaxy_daemons.sh similarity index 100% rename from usr/share/rear/verify/GALAXY7/default/40_start_galaxy_daemons.sh rename to usr/share/rear/verify/GALAXY7/default/400_start_galaxy_daemons.sh diff --git a/usr/share/rear/verify/GALAXY7/default/41_ping_commcell.sh b/usr/share/rear/verify/GALAXY7/default/410_ping_commcell.sh similarity index 100% rename from usr/share/rear/verify/GALAXY7/default/41_ping_commcell.sh rename to usr/share/rear/verify/GALAXY7/default/410_ping_commcell.sh diff --git a/usr/share/rear/verify/GALAXY7/default/42_login_to_galaxy_and_setup_environment.sh b/usr/share/rear/verify/GALAXY7/default/420_login_to_galaxy_and_setup_environment.sh similarity index 100% rename from usr/share/rear/verify/GALAXY7/default/42_login_to_galaxy_and_setup_environment.sh rename to usr/share/rear/verify/GALAXY7/default/420_login_to_galaxy_and_setup_environment.sh diff --git a/usr/share/rear/verify/GALAXY7/default/50_select_backupset.sh b/usr/share/rear/verify/GALAXY7/default/500_select_backupset.sh similarity index 100% rename from usr/share/rear/verify/GALAXY7/default/50_select_backupset.sh rename to usr/share/rear/verify/GALAXY7/default/500_select_backupset.sh diff --git a/usr/share/rear/verify/GNU/Linux/05_sane_recovery_check.sh b/usr/share/rear/verify/GNU/Linux/050_sane_recovery_check.sh similarity index 92% rename from usr/share/rear/verify/GNU/Linux/05_sane_recovery_check.sh rename to usr/share/rear/verify/GNU/Linux/050_sane_recovery_check.sh index 5a2280c1d0..2773eb88b9 100644 --- a/usr/share/rear/verify/GNU/Linux/05_sane_recovery_check.sh +++ b/usr/share/rear/verify/GNU/Linux/050_sane_recovery_check.sh @@ -1,4 +1,4 @@ -# 05_sane_recovery_check +# 050_sane_recovery_check # # recover workflow for Relax-and-Recover # diff --git a/usr/share/rear/verify/GNU/Linux/230_storage_and_network_modules.sh b/usr/share/rear/verify/GNU/Linux/230_storage_and_network_modules.sh new file mode 120000 index 0000000000..ee20c2782b --- /dev/null +++ b/usr/share/rear/verify/GNU/Linux/230_storage_and_network_modules.sh @@ -0,0 +1 @@ +../../../rescue/GNU/Linux/230_storage_and_network_modules.sh \ No newline at end of file diff --git a/usr/share/rear/verify/GNU/Linux/23_storage_and_network_modules.sh b/usr/share/rear/verify/GNU/Linux/23_storage_and_network_modules.sh deleted file mode 120000 index 32d41836c4..0000000000 --- a/usr/share/rear/verify/GNU/Linux/23_storage_and_network_modules.sh +++ /dev/null @@ -1 +0,0 @@ -../../../rescue/GNU/Linux/23_storage_and_network_modules.sh \ No newline at end of file diff --git a/usr/share/rear/verify/GNU/Linux/26_recovery_storage_drivers.sh b/usr/share/rear/verify/GNU/Linux/260_recovery_storage_drivers.sh similarity index 100% rename from usr/share/rear/verify/GNU/Linux/26_recovery_storage_drivers.sh rename to usr/share/rear/verify/GNU/Linux/260_recovery_storage_drivers.sh diff --git a/usr/share/rear/verify/NBU/default/38_request_client_destination.sh b/usr/share/rear/verify/NBU/default/380_request_client_destination.sh similarity index 97% rename from usr/share/rear/verify/NBU/default/38_request_client_destination.sh rename to usr/share/rear/verify/NBU/default/380_request_client_destination.sh index 9f0dc6b51b..b25ffa7742 100644 --- a/usr/share/rear/verify/NBU/default/38_request_client_destination.sh +++ b/usr/share/rear/verify/NBU/default/380_request_client_destination.sh @@ -1,4 +1,4 @@ -# 38_request_client_destination.sh +# 380_request_client_destination.sh # Request the user to input the new Client name if the restore is a clone. # OR Request the user to hit ENTER to do a normal restore to the same client. diff --git a/usr/share/rear/verify/NBU/default/39_request_point_in_time_restore_parameters.sh b/usr/share/rear/verify/NBU/default/390_request_point_in_time_restore_parameters.sh similarity index 100% rename from usr/share/rear/verify/NBU/default/39_request_point_in_time_restore_parameters.sh rename to usr/share/rear/verify/NBU/default/390_request_point_in_time_restore_parameters.sh diff --git a/usr/share/rear/verify/NBU/default/40_verify_nbu.sh b/usr/share/rear/verify/NBU/default/400_verify_nbu.sh similarity index 95% rename from usr/share/rear/verify/NBU/default/40_verify_nbu.sh rename to usr/share/rear/verify/NBU/default/400_verify_nbu.sh index 94f161244a..9705d9e828 100644 --- a/usr/share/rear/verify/NBU/default/40_verify_nbu.sh +++ b/usr/share/rear/verify/NBU/default/400_verify_nbu.sh @@ -1,4 +1,4 @@ -# 40_verify_nbu.sh +# 400_verify_nbu.sh # check that NBU master server is actually available (ping) [ "${NBU_SERVER}" ] diff --git a/usr/share/rear/verify/NETFS/default/050_check_NETFS_requirements.sh b/usr/share/rear/verify/NETFS/default/050_check_NETFS_requirements.sh new file mode 120000 index 0000000000..8321ef81fd --- /dev/null +++ b/usr/share/rear/verify/NETFS/default/050_check_NETFS_requirements.sh @@ -0,0 +1 @@ +../../../prep/NETFS/default/050_check_NETFS_requirements.sh \ No newline at end of file diff --git a/usr/share/rear/verify/NETFS/default/05_start_required_nfs_daemons.sh b/usr/share/rear/verify/NETFS/default/050_start_required_nfs_daemons.sh similarity index 100% rename from usr/share/rear/verify/NETFS/default/05_start_required_nfs_daemons.sh rename to usr/share/rear/verify/NETFS/default/050_start_required_nfs_daemons.sh diff --git a/usr/share/rear/verify/NETFS/default/05_check_NETFS_requirements.sh b/usr/share/rear/verify/NETFS/default/05_check_NETFS_requirements.sh deleted file mode 120000 index 0d60d3acb2..0000000000 --- a/usr/share/rear/verify/NETFS/default/05_check_NETFS_requirements.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/NETFS/default/05_check_NETFS_requirements.sh \ No newline at end of file diff --git a/usr/share/rear/verify/NETFS/default/060_mount_NETFS_path.sh b/usr/share/rear/verify/NETFS/default/060_mount_NETFS_path.sh new file mode 120000 index 0000000000..7995fbbfdb --- /dev/null +++ b/usr/share/rear/verify/NETFS/default/060_mount_NETFS_path.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/100_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/verify/NETFS/default/06_mount_NETFS_path.sh b/usr/share/rear/verify/NETFS/default/06_mount_NETFS_path.sh deleted file mode 120000 index 84e4486875..0000000000 --- a/usr/share/rear/verify/NETFS/default/06_mount_NETFS_path.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/10_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/verify/NETFS/default/07_set_backup_archive.sh b/usr/share/rear/verify/NETFS/default/070_set_backup_archive.sh similarity index 100% rename from usr/share/rear/verify/NETFS/default/07_set_backup_archive.sh rename to usr/share/rear/verify/NETFS/default/070_set_backup_archive.sh diff --git a/usr/share/rear/verify/NETFS/default/09_set_readonly_options.sh b/usr/share/rear/verify/NETFS/default/090_set_readonly_options.sh similarity index 100% rename from usr/share/rear/verify/NETFS/default/09_set_readonly_options.sh rename to usr/share/rear/verify/NETFS/default/090_set_readonly_options.sh diff --git a/usr/share/rear/verify/NETFS/default/55_check_backup_archive.sh b/usr/share/rear/verify/NETFS/default/550_check_backup_archive.sh similarity index 100% rename from usr/share/rear/verify/NETFS/default/55_check_backup_archive.sh rename to usr/share/rear/verify/NETFS/default/550_check_backup_archive.sh diff --git a/usr/share/rear/verify/NETFS/default/60_check_encryption_key.sh b/usr/share/rear/verify/NETFS/default/600_check_encryption_key.sh similarity index 100% rename from usr/share/rear/verify/NETFS/default/60_check_encryption_key.sh rename to usr/share/rear/verify/NETFS/default/600_check_encryption_key.sh diff --git a/usr/share/rear/verify/NETFS/default/980_umount_NETFS_dir.sh b/usr/share/rear/verify/NETFS/default/980_umount_NETFS_dir.sh new file mode 120000 index 0000000000..18d6cdb0e3 --- /dev/null +++ b/usr/share/rear/verify/NETFS/default/980_umount_NETFS_dir.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/980_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/verify/NETFS/default/98_umount_NETFS_dir.sh b/usr/share/rear/verify/NETFS/default/98_umount_NETFS_dir.sh deleted file mode 120000 index 70ebdbcc43..0000000000 --- a/usr/share/rear/verify/NETFS/default/98_umount_NETFS_dir.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/98_umount_NETFS_dir.sh \ No newline at end of file diff --git a/usr/share/rear/verify/NSR/default/40_verify_nsr.sh b/usr/share/rear/verify/NSR/default/400_verify_nsr.sh similarity index 97% rename from usr/share/rear/verify/NSR/default/40_verify_nsr.sh rename to usr/share/rear/verify/NSR/default/400_verify_nsr.sh index 86e7520da3..b67f19dc6e 100644 --- a/usr/share/rear/verify/NSR/default/40_verify_nsr.sh +++ b/usr/share/rear/verify/NSR/default/400_verify_nsr.sh @@ -1,4 +1,4 @@ -# 40_verify_nsr.sh +# 400_verify_nsr.sh # read NSR server name from /nsr/res/servers file of /var/lib/rear/recovery/nsr_server if [[ ! -z "$NSRSERVER" ]]; then diff --git a/usr/share/rear/verify/NSR/default/41_verify_nsr_paths.sh b/usr/share/rear/verify/NSR/default/410_verify_nsr_paths.sh similarity index 89% rename from usr/share/rear/verify/NSR/default/41_verify_nsr_paths.sh rename to usr/share/rear/verify/NSR/default/410_verify_nsr_paths.sh index 6e39b7632d..c0f1be3360 100644 --- a/usr/share/rear/verify/NSR/default/41_verify_nsr_paths.sh +++ b/usr/share/rear/verify/NSR/default/410_verify_nsr_paths.sh @@ -1,4 +1,4 @@ -# 41_verify_nsr_paths.sh +# 410_verify_nsr_paths.sh [[ ! -f $VAR_DIR/recovery/nsr_paths ]] && Error "Missing save sets filesystems to recover from EMC NetWorker" LogPrint "We will recover the following file systems from EMC NetWorker: $( cat $VAR_DIR/recovery/nsr_paths )" diff --git a/usr/share/rear/verify/OBDR/NETFS/default/54_set_backup_compression.sh b/usr/share/rear/verify/OBDR/NETFS/default/540_set_backup_compression.sh similarity index 100% rename from usr/share/rear/verify/OBDR/NETFS/default/54_set_backup_compression.sh rename to usr/share/rear/verify/OBDR/NETFS/default/540_set_backup_compression.sh diff --git a/usr/share/rear/verify/OBDR/default/040_change_tape_name.sh b/usr/share/rear/verify/OBDR/default/040_change_tape_name.sh new file mode 120000 index 0000000000..8f403bdeb2 --- /dev/null +++ b/usr/share/rear/verify/OBDR/default/040_change_tape_name.sh @@ -0,0 +1 @@ +../../../prep/OBDR/default/040_change_tape_name.sh \ No newline at end of file diff --git a/usr/share/rear/verify/OBDR/default/04_change_tape_name.sh b/usr/share/rear/verify/OBDR/default/04_change_tape_name.sh deleted file mode 120000 index 19c9ba6f49..0000000000 --- a/usr/share/rear/verify/OBDR/default/04_change_tape_name.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/OBDR/default/04_change_tape_name.sh \ No newline at end of file diff --git a/usr/share/rear/verify/OBDR/default/550_set_obdr_blocksize.sh b/usr/share/rear/verify/OBDR/default/550_set_obdr_blocksize.sh new file mode 120000 index 0000000000..4b3f1c4eb6 --- /dev/null +++ b/usr/share/rear/verify/OBDR/default/550_set_obdr_blocksize.sh @@ -0,0 +1 @@ +../../../output/OBDR/default/500_set_obdr_blocksize.sh \ No newline at end of file diff --git a/usr/share/rear/verify/OBDR/default/55_set_obdr_blocksize.sh b/usr/share/rear/verify/OBDR/default/55_set_obdr_blocksize.sh deleted file mode 120000 index 4440598823..0000000000 --- a/usr/share/rear/verify/OBDR/default/55_set_obdr_blocksize.sh +++ /dev/null @@ -1 +0,0 @@ -../../../output/OBDR/default/50_set_obdr_blocksize.sh \ No newline at end of file diff --git a/usr/share/rear/verify/OBDR/default/57_seek_backup.sh b/usr/share/rear/verify/OBDR/default/570_seek_backup.sh similarity index 100% rename from usr/share/rear/verify/OBDR/default/57_seek_backup.sh rename to usr/share/rear/verify/OBDR/default/570_seek_backup.sh diff --git a/usr/share/rear/verify/RBME/default/100_mount_NETFS_path.sh b/usr/share/rear/verify/RBME/default/100_mount_NETFS_path.sh new file mode 120000 index 0000000000..7995fbbfdb --- /dev/null +++ b/usr/share/rear/verify/RBME/default/100_mount_NETFS_path.sh @@ -0,0 +1 @@ +../../../backup/NETFS/default/100_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RBME/default/10_mount_NETFS_path.sh b/usr/share/rear/verify/RBME/default/10_mount_NETFS_path.sh deleted file mode 120000 index 84e4486875..0000000000 --- a/usr/share/rear/verify/RBME/default/10_mount_NETFS_path.sh +++ /dev/null @@ -1 +0,0 @@ -../../../backup/NETFS/default/10_mount_NETFS_path.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RBME/default/15_check_nobody_uid_nfs.sh b/usr/share/rear/verify/RBME/default/150_check_nobody_uid_nfs.sh similarity index 100% rename from usr/share/rear/verify/RBME/default/15_check_nobody_uid_nfs.sh rename to usr/share/rear/verify/RBME/default/150_check_nobody_uid_nfs.sh diff --git a/usr/share/rear/verify/RBME/default/54_choose_backup.sh b/usr/share/rear/verify/RBME/default/540_choose_backup.sh similarity index 100% rename from usr/share/rear/verify/RBME/default/54_choose_backup.sh rename to usr/share/rear/verify/RBME/default/540_choose_backup.sh diff --git a/usr/share/rear/verify/RSYNC/GNU/Linux/60_check_rsync_xattr.sh b/usr/share/rear/verify/RSYNC/GNU/Linux/600_check_rsync_xattr.sh similarity index 100% rename from usr/share/rear/verify/RSYNC/GNU/Linux/60_check_rsync_xattr.sh rename to usr/share/rear/verify/RSYNC/GNU/Linux/600_check_rsync_xattr.sh diff --git a/usr/share/rear/verify/RSYNC/default/050_prep_rsync.sh b/usr/share/rear/verify/RSYNC/default/050_prep_rsync.sh new file mode 120000 index 0000000000..a011c19697 --- /dev/null +++ b/usr/share/rear/verify/RSYNC/default/050_prep_rsync.sh @@ -0,0 +1 @@ +../../../prep/RSYNC/default/050_prep_rsync.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RSYNC/default/05_prep_rsync.sh b/usr/share/rear/verify/RSYNC/default/05_prep_rsync.sh deleted file mode 120000 index c864719828..0000000000 --- a/usr/share/rear/verify/RSYNC/default/05_prep_rsync.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/RSYNC/default/05_prep_rsync.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RSYNC/default/100_check_rsync.sh b/usr/share/rear/verify/RSYNC/default/100_check_rsync.sh new file mode 120000 index 0000000000..50a8ba4705 --- /dev/null +++ b/usr/share/rear/verify/RSYNC/default/100_check_rsync.sh @@ -0,0 +1 @@ +../../../prep/RSYNC/default/100_check_rsync.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RSYNC/default/10_check_rsync.sh b/usr/share/rear/verify/RSYNC/default/10_check_rsync.sh deleted file mode 120000 index c17b13e80f..0000000000 --- a/usr/share/rear/verify/RSYNC/default/10_check_rsync.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/RSYNC/default/10_check_rsync.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RSYNC/default/150_check_rsync_protocol_version.sh b/usr/share/rear/verify/RSYNC/default/150_check_rsync_protocol_version.sh new file mode 120000 index 0000000000..110947693b --- /dev/null +++ b/usr/share/rear/verify/RSYNC/default/150_check_rsync_protocol_version.sh @@ -0,0 +1 @@ +../../../prep/RSYNC/default/150_check_rsync_protocol_version.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RSYNC/default/15_check_rsync_protocol_version.sh b/usr/share/rear/verify/RSYNC/default/15_check_rsync_protocol_version.sh deleted file mode 120000 index 792085470e..0000000000 --- a/usr/share/rear/verify/RSYNC/default/15_check_rsync_protocol_version.sh +++ /dev/null @@ -1 +0,0 @@ -../../../prep/RSYNC/default/15_check_rsync_protocol_version.sh \ No newline at end of file diff --git a/usr/share/rear/verify/RSYNC/default/55_check_remote_backup_archive.sh b/usr/share/rear/verify/RSYNC/default/550_check_remote_backup_archive.sh similarity index 100% rename from usr/share/rear/verify/RSYNC/default/55_check_remote_backup_archive.sh rename to usr/share/rear/verify/RSYNC/default/550_check_remote_backup_archive.sh diff --git a/usr/share/rear/verify/TSM/default/39_request_point_in_time_restore_parameters.sh b/usr/share/rear/verify/TSM/default/390_request_point_in_time_restore_parameters.sh similarity index 100% rename from usr/share/rear/verify/TSM/default/39_request_point_in_time_restore_parameters.sh rename to usr/share/rear/verify/TSM/default/390_request_point_in_time_restore_parameters.sh diff --git a/usr/share/rear/verify/TSM/default/40_verify_tsm.sh b/usr/share/rear/verify/TSM/default/400_verify_tsm.sh similarity index 97% rename from usr/share/rear/verify/TSM/default/40_verify_tsm.sh rename to usr/share/rear/verify/TSM/default/400_verify_tsm.sh index 05a21012b9..4721f3fd12 100644 --- a/usr/share/rear/verify/TSM/default/40_verify_tsm.sh +++ b/usr/share/rear/verify/TSM/default/400_verify_tsm.sh @@ -29,13 +29,13 @@ else fi # Use the included_mountpoints array derived from the disklayout.conf to determine the default -# TSM filespaces to include in a restore. +# TSM filespaces to include in a restore. included_mountpoints=( $(grep ^fs $VAR_DIR/layout/disklayout.conf | awk '{print $3}') $(grep ^btrfsmountedsubvol $VAR_DIR/layout/disklayout.conf | awk '{print $3}' | grep -v "/.snapshots") ) included_mountpoints=($(tr ' ' '\n' <<<"${included_mountpoints[@]}" | awk '!u[$0]++' | tr '\n' ' ')) # TSM does not restore the mountpoints for filesystems it does not recover. Setting the -# MOUNTPOINTS_TO_RESTORE variable allows this to be recreated in the restore -# default 90_create_missing_directories.sh script +# MOUNTPOINTS_TO_RESTORE variable allows this to be recreated in the restore +# default 900_create_missing_directories.sh script excluded_mountpoints=( $(grep ^#fs $VAR_DIR/layout/disklayout.conf | awk '{print $3}') ) MOUNTPOINTS_TO_RESTORE=${excluded_mountpoints[@]#/} diff --git a/usr/share/rear/verify/USB/NETFS/default/54_choose_backup_archive.sh b/usr/share/rear/verify/USB/NETFS/default/540_choose_backup_archive.sh similarity index 100% rename from usr/share/rear/verify/USB/NETFS/default/54_choose_backup_archive.sh rename to usr/share/rear/verify/USB/NETFS/default/540_choose_backup_archive.sh diff --git a/usr/share/rear/verify/default/02_cciss_scsi_engage.sh b/usr/share/rear/verify/default/020_cciss_scsi_engage.sh similarity index 100% rename from usr/share/rear/verify/default/02_cciss_scsi_engage.sh rename to usr/share/rear/verify/default/020_cciss_scsi_engage.sh diff --git a/usr/share/rear/verify/default/020_translate_url.sh b/usr/share/rear/verify/default/020_translate_url.sh new file mode 120000 index 0000000000..3d4c1f59c1 --- /dev/null +++ b/usr/share/rear/verify/default/020_translate_url.sh @@ -0,0 +1 @@ +../../prep/default/020_translate_url.sh \ No newline at end of file diff --git a/usr/share/rear/verify/default/02_translate_url.sh b/usr/share/rear/verify/default/02_translate_url.sh deleted file mode 120000 index 476a555744..0000000000 --- a/usr/share/rear/verify/default/02_translate_url.sh +++ /dev/null @@ -1 +0,0 @@ -../../prep/default/02_translate_url.sh \ No newline at end of file diff --git a/usr/share/rear/verify/default/030_translate_tape.sh b/usr/share/rear/verify/default/030_translate_tape.sh new file mode 120000 index 0000000000..2d233d10ed --- /dev/null +++ b/usr/share/rear/verify/default/030_translate_tape.sh @@ -0,0 +1 @@ +../../prep/default/030_translate_tape.sh \ No newline at end of file diff --git a/usr/share/rear/verify/default/03_translate_tape.sh b/usr/share/rear/verify/default/03_translate_tape.sh deleted file mode 120000 index abd526ee68..0000000000 --- a/usr/share/rear/verify/default/03_translate_tape.sh +++ /dev/null @@ -1 +0,0 @@ -../../prep/default/03_translate_tape.sh \ No newline at end of file diff --git a/usr/share/rear/verify/default/04_validate_variables.sh b/usr/share/rear/verify/default/040_validate_variables.sh similarity index 85% rename from usr/share/rear/verify/default/04_validate_variables.sh rename to usr/share/rear/verify/default/040_validate_variables.sh index 13c36302ef..55a02fb50b 100644 --- a/usr/share/rear/verify/default/04_validate_variables.sh +++ b/usr/share/rear/verify/default/040_validate_variables.sh @@ -1,4 +1,4 @@ -# verify/default/04_validate_variables.sh +# verify/default/040_validate_variables.sh # test if variable WAIT_SECS is an interger, if not, give it the default value if [[ ! -z "$WAIT_SECS" ]]; then diff --git a/usr/share/rear/verify/default/05_create_mappings_dir.sh b/usr/share/rear/verify/default/050_create_mappings_dir.sh similarity index 92% rename from usr/share/rear/verify/default/05_create_mappings_dir.sh rename to usr/share/rear/verify/default/050_create_mappings_dir.sh index 5dbc40c7e8..2573814c46 100644 --- a/usr/share/rear/verify/default/05_create_mappings_dir.sh +++ b/usr/share/rear/verify/default/050_create_mappings_dir.sh @@ -1,4 +1,4 @@ -# 05_create_mappings_dir.sh +# 050_create_mappings_dir.sh # We need the /etc/rear/mappings directory before the finalize script 30_create_mac_mappings.sh # script is invoked. If the directory was not created then the /etc/rear/mappings/mac file # cannot created as described in issue #861 diff --git a/usr/share/rear/wrapup/default/50_post_recovery_script.sh b/usr/share/rear/wrapup/default/500_post_recovery_script.sh similarity index 100% rename from usr/share/rear/wrapup/default/50_post_recovery_script.sh rename to usr/share/rear/wrapup/default/500_post_recovery_script.sh diff --git a/usr/share/rear/wrapup/default/98_good_bye.sh b/usr/share/rear/wrapup/default/980_good_bye.sh similarity index 100% rename from usr/share/rear/wrapup/default/98_good_bye.sh rename to usr/share/rear/wrapup/default/980_good_bye.sh diff --git a/usr/share/rear/wrapup/default/99_copy_logfile.sh b/usr/share/rear/wrapup/default/990_copy_logfile.sh similarity index 100% rename from usr/share/rear/wrapup/default/99_copy_logfile.sh rename to usr/share/rear/wrapup/default/990_copy_logfile.sh diff --git a/usr/share/rear/wrapup/rescue/default/60_add_galaxy_group.sh b/usr/share/rear/wrapup/rescue/default/600_add_galaxy_group.sh similarity index 100% rename from usr/share/rear/wrapup/rescue/default/60_add_galaxy_group.sh rename to usr/share/rear/wrapup/rescue/default/600_add_galaxy_group.sh