Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
971649b2
Commit
971649b2
authored
6 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Restore with batch
parent
12b10ffa
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/freedombone-restore-local
+7
-4
7 additions, 4 deletions
src/freedombone-restore-local
with
7 additions
and
4 deletions
src/freedombone-restore-local
+
7
−
4
View file @
971649b2
...
...
@@ -904,6 +904,9 @@ function simple_restore_backup_keys {
exit
945264
fi
simple_keys_file
=
/root/simplebackupkeys.tar.gz
if
[
-f
$simple_keys_file
]
;
then
rm
$simple_keys_file
fi
if
[
!
-f
$USB_MOUNT
/config.dat
]
;
then
echo
$'No keys were found on the backup drive'
...
...
@@ -911,7 +914,7 @@ function simple_restore_backup_keys {
rm
-rf
$USB_MOUNT
exit
356873
fi
echo
-n
"
$simple_backup_password
"
| gpg
--passphrase-fd
0
--output
$simple_keys_file
--decrypt
$USB_MOUNT
/config.dat
echo
-n
"
$simple_backup_password
"
| gpg
--batch
--passphrase-fd
0
--output
$simple_keys_file
--decrypt
$USB_MOUNT
/config.dat
if
[
!
-f
$simple_keys_file
]
;
then
umount
$USB_MOUNT
...
...
@@ -967,6 +970,9 @@ increment_restore_progress
check_admin_user
increment_restore_progress
gpg_agent_setup root
increment_restore_progress
simple_restore_backup_keys
increment_restore_progress
...
...
@@ -976,9 +982,6 @@ increment_restore_progress
copy_gpg_keys
increment_restore_progress
gpg_agent_setup root
increment_restore_progress
restore_blocklist
increment_restore_progress
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment