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

new

This commit is contained in:
teldra 2022-08-05 15:27:58 +02:00
parent bad76f2c36
commit d3ffca3367
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/bootloader/grub
View File

@ -7,7 +7,7 @@ packages() {
}
config() {
if [ "${ENC}" == "1" ]; then
if [ "${ENC}" == "1" ] && ! [ "${ENCRYPTION_STYLE}" == "e" ]; then
if ! grep -q "GRUB_ENABLE_CRYPTODISK" /etc/default/grub; then
echo "GRUB_ENABLE_CRYPTODISK=y" >> /etc/default/grub
fi

6
main.sh
View File

@ -115,7 +115,7 @@ do_partition() {
parted "${TARGET_PHY_ID}" unit mib -s -- mkpart EFI fat32 "$start" "$end"
parted "${TARGET_PHY_ID}" unit mib -s -- set 1 esp on
TARGET_PART="2"
start="$(( end + 1 ))"
start="$(( end ))"
sleep 2
mkfs.vfat -I -F32 "${TARGET_PHY_ID}-part1"
if [ "${ENCRYPTION_STYLE}" == "e" ]; then
@ -123,7 +123,7 @@ do_partition() {
end=$(( start + size ))
parted "${TARGET_PHY_ID}" unit mib -s -- mkpart boot ext4 "$start" "${end}"
TARGET_PART="3"
start="$(( end + 1 ))"
start="$(( end ))"
BOOTDEV="${TARGET_PHY_ID}-part2"
sleep 2
mkfs.btrfs -q -f "${TARGET_PHY_ID}-part2"
@ -137,7 +137,7 @@ do_partition() {
size=2048
end=$(( start + size ))
parted "${TARGET_PHY_ID}" unit mib -s -- mkpart primary ext4 "${start}" "${end}"
start="$(( end + 1 ))"
start="$(( end ))"
TARGET_PART="2"
BOOTDEV="${TARGET_PHY_ID}-part1"
sleep 2