projects
/
noc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
edd429a
)
whitespace-only fix
author
Christian Pointner
<equinox@realraum.at>
Sun, 2 Dec 2018 08:28:45 +0000
(09:28 +0100)
committer
Christian Pointner
<equinox@realraum.at>
Sun, 2 Dec 2018 08:28:45 +0000
(09:28 +0100)
ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
patch
|
blob
|
history
ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
patch
|
blob
|
history
ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
patch
|
blob
|
history
diff --git
a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
index
aeb40d6
..
a2fb80c
100644
(file)
--- a/
ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/
ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
@@
-53,22
+53,22
@@
d-i partman-auto/expert_recipe string \
boot-root :: \
1000 10000 -1 ext4 \
$defaultignore{ } $primary{ } $bootable{ } \
boot-root :: \
1000 10000 -1 ext4 \
$defaultignore{ } $primary{ } $bootable{ } \
- method{ lvm } vg_name{ {{ hostname }} } \
+ method{ lvm } vg_name{ {{ hostname }} } \
. \
2048 10000 2560 ext4 \
. \
2048 10000 2560 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
. \
1024 11000 1280 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
. \
1024 11000 1280 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
768 10000 768 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
768 10000 768 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
@@
-76,7
+76,7
@@
d-i partman-auto/expert_recipe string \
options/noexec{ noexec } \
. \
16 20000 -1 ext4 \
options/noexec{ noexec } \
. \
16 20000 -1 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method( keep } lv_name{ dummy } \
.
method( keep } lv_name{ dummy } \
.
diff --git
a/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
b/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index
d34be49
..
7d8aacf
100644
(file)
--- a/
ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/
ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@
-58,22
+58,22
@@
d-i partman-auto/expert_recipe string \
boot-root :: \
1000 10000 -1 ext4 \
$defaultignore{ } $primary{ } $bootable{ } \
boot-root :: \
1000 10000 -1 ext4 \
$defaultignore{ } $primary{ } $bootable{ } \
- method{ lvm } vg_name{ {{ hostname }} } \
+ method{ lvm } vg_name{ {{ hostname }} } \
. \
2048 10000 2560 ext4 \
. \
2048 10000 2560 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
. \
1024 11000 1280 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
. \
1024 11000 1280 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
768 10000 768 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
768 10000 768 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
@@
-81,7
+81,7
@@
d-i partman-auto/expert_recipe string \
options/noexec{ noexec } \
. \
16 20000 -1 ext4 \
options/noexec{ noexec } \
. \
16 20000 -1 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method( keep } lv_name{ dummy } \
.
method( keep } lv_name{ dummy } \
.
diff --git
a/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
b/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index
8af9dc0
..
ee01602
100644
(file)
--- a/
ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/
ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@
-58,22
+58,22
@@
d-i partman-auto/expert_recipe string \
boot-root :: \
1000 10000 -1 ext4 \
$defaultignore{ } $primary{ } $bootable{ } \
boot-root :: \
1000 10000 -1 ext4 \
$defaultignore{ } $primary{ } $bootable{ } \
- method{ lvm } vg_name{ {{ hostname }} } \
+ method{ lvm } vg_name{ {{ hostname }} } \
. \
2048 10000 2560 ext4 \
. \
2048 10000 2560 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
. \
1024 11000 1280 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
. \
1024 11000 1280 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
768 10000 768 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
768 10000 768 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
@@
-81,7
+81,7
@@
d-i partman-auto/expert_recipe string \
options/noexec{ noexec } \
. \
16 20000 -1 ext4 \
options/noexec{ noexec } \
. \
16 20000 -1 ext4 \
- $lvmok{ } in_vg{ {{ hostname }} } \
+ $lvmok{ } in_vg{ {{ hostname }} } \
method( keep } lv_name{ dummy } \
.
method( keep } lv_name{ dummy } \
.