commit d1cd9230c42d4e297aee5517d22fe2751f23889c Spenser Truex <spensertruexonline@gmail.com> 2019-04-20 13:31:52 -0700 Support for raw UUIDs fixed.
backup | 2 +- backup.pl | 24 ++++++++++++++---------- install | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/backup b/backup index 7bbda6c..dba907d 100755 --- a/backup +++ b/backup @@ -1,2 +1,2 @@ #!/bin/bash -backup.pl '64f91d6e-90e2-41d7-8494-bcb1d01b7b40' '/home/jose/bin/keyfile' 'jose' '/mnt' +backup.pl 'bf5675ff-2504-4b47-9cd2-0300af06b2fa' '/home/jose/crypto-key-file' 'jose' '/mnt' diff --git a/backup.pl b/backup.pl index 9718781..ebaec56 100755 --- a/backup.pl +++ b/backup.pl @@ -6,19 +6,23 @@ my $keyfile = $ARGV[1]; my $user = $ARGV[2]; my $mountfolder = $ARGV[3]; # Put auto-dev-detect code here -my $last_half; +my $last_half = ''; my $blkid = `blkid`; -print "$blkid\n$uuid\n$keyfile"; -if($blkid =~ /(.*)$uuid.*/) { - print $1; - my $tmp = $1; - $tmp =~ m#/dev/(.*?):#; - $last_half = $1; +for(split "\n", $blkid) { + print; + print "\n"; + if(m#$uuid#) { + m#/dev/(.*):#; + $last_half = $1; + last; + } +} +if($last_half eq '') { + die "Failed to associate a dev device with that UUID."; } else { - die "Could not get a device ID from that UUID." + print "Last half: $last_half\n"; } -my $mount = "$mountfolder/dev/$last_half"; -my $mapper = "/dev/mapper/$last_half"; +my $mount = "$mountfolder/$last_half"; `cryptsetup --key-file $keyfile luksOpen /dev/$last_half $last_half`; `mkdir -p $mount`; `mount /dev/mapper/$last_half $mount`; diff --git a/install b/install index 120c5aa..4f6d836 100755 --- a/install +++ b/install @@ -1,5 +1,5 @@ #!/bin/bash -chown root backup +#chown root backup cp backup /usr/bin cp backup.pl /usr/bin cp backup-daily /etc/cron.daily