merge master branch with dev #1222
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using paired parenthesis for case patterns, see "Paired parenthesis" at https://github.com/rear/rear/wiki/Coding-Style
Having the case patterns on separated lines according to usual syntax style in rear.
Prune now only affects archives with BORGBACKUP_ARCHIVE_PREFIX
BORGBACKUP_COMPRESSION now handles Borg compression defaults correctly: If user did not set anything in BORGBACKUP_COMPRESSION, Borg default compression will be used.
…uring_borg Conflicts: usr/share/rear/conf/default.conf
Out of order Borg keys copy bug corrected. (When using COPY_AS_IS_BORG and BORGBACKUP_ENC_TYPE=keyfile)
fit better to ReaR naming conventions.
Improvements in handling of encrypted Borg repositories, see #1048
the scripts: - lib/bootloader-functions.sh - output/PXE/default/81_create_pxelinux_cfg.sh - output/USB/Linux-i386/30_create_extlinux.sh - rescue/GNU/Linux/95_cfg2html.sh - rescue/default/10_hostname.sh The 'rescue/default/10_hostname.sh' script was responsible for the hostname mismatch in recover mode. Fix related to issue #1049
New Borg Backup variables introduced: BORGBACKUP_KEYS_DIR BORGBACKUP_CACHE_DIR BORGBACKUP_RELOCATED_REPO_ACCESS_IS_OK BORGBACKUP_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK see default.conf and see #1052
…ch becomes 005 and adapted symlinks to point again to the right re-numbered scripts
… (instead of two before) and fixed a lot of texts but the latter is not yet finished see #1053
…rticular_for_user_scripts_see_comment_in_pull_request_1051 Renumbering all scripts (NM becomes NM0) to get more free number space in particular for user scripts, cf. #1051 (comment) Renumbered by ading a trailing 0 so that 12 becomes 120 except 00 which becomes 005 and adapted symlinks to point again to the right re-numbered scripts, cf #1051 Adapted the SourceStage function in framework-functions.sh for scripts with the new 3-number digits (instead of two before). Adapted the texts (in particular the comments in the scripts) to the new 3-number digits of the scripts where possible. Nevertheless this renumbering may cause regressions for special cases that I missed. This renumbering will cause regressions for users who have their own 2-digit scripts because now only 3-digit scripts will work (see the SourceStage function in framework-functions.sh) so that 2-digit user scripts must be renamed to 3-digit names. Depending on how many users are hit by that regression we could later think about an automated way how to support also 2-digit scripts: My immediate idea is to handle a NM_name script as if its name was NM0_name (or perhaps to simply rename them automatically from NM_name to NM0_name? think about
Now they should behave according #968
Correction in behavior of Borg environment variables. Now Borg environment variables (named BORG_*) must be set directly (e.g. via "export ..." in local.conf) as any other environment variable. Variables that are used only by ReaR to implement support for Borg Backup are named BORGBACKUP_*
…d and configuration files to the TFTP/PXE server automatically via new variables: PXE_TFTP_URL=nfs://server/export/nfs/tftpboot PXE_CONFIG_URL=nfs://server/export/nfs/tftpboot/pxelinux.cfg Furthermore, we also introduced variable PXE_RECOVER_MODE to handle automatic or unattended PXE booting (great improvement at least for me:) However, the legacy way of creating the kernel, initrd and configuration files are kept in place so that we do not break any method currently in use by our REAR users. If it breaks somehow I'm the blame I'm afraid. See also issue #193
Added ReaR with Borg configuration example
In case we are running MANUAL_INCLUDE mode, there is no need to add volumes, NOT explicitly excluded via EXCLUDE_MOUNTPOINTS
…nitrd and install bootloader which makes it work but actually that should also work via the existing ReaR scripts but something needs to be fixed there (issue1085)
First partially working implementation of the new ZYPPER backup method, see #1085
Try to find UEFI_BOOTLOADER file BOOTX64.EFI in /boot/EFI where it could be located in particular on Arch Linux.
to fix the bug of issue #1211 where multipath devices of excluded volume groups were not commented in the disklayout.conf which leaded to formatting wrong multipath devices and that was clearly not the purpose.
… pull request 1204
…en fall back step by step to more and more complicated autodetection methods (pull request 1212)
…kup method if BACKUP_SELINUX_DISABLE=0
Enable SELinux in the rescure/restore ReaR image for tar internal bac…
… nested 'if...else' conditions (pull request 1212)
…enerally_follow_up_for_pull1204 Make UEFI_BOOTLOADER work more generally. When the user has specified a UEFI_BOOTLOADER file it is used as UEFI bootloader if it exists as regular file so that now the user has the final control what ReaR will use as UEFI bootloader. Otherwise ReaR does step by step more and more complicated autodetection methods to determine what to use as UEFI bootloader file and errors out if nothing could be found. For details about UEFI_BOOTLOADER see default.conf.
… size input; issue #1201
New USB_PARTITION_ALIGN_BLOCK_SIZE variable to specify partitioning alignment during "rear format" (the default alignment is 8MiB block size). New USB_DEVICE_FILESYSTEM_PARAMS variable to specify special filesystem parameters during "rear format" (by default there are no special filesystem parameters). New 'lz4' compression choice for REAR_INITRD_COMPRESSION. For details see default.conf.
…egarding_pull_request_1217 A few coding style iprovements for #1217
|
uff |
jsmeix
reviewed
Mar 8, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To bring these to the same level a major merge is necessary