new
This commit is contained in:
parent
bad76f2c36
commit
d3ffca3367
|
@ -7,7 +7,7 @@ packages() {
|
||||||
}
|
}
|
||||||
|
|
||||||
config() {
|
config() {
|
||||||
if [ "${ENC}" == "1" ]; then
|
if [ "${ENC}" == "1" ] && ! [ "${ENCRYPTION_STYLE}" == "e" ]; then
|
||||||
if ! grep -q "GRUB_ENABLE_CRYPTODISK" /etc/default/grub; then
|
if ! grep -q "GRUB_ENABLE_CRYPTODISK" /etc/default/grub; then
|
||||||
echo "GRUB_ENABLE_CRYPTODISK=y" >> /etc/default/grub
|
echo "GRUB_ENABLE_CRYPTODISK=y" >> /etc/default/grub
|
||||||
fi
|
fi
|
||||||
|
|
6
main.sh
6
main.sh
|
@ -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 -- mkpart EFI fat32 "$start" "$end"
|
||||||
parted "${TARGET_PHY_ID}" unit mib -s -- set 1 esp on
|
parted "${TARGET_PHY_ID}" unit mib -s -- set 1 esp on
|
||||||
TARGET_PART="2"
|
TARGET_PART="2"
|
||||||
start="$(( end + 1 ))"
|
start="$(( end ))"
|
||||||
sleep 2
|
sleep 2
|
||||||
mkfs.vfat -I -F32 "${TARGET_PHY_ID}-part1"
|
mkfs.vfat -I -F32 "${TARGET_PHY_ID}-part1"
|
||||||
if [ "${ENCRYPTION_STYLE}" == "e" ]; then
|
if [ "${ENCRYPTION_STYLE}" == "e" ]; then
|
||||||
|
@ -123,7 +123,7 @@ do_partition() {
|
||||||
end=$(( start + size ))
|
end=$(( start + size ))
|
||||||
parted "${TARGET_PHY_ID}" unit mib -s -- mkpart boot ext4 "$start" "${end}"
|
parted "${TARGET_PHY_ID}" unit mib -s -- mkpart boot ext4 "$start" "${end}"
|
||||||
TARGET_PART="3"
|
TARGET_PART="3"
|
||||||
start="$(( end + 1 ))"
|
start="$(( end ))"
|
||||||
BOOTDEV="${TARGET_PHY_ID}-part2"
|
BOOTDEV="${TARGET_PHY_ID}-part2"
|
||||||
sleep 2
|
sleep 2
|
||||||
mkfs.btrfs -q -f "${TARGET_PHY_ID}-part2"
|
mkfs.btrfs -q -f "${TARGET_PHY_ID}-part2"
|
||||||
|
@ -137,7 +137,7 @@ do_partition() {
|
||||||
size=2048
|
size=2048
|
||||||
end=$(( start + size ))
|
end=$(( start + size ))
|
||||||
parted "${TARGET_PHY_ID}" unit mib -s -- mkpart primary ext4 "${start}" "${end}"
|
parted "${TARGET_PHY_ID}" unit mib -s -- mkpart primary ext4 "${start}" "${end}"
|
||||||
start="$(( end + 1 ))"
|
start="$(( end ))"
|
||||||
TARGET_PART="2"
|
TARGET_PART="2"
|
||||||
BOOTDEV="${TARGET_PHY_ID}-part1"
|
BOOTDEV="${TARGET_PHY_ID}-part1"
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
Loading…
Reference in New Issue