Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 11293-partition_table_backup
  • borg-custom-init-options
  • borg-sftp-support
  • borg-ssh-keygen
  • bugfix-borg-handler-create-options
  • debian
  • mariaback_full-intial
  • master
  • move-mail-deps
  • nap-initial
  • no_vservers
  • pristine-tar
  • stretch-backports
  • systemd_integration
  • tests
  • upstream
  • backupninja-0.3.4
  • backupninja-0.4.0
  • backupninja-0.4.1
  • backupninja-0.4.2
  • backupninja-0.4.4
  • backupninja-0.5
  • backupninja-0.7
  • backupninja-0.8
  • backupninja-0.9
  • backupninja-0.9.1
  • backupninja-0.9.10
  • backupninja-0.9.2
  • backupninja-0.9.3
  • backupninja-0.9.4
  • backupninja-0.9.5
  • backupninja-0.9.6
  • backupninja-0.9.7
  • backupninja-0.9.8
  • backupninja-0.9.8.1
  • backupninja-0.9.9
  • backupninja-1.0
  • backupninja-1.0-rc1
  • backupninja-1.0.1
  • backupninja-1.0.2
  • backupninja-1.1.0
  • backupninja_debian/0.9.10-1
  • backupninja_debian/0.9.10-2
  • backupninja_debian/0.9.9-1
  • backupninja_debian/1.0-1
  • backupninja_debian/1.0.1-1
  • backupninja_debian/1.0.1-2
  • backupninja_debian/1.0.2-1
  • backupninja_debian/1.0_rc1-1
  • backupninja_debian/1.1.0-1
  • backupninja_upstream/0.9.10
  • backupninja_upstream/1.0
  • backupninja_upstream/1.0.1
  • backupninja_upstream/1.0.2
  • backupninja_upstream/1.0_rc1
  • backupninja_upstream/1.1.0
56 results

Target

Select target project
  • liberate/backupninja
  • Benzhaomin/backupninja
  • ergonlogic/backupninja
  • louis/backupninja
  • guido/backupninja
  • ibauer/backupninja
  • romain/backupninja
  • gsubiron/backupninja
  • davidkg/backupninja
  • fkrauthan/backupninja
  • Glandos/backupninja
  • lyz/backupninja
  • nosmo/backupninja
  • orel/backupninja
  • raabf/backupninja
  • wu-lee/backupninja
  • huthamcau/backupninja
  • julien/backupninja
  • sensespidey/backupninja
  • LeLutin/backupninja
  • raT/backupninja
  • petrklima/backupninja
  • fancsali/backupninja
  • ko7ashiV/backupninja
  • yova/backupninja
  • jipem/backupninja
  • debian-janitor/backupninja
  • phlummox/backupninja
  • e1k/backupninja
  • jonhattan_/backupninja
  • illuusio/backupninja
  • maethor/backupninja
  • lavamind/backupninja
33 results
Select Git revision
  • backupninja.conf.d
  • borg-custom-init-options
  • borg-sftp-support
  • borg-ssh-keygen
  • debian
  • expand_pruning_options
  • maethor-master-patch-46063
  • maethor-master-patch-70558
  • mariaback_full-intial
  • master
  • nap-initial
  • pristine-tar
  • stretch-backports
  • systemd_integration
  • upstream
  • when-override
  • backupninja-0.3.4
  • backupninja-0.4.0
  • backupninja-0.4.1
  • backupninja-0.4.2
  • backupninja-0.4.4
  • backupninja-0.5
  • backupninja-0.7
  • backupninja-0.8
  • backupninja-0.9
  • backupninja-0.9.1
  • backupninja-0.9.10
  • backupninja-0.9.2
  • backupninja-0.9.3
  • backupninja-0.9.4
  • backupninja-0.9.5
  • backupninja-0.9.6
  • backupninja-0.9.7
  • backupninja-0.9.8
  • backupninja-0.9.8.1
  • backupninja-0.9.9
  • backupninja-1.0
  • backupninja-1.0-rc1
  • backupninja-1.0.1
  • backupninja-1.0.2
  • backupninja-1.1.0
  • backupninja-1.2.0
  • backupninja-1.2.0-rc1
  • backupninja-1.2.1
  • backupninja-1.2.2
  • backupninja_debian/0.9.10-1
  • backupninja_debian/0.9.10-2
  • backupninja_debian/0.9.9-1
  • backupninja_debian/1.0-1
  • backupninja_debian/1.0.1-1
  • backupninja_debian/1.0.1-2
  • backupninja_debian/1.0.2-1
  • backupninja_debian/1.0_rc1-1
  • backupninja_debian/1.1.0-1
  • backupninja_debian/1.2.0-1
  • backupninja_debian/1.2.1-1
  • backupninja_debian/1.2.2-1
  • backupninja_upstream/0.9.10
  • backupninja_upstream/1.0
  • backupninja_upstream/1.0.1
  • backupninja_upstream/1.0.2
  • backupninja_upstream/1.0_rc1
  • backupninja_upstream/1.1.0
  • backupninja_upstream/1.2.0
  • backupninja_upstream/1.2.1
  • backupninja_upstream/1.2.2
66 results
Show changes

Commits on Source 1

...@@ -284,6 +284,13 @@ do_borg_prune() { ...@@ -284,6 +284,13 @@ do_borg_prune() {
fi fi
_prune_done="(DONE)" _prune_done="(DONE)"
setDefault init
}
do_borg_init_options() {
inputBox "$borg_title" "Specify custom options for the repository initialization:"
[ $? -eq 1 ] && return
borg_init_options=$REPLY
setDefault finish setDefault finish
} }
...@@ -314,6 +321,7 @@ EOF ...@@ -314,6 +321,7 @@ EOF
## for more info see : borg prune -h ## for more info see : borg prune -h
prune = $borg_prune prune = $borg_prune
keep = "${borg_keep}d" keep = "${borg_keep}d"
init_options = $borg_init_options
[dest] [dest]
directory = $borg_directory directory = $borg_directory
...@@ -336,12 +344,14 @@ borg_main_menu() { ...@@ -336,12 +344,14 @@ borg_main_menu() {
conitem="test connection and destination dir $_con_done" conitem="test connection and destination dir $_con_done"
encitem="configure encryption mode $_enc_done" encitem="configure encryption mode $_enc_done"
pruneitem="configure pruning (optional) $_prune_done" pruneitem="configure pruning (optional) $_prune_done"
inititem="add custom repository'init_options' (optional) $_init_options_done"
menuBox "$borg_title" "choose a step:" \ menuBox "$borg_title" "choose a step:" \
src "$srcitem" \ src "$srcitem" \
dest "$destitem" \ dest "$destitem" \
conn "$conitem" \ conn "$conitem" \
enc "$encitem" \ enc "$encitem" \
prune "$pruneitem" \ prune "$pruneitem" \
init "$inititem" \
finish "finish and create config file" finish "finish and create config file"
[ $? = 0 ] || return [ $? = 0 ] || return
result="$REPLY" result="$REPLY"
...@@ -351,6 +361,7 @@ borg_main_menu() { ...@@ -351,6 +361,7 @@ borg_main_menu() {
"conn") do_borg_con;; "conn") do_borg_con;;
"enc") do_borg_enc;; "enc") do_borg_enc;;
"prune") do_borg_prune;; "prune") do_borg_prune;;
"init") do_borg_init_options;;
"finish") "finish")
if [[ "$_con_done$_dest_done$_enc_done$_src_done" != "(DONE)(DONE)(DONE)(DONE)" ]]; then if [[ "$_con_done$_dest_done$_enc_done$_src_done" != "(DONE)(DONE)(DONE)(DONE)" ]]; then
msgBox "$borg_title" "You cannot create the configuration file until mandatory steps are completed." msgBox "$borg_title" "You cannot create the configuration file until mandatory steps are completed."
...@@ -382,6 +393,7 @@ borg_wizard() { ...@@ -382,6 +393,7 @@ borg_wizard() {
borg_encryption=none borg_encryption=none
borg_passphrase= borg_passphrase=
borg_keep=30 borg_keep=30
borg_init_options=
# Global variables whose '*' shall not be expanded # Global variables whose '*' shall not be expanded
set -o noglob set -o noglob
......
...@@ -32,6 +32,7 @@ getconf prune yes ...@@ -32,6 +32,7 @@ getconf prune yes
getconf keep 30d getconf keep 30d
getconf prune_options getconf prune_options
getconf cache_directory getconf cache_directory
getconf init_options
setsection dest setsection dest
getconf user getconf user
...@@ -98,7 +99,7 @@ fi ...@@ -98,7 +99,7 @@ fi
### INIT IF NEEDED ### ### INIT IF NEEDED ###
if [ "$init" == "yes" ]; then if [ "$init" == "yes" ]; then
initstr="borg init --encryption=$encryption $execstr_repository" initstr="borg init --encryption=$encryption $init_options $execstr_repository"
debug "$initstr" debug "$initstr"
if [ $test = 0 ]; then if [ $test = 0 ]; then
output="`su -c "$initstr" 2>&1`" output="`su -c "$initstr" 2>&1`"
......