Buster: Fix preseed to work with LUKS+LVM

This commit is contained in:
Jeremy Gardais 2020-03-17 17:14:28 +01:00
parent 2f47067534
commit 8b304127be
Signed by: jegardai
GPG Key ID: E759BAA22501AF32
2 changed files with 18 additions and 28 deletions

View File

@ -195,15 +195,10 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext3 } \ use_filesystem{ } filesystem{ ext3 } \
mountpoint{ /boot } \ mountpoint{ /boot } \
. \ . \
16000 100000 -1 ext4 \
$defaultignore{ } \
$primary{ } \
method{ lvm } \
vg_name{ crypt } \
. \
1000 8000 3000 ext4 \ 1000 8000 3000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_root } \ $primary{ } \
lv_name{ lv_root } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
label{ root } \ label{ root } \
@ -211,7 +206,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
4000 7000 10000 ext4 \ 4000 7000 10000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_usr } \ lv_name{ lv_usr } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -220,7 +215,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
4000 6000 8000 ext4 \ 4000 6000 8000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_var } \ lv_name{ lv_var } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -229,7 +224,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
1000 5000 2000 ext4 \ 1000 5000 2000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_tmp } \ lv_name{ lv_tmp } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -239,7 +234,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
2000 4000 10000 ext4 \ 2000 4000 10000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_home } \ lv_name{ lv_home } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -248,7 +243,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
512 3000 4000 ext4 \ 512 3000 4000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_opt } \ lv_name{ lv_opt } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
label{ opt } \ label{ opt } \
@ -256,12 +251,12 @@ d-i partman-auto/expert_recipe string \
. \ . \
512 1000 100% linux-swap \ 512 1000 100% linux-swap \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_swap } \ lv_name{ lv_swap } \
method{ swap } format{ } \ method{ swap } format{ } \
. \ . \
100 100 -1 ext3 \ 100 100 -1 ext3 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_free } \ lv_name{ lv_free } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext3 } \ use_filesystem{ } filesystem{ ext3 } \
label{ free } \ label{ free } \

View File

@ -195,15 +195,10 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext3 } \ use_filesystem{ } filesystem{ ext3 } \
mountpoint{ /boot } \ mountpoint{ /boot } \
. \ . \
16000 100000 -1 ext4 \
$defaultignore{ } \
$primary{ } \
method{ lvm } \
vg_name{ crypt } \
. \
1000 8000 3000 ext4 \ 1000 8000 3000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_root } \ $primary{ } \
lv_name{ lv_root } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
label{ root } \ label{ root } \
@ -211,7 +206,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
4000 7000 10000 ext4 \ 4000 7000 10000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_usr } \ lv_name{ lv_usr } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -220,7 +215,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
4000 6000 8000 ext4 \ 4000 6000 8000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_var } \ lv_name{ lv_var } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -229,7 +224,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
1000 5000 2000 ext4 \ 1000 5000 2000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_tmp } \ lv_name{ lv_tmp } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -239,7 +234,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
2000 4000 10000 ext4 \ 2000 4000 10000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_home } \ lv_name{ lv_home } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
options/nodev{ nodev } \ options/nodev{ nodev } \
@ -248,7 +243,7 @@ d-i partman-auto/expert_recipe string \
. \ . \
512 3000 4000 ext4 \ 512 3000 4000 ext4 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_opt } \ lv_name{ lv_opt } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
label{ opt } \ label{ opt } \
@ -256,12 +251,12 @@ d-i partman-auto/expert_recipe string \
. \ . \
512 1000 100% linux-swap \ 512 1000 100% linux-swap \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_swap } \ lv_name{ lv_swap } \
method{ swap } format{ } \ method{ swap } format{ } \
. \ . \
100 100 -1 ext3 \ 100 100 -1 ext3 \
$lvmok{ } \ $lvmok{ } \
in_vg{ crypt } lv_name{ lv_free } \ lv_name{ lv_free } \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext3 } \ use_filesystem{ } filesystem{ ext3 } \
label{ free } \ label{ free } \