teldra
/
vinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progress

This commit is contained in:
teldra 2022-02-07 19:10:58 +01:00
parent 75ab3b6ea4
commit 983947f3b0
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/bootloader/grub
View File

@ -1,16 +1,16 @@
packages() { packages() {
if [ "$EFI" == "1" ]; then if [ "$EFI" == "1" ]; then
addpkg grub-x86_64-efi dracut-uefi addpkg grub-x86_64-efi
else else
addpkg grub addpkg grub
fi fi
} }
config() { config() {
if [ "$EFI" == "1" ]; then if [ "${EFI}" == "1" ]; then
grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id="Void" grub-install --bootloader-id="Void"
else else
grub-install $TARGET_PHY_ID grub-install "${TARGET_PHY_ID}"
fi fi
xbps-reconfigure -fa xbps-reconfigure -fa
} }

11
main.sh
View File

@ -137,6 +137,7 @@ do_partition() {
lvcreate --name root -l 100%FREE "vg_${TARGETNAME_UNDERSCORE}" lvcreate --name root -l 100%FREE "vg_${TARGETNAME_UNDERSCORE}"
mkswap -f "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-swap" mkswap -f "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-swap"
mkfs.btrfs -f "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-root" mkfs.btrfs -f "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-root"
mkswap "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-swap"
mount "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-root" "${target}" mount "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-root" "${target}"
btrfs subvol create "${target}/root" btrfs subvol create "${target}/root"
btrfs subvol create "${target}/home" btrfs subvol create "${target}/home"
@ -257,10 +258,12 @@ config
reset config reset config
for file in \$(find /tmp/vinstaller/run -type f); do for file in \$(find /tmp/vinstaller/run -type f); do
header \"\$(basename \$file)\" if grep -q "config()" "\${file}"; then
. \$file header \"\$(basename \$file)\"
config . \$file
reset config config
reset config
fi
done done
EOF EOF