Merge branch 'patch-1' into 'master'

Exclude zram devices, they don't have a partition table

See merge request riseuplabs/backupninja!12
This commit is contained in:
lavamind 2018-06-27 17:31:56 -07:00
commit fb3b45343b

View File

@ -608,7 +608,7 @@ fi
if [ "$partitions" == "yes" ]; then if [ "$partitions" == "yes" ]; then
if [ "$dosfdisk" == "yes" ]; then if [ "$dosfdisk" == "yes" ]; then
devices=`LC_ALL=C $LSBLK --output NAME,TYPE --list --paths 2>/dev/null | grep "disk$" | @AWK@ '{print $1}'` devices=`LC_ALL=C $LSBLK --output NAME,TYPE --list --paths 2>/dev/null | grep "disk$" | grep -v '^/dev/zram' | @AWK@ '{print $1}'`
if [ "$devices" == "" ]; then if [ "$devices" == "" ]; then
warning "No harddisks found" warning "No harddisks found"
fi fi