crypt/crypt-run-generator: also skip if UUID match in crypttab

master
Harald Hoyer 2013-08-13 01:20:06 +02:00
parent 5e264a5d3e
commit 730b9b8b77
2 changed files with 4 additions and 3 deletions

View File

@ -8,8 +8,9 @@ dev=$1
luks=$2 luks=$2


if [ -f /etc/crypttab ]; then if [ -f /etc/crypttab ]; then
while read l rest; do while read l d rest; do
strstr "${l##luks-}" "${luks##luks-}" && exit 0 strstr "${l##luks-}" "${luks##luks-}" && exit 0
strstr "$d" "${luks##luks-}" && exit 0
done < /etc/crypttab done < /etc/crypttab
fi fi



View File

@ -73,10 +73,10 @@ install() {
fi fi
done done
done < /etc/crypttab > $initdir/etc/crypttab done < /etc/crypttab > $initdir/etc/crypttab
else
for_each_host_dev_fs check_crypt
fi fi


for_each_host_dev_fs check_crypt

inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh" inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"


inst_multiple -o \ inst_multiple -o \