diff options
| author | Miloslav Trmac <mitr@volny.cz> | 2006-07-09 02:56:12 +0000 |
|---|---|---|
| committer | Miloslav Trmac <mitr@volny.cz> | 2006-07-09 02:56:12 +0000 |
| commit | c856e2fc5c403749f47b0c77834a06c8c221155b (patch) | |
| tree | 695e7bafe8ca448d8b2dfee08914ac142ce765a4 | |
| parent | 775f15b4e6a7cc0612cb3b9c8900c20909dcdd6a (diff) | |
| download | initscripts-c856e2fc5c403749f47b0c77834a06c8c221155b.tar initscripts-c856e2fc5c403749f47b0c77834a06c8c221155b.tar.gz initscripts-c856e2fc5c403749f47b0c77834a06c8c221155b.tar.bz2 initscripts-c856e2fc5c403749f47b0c77834a06c8c221155b.tar.xz initscripts-c856e2fc5c403749f47b0c77834a06c8c221155b.zip | |
Don't allow any crypttab options for LUKS partitions (#197656).
| -rw-r--r-- | crypttab.5 | 3 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -98,6 +98,9 @@ after destroying the encrypted block device. system installations, with some of them encrypting the swap partitions and some of them not.) +.PP +No options can be specified for LUKS encrypted partitions. + .SH COMPATIBILITY The .B /etc/crypptab diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 4b3ec8d1..79e20cfa 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -192,7 +192,11 @@ init_crypto() { ret=1 continue fi - /sbin/cryptsetup $params ${key:+-d $key} luksOpen "$src" "$dst" <&1 + if [ -n "$params" ]; then + echo "$dst: options are invalid for LUKS partitions," \ + "ignoring them" + fi + /sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1 else /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1 fi |