From: Harald Hoyer Date: Mon, 27 Jul 2015 11:30:22 +0000 (+0200) Subject: crypt: s/allow-discards/discard for crypttab X-Git-Tag: 044~131 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2082cdf230574fa7482903730b584445ed3a2a08;p=thirdparty%2Fdracut.git crypt: s/allow-discards/discard for crypttab actually the option in crypttab is named "discard" and not "allow-discards" https://bugzilla.suse.com/show_bug.cgi?id=932972 --- diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh index 5bf60ecb7..8dad76ba1 100755 --- a/modules.d/90crypt/crypt-run-generator.sh +++ b/modules.d/90crypt/crypt-run-generator.sh @@ -15,10 +15,10 @@ if strstr "$(cryptsetup --help)" "allow-discards"; then if discarduuids=$(getargs "rd.luks.allow-discards"); then discarduuids=$(str_replace "$discarduuids" 'luks-' '') if strstr " $discarduuids " " ${luks##luks-}"; then - allowdiscards="allow-discards" + allowdiscards="discard" fi elif getargbool 0 rd.luks.allow-discards; then - allowdiscards="allow-discards" + allowdiscards="discard" fi fi