Commit d26f40a
committed
blockdev: add support for dm-integrity's new UUID naming scheme
Cryptsetup commit 12eb040 ("Create dm-integrity with CRYPT_SUBDEV prefix.") changed
UUID naming scheme for integrity-protected devices:
```
$ dmsetup info --columns --noheadings -o UUID /dev/dm-2
CRYPT-SUBDEV-ef0561fda2cf4f8eb9fd729f4cd3e0c7-root_dif
```
Before crytsetup-2.8.0:
```
$ dmsetup info --columns --noheadings -o UUID /dev/dm-2
CRYPT-INTEGRITY-bec07f15a1c540b0833fcccd6ac2459d-root_dif
```
This PR updates `is_luks_integrity()` to recognize both schemes.
https://gitlab.com/cryptsetup/cryptsetup/-/commit/12eb04094304467232348e99df0fbf95074d35b31 parent ceb250d commit d26f40a
2 files changed
+7
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
198 | 198 | | |
199 | 199 | | |
200 | 200 | | |
201 | | - | |
| 201 | + | |
202 | 202 | | |
203 | 203 | | |
204 | 204 | | |
| |||
207 | 207 | | |
208 | 208 | | |
209 | 209 | | |
210 | | - | |
211 | | - | |
212 | | - | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
213 | 215 | | |
214 | 216 | | |
215 | 217 | | |
| |||
0 commit comments