diff options
| author | Harald Hoyer <harald@redhat.com> | 2009-11-05 15:57:52 +0100 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2009-11-05 17:06:26 +0100 |
| commit | c3844cbf4afc6eb6733e53ef5020c3498b5b3ab2 (patch) | |
| tree | 91d76bd60d194095ac0b62400db9035862ff755f | |
| parent | 556e4ccb421fc3fa865eff9c47cd50b6f1a8afe6 (diff) | |
crypt: refix rd_LUKS_UUID handling
https://bugzilla.redhat.com/show_bug.cgi?id=533177
| -rwxr-xr-x | modules.d/50plymouth/cryptroot-ask.sh | 3 | ||||
| -rwxr-xr-x | modules.d/90crypt/cryptroot-ask.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules.d/50plymouth/cryptroot-ask.sh b/modules.d/50plymouth/cryptroot-ask.sh index 2188088..ff28660 100755 --- a/modules.d/50plymouth/cryptroot-ask.sh +++ b/modules.d/50plymouth/cryptroot-ask.sh @@ -17,7 +17,8 @@ if [ -n "$LUKS" ]; then ask=0 luuid=${2##luks-} for luks in $LUKS; do - if [ "${luuid##$luks}" != "$2" ]; then + luks=${luks##luks-} + if [ "${luuid##$luks}" != "$luuid" ]; then ask=1 fi done diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh index 7872d64..f945d54 100755 --- a/modules.d/90crypt/cryptroot-ask.sh +++ b/modules.d/90crypt/cryptroot-ask.sh @@ -17,7 +17,8 @@ if [ -n "$LUKS" ]; then ask=0 luuid=${2##luks-} for luks in $LUKS; do - if [ "${luuid##$luks}" != "$2" ]; then + luks=${luks##luks-} + if [ "${luuid##$luks}" != "$luuid" ]; then ask=1 fi done |