iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9fefba0
)
wip
lvm-wip
author
Ian Kelling
<iank@fsf.org>
Sat, 4 Sep 2021 12:26:44 +0000
(08:26 -0400)
committer
Ian Kelling
<iank@fsf.org>
Sat, 4 Sep 2021 12:26:44 +0000
(08:26 -0400)
fai/config/hooks/partition.DEFAULT
patch
|
blob
|
history
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index 56919e91a292cdb0a4867dfc625e761056fab085..8b757111c8a56912efacb1302327346b68c1fbc0 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-153,7
+153,6
@@
add-part() { # add partition suffix to $dev
}
rootdev() { add-part $@ $rootn; }
}
rootdev() { add-part $@ $rootn; }
-root2dev() { add-part $@ $root2n; }
swapdev() { add-part $@ $swapn; }
bootdev() { add-part $@ $bootn; }
boot2dev() { add-part $@ $boot2n; }
swapdev() { add-part $@ $swapn; }
bootdev() { add-part $@ $bootn; }
boot2dev() { add-part $@ $boot2n; }
@@
-165,10
+164,8
@@
even_bigdev() { add-part $@ $even_bign; }
crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; }
crypt-name() { echo crypt_dev_${1##*/}; }
root-cryptdev() { crypt-dev $(rootdev $@); }
crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; }
crypt-name() { echo crypt_dev_${1##*/}; }
root-cryptdev() { crypt-dev $(rootdev $@); }
-root2-cryptdev() { crypt-dev $(root2dev $@); }
swap-cryptdev() { crypt-dev $(swapdev $@); }
root-cryptname() { crypt-name $(rootdev $@); }
swap-cryptdev() { crypt-dev $(swapdev $@); }
root-cryptname() { crypt-name $(rootdev $@); }
-root2-cryptname() { crypt-name $(root2dev $@); }
swap-cryptname() { crypt-name $(swapdev $@); }
dev-mib() {
swap-cryptname() { crypt-name $(swapdev $@); }
dev-mib() {
@@
-355,6
+352,9
@@
fi
case $raid_level in
1*) boot_space=$(( boot_space / 2 )) ;;
esac
case $raid_level in
1*) boot_space=$(( boot_space / 2 )) ;;
esac
+build_mib=0
+browse_mib=0
+whonix_mib=0
if (( boot_space > 60000 )); then
# this is larger than needed for several /boot subvols,
# becuase I keep a minimal debian install on it for
if (( boot_space > 60000 )); then
# this is larger than needed for several /boot subvols,
# becuase I keep a minimal debian install on it for
@@
-362,7
+362,10
@@
if (( boot_space > 60000 )); then
boot_mib=10000
root2_mib=200000
boot2_mib=2000
boot_mib=10000
root2_mib=200000
boot2_mib=2000
-elif (( boot_spa_ce > 30000 )); then
+ build_mib=30000
+ browse_mib=10000
+ whonix_mib=15000
+elif (( boot_space > 30000 )); then
boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
root2_mib=100
boot2_mib=100
boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
root2_mib=100
boot2_mib=100
@@
-379,6
+382,9
@@
case $raid_level in
boot_mib=$(( boot_mib * 2 ))
boot2_mib=$(( boot2_mib * 2 ))
root2_mib=$(( root2_mib * 2 ))
boot_mib=$(( boot_mib * 2 ))
boot2_mib=$(( boot2_mib * 2 ))
root2_mib=$(( root2_mib * 2 ))
+ build_mib=$(( build_mib * 2 ))
+ browse_mib=$(( browse_mib * 2 ))
+ whonix_mib=$(( whonix_mib * 2 ))
;;
esac
### end calculate boot partition space
;;
esac
### end calculate boot partition space
@@
-561,29
+567,23
@@
if $partition; then
boot_part_mib=$(( boot_mib / ${#boot_devs[@]} ))
boot2_part_mib=$(( boot2_mib / ${#boot_devs[@]} ))
root2_part_mib=$(( root2_mib / ${#root_devs[@]} ))
boot_part_mib=$(( boot_mib / ${#boot_devs[@]} ))
boot2_part_mib=$(( boot2_mib / ${#boot_devs[@]} ))
root2_part_mib=$(( root2_mib / ${#root_devs[@]} ))
- root_end=$(( disk_mib - root2_part_mib - swap_mib - boot_part_mib - boot2_part_mib ))
- root2_end=$(( root_end + root2_part_mib ))
- swap_end=$(( root2_end + swap_mib ))
- boot_end=$(( swap_end + boot_part_mib ))
+ build_part_mib=$(( build_mib / ${#root_devs[@]} ))
+ whonix_part_mib=$(( whonix_mib / ${#root_devs[@]} ))
+ browse_part_mib=$(( browse_mib / ${#root_devs[@]} ))
+ root_end=$(( disk_mib - boot_part_mib - boot2_part_mib ))
+ boot_end=$(( root_end + boot_part_mib ))
parted -s $dev mklabel gpt
# MiB because parted complains about alignment otherwise.
pcmd="parted -a optimal -s -- $dev"
# root partition, the main big one
parted -s $dev mklabel gpt
# MiB because parted complains about alignment otherwise.
pcmd="parted -a optimal -s -- $dev"
# root partition, the main big one
- $pcmd mkpart primary ext
3
524MiB ${root_end}MiB
+ $pcmd mkpart primary ext
2
524MiB ${root_end}MiB
# without naming, systemd gives us misc errors like:
# dev-disk-by\x2dpartlabel-primary.device: Dev dev-disk-by\x2dpartlabel-primary.device appeared twice
# without naming, systemd gives us misc errors like:
# dev-disk-by\x2dpartlabel-primary.device: Dev dev-disk-by\x2dpartlabel-primary.device appeared twice
+ $pcmd set $rootn lvm on
$pcmd name $rootn root
$pcmd name $rootn root
- # root2 partition
- $pcmd mkpart primary ext3 ${root_end}MiB ${root2_end}MiB
- $pcmd name $root2n root2
- # normally a swap is type "linux-swap", but this is encrypted swap. using that
- # label will confuse systemd.
- # swap partition
- $pcmd mkpart primary "" ${root2_end}MiB ${swap_end}MiB
- $pcmd name $swapn swap
# boot partition
# boot partition
- $pcmd mkpart primary "" ${
swap
_end}MiB ${boot_end}MiB
+ $pcmd mkpart primary "" ${
root
_end}MiB ${boot_end}MiB
$pcmd name $bootn boot
# boot2 partition
$pcmd mkpart primary "" ${boot_end}MiB ${disk_mib}MiB
$pcmd name $bootn boot
# boot2 partition
$pcmd mkpart primary "" ${boot_end}MiB ${disk_mib}MiB
@@
-657,7
+657,14
@@
if $partition; then
done
ls -la /dev/btrfs-control # this was probably for debugging...
sleep 1
done
ls -la /dev/btrfs-control # this was probably for debugging...
sleep 1
- bpart $(for dev in ${devs[@]}; do root-cryptdev; done)
+ pvcreate $(root-cryptdev)
+ vgcreate vg$dev $(root-cryptdev)
+ lvcreate -n lvroot2 -L ${root2_part_mib}m vg$dev
+ lvcreate -n lvbuild -L ${build_part_mib}m vg$dev
+ lvcreate -n lvwhonix -L ${whonix_part_mib}m vg$dev
+ lvcreate -n lvbrowse -L ${browse_part_mib}m vg$dev
+ lvcreate -n lvroot -L 95%FREE vg$dev
+ bpart $(for dev in ${devs[@]}; do echo /dev/vg$dev/lvroot; done)
bpart ${boot_devs[@]}
else
for dev in ${devs[@]}; do
bpart ${boot_devs[@]}
else
for dev in ${devs[@]}; do