Merge branch 'master' of github.com:rear/rear

rear · Feb 27, 2013 · 310dd70 · 310dd70
2 parents 7d4769d + d3ceb4e
commit 310dd70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/...tore/DP/default/20_request_gui_restore.sh → ...rify/DP/default/45_request_gui_restore.sh b/...tore/DP/default/20_request_gui_restore.sh → ...rify/DP/default/45_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/50_select_dp_restore.sh
@@ -11,6 +11,9 @@
 
 #set -e
 
+[ -f /tmp/DP_GUI_RESTORE ] && return # GUI restore explicetely requested
+
+
 OMNIDB=/opt/omni/bin/omnidb
 OMNICELLINFO=/opt/omni/bin/omnicellinfo