Merge branch 'feature/support_luks_partitions' into 'master'

Support LUKS in disk partitions

See merge request riseuplabs/backupninja!13
This commit is contained in:
lavamind 2018-06-27 17:32:09 -07:00
commit 012dc70f60

View File

@ -633,7 +633,7 @@ if [ "$partitions" == "yes" ]; then
fi
if [ "$luksheaders" == "yes" ]; then
devices=`LC_ALL=C $SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1`
devices=`LC_ALL=C $SFDISK -l 2>/dev/null | grep '/dev/' | @SED@ -e 's/Disk //' -re 's/:? +.*//g'`
[ -n "$devices" ] || warning "No block device found"
partitions=`LC_ALL=C $SFDISK -l 2>/dev/null |grep "^/dev" | @AWK@ '{print $1}'`
[ -n "$partitions" ] || warning "No partitions found"