diff options
| author | Harald Hoyer <harald@redhat.com> | 2009-11-12 14:56:36 +0100 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2009-11-12 14:56:36 +0100 |
| commit | 394f30d8d4921ff710ab4d6baefe7b9bda40bc62 (patch) | |
| tree | 36e7c61adc2b970d67208495830ad03602ba68e1 | |
| parent | 1e0eb68b69d63d9e1c400ca3b83ccf3b24c74074 (diff) | |
crypt: ignore devices in /etc/crypttab (root is not in there)
| -rwxr-xr-x | modules.d/50plymouth/cryptroot-ask.sh | 16 | ||||
| -rwxr-xr-x | modules.d/90crypt/cryptroot-ask.sh | 7 |
2 files changed, 15 insertions, 8 deletions
diff --git a/modules.d/50plymouth/cryptroot-ask.sh b/modules.d/50plymouth/cryptroot-ask.sh index b0599af..47dd9d8 100755 --- a/modules.d/50plymouth/cryptroot-ask.sh +++ b/modules.d/50plymouth/cryptroot-ask.sh @@ -16,12 +16,15 @@ luksname=$2 if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then found=0 while read name dev rest; do - cdev=$(readlink -f $dev) - mdev=$(readlink -f $1) - if [ "$cdev" = "$mdev" ]; then - luksname="$name" - break - fi + cdev=$(readlink -f $dev) + mdev=$(readlink -f $1) + if [ "$cdev" = "$mdev" ]; then + # for now just ignore everything which is in crypttab + # anaconda does not write an entry for root + exit 0 + #luksname="$name" + #break + fi done < /etc/crypttab fi @@ -59,4 +62,5 @@ unset LUKS unset ask unset luks exit 0 +# vim:ts=8:sw=4:sts=4:et diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh index 3a20d22..b1c1889 100755 --- a/modules.d/90crypt/cryptroot-ask.sh +++ b/modules.d/90crypt/cryptroot-ask.sh @@ -18,8 +18,11 @@ if [ -f /etc/crypttab ] && ! getargs rd_NO_CRYPTTAB; then cdev=$(readlink -f $dev) mdev=$(readlink -f $1) if [ "$cdev" = "$mdev" ]; then - luksname="$name" - break + # for now just ignore everything which is in crypttab + # anaconda does not write an entry for root + exit 0 + #luksname="$name" + #break fi done < /etc/crypttab fi |