swap_fix
This commit is contained in:
parent
e9b797e267
commit
fc60b1a1cd
1 changed files with 12 additions and 2 deletions
14
arch-install
14
arch-install
|
@ -179,6 +179,12 @@ function partitioniereonepartition() {
|
||||||
formatencrypt
|
formatencrypt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function partitioniereonepartitionmitswap() {
|
||||||
|
sgdisk -d 4 ${device}
|
||||||
|
sgdisk -a 2048 -n 4:: -c 4:"Linux filesystem" -t 4:8300 ${device}
|
||||||
|
formatencrypt
|
||||||
|
}
|
||||||
|
|
||||||
function usbkeyinstallation() {
|
function usbkeyinstallation() {
|
||||||
mkdir -p /mnt/usb-stick
|
mkdir -p /mnt/usb-stick
|
||||||
mount ${usbkeydevice} /mnt/usb-stick
|
mount ${usbkeydevice} /mnt/usb-stick
|
||||||
|
@ -1136,7 +1142,9 @@ then
|
||||||
echo "Partitions with UEFI"
|
echo "Partitions with UEFI"
|
||||||
|
|
||||||
if [ "y" != "noinstall" ]; then
|
if [ "y" != "noinstall" ]; then
|
||||||
if [ "${skipbootpartition}" == "y" ]; then
|
if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then
|
||||||
|
partitioniereonepartitionmitswap
|
||||||
|
elif [ "${skipbootpartition}" == "y" ]; then
|
||||||
partitioniereonepartition
|
partitioniereonepartition
|
||||||
elif [ "${swap}" != "n" ]; then
|
elif [ "${swap}" != "n" ]; then
|
||||||
echo "Create additional swap partition"
|
echo "Create additional swap partition"
|
||||||
|
@ -1172,7 +1180,9 @@ then
|
||||||
elif [ "${Partition}" == "bios" ]; then
|
elif [ "${Partition}" == "bios" ]; then
|
||||||
echo "Partitions with MBR"
|
echo "Partitions with MBR"
|
||||||
if [ "y" != "noinstall" ]; then
|
if [ "y" != "noinstall" ]; then
|
||||||
if [ "${skipbootpartition}" == "y" ]; then
|
if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then
|
||||||
|
partitioniereonepartitionmitswap
|
||||||
|
elif [ "${skipbootpartition}" == "y" ]; then
|
||||||
partitioniereonepartition
|
partitioniereonepartition
|
||||||
elif [ "${swap}" != "n" ]; then
|
elif [ "${swap}" != "n" ]; then
|
||||||
echo "Create additional swap partition"
|
echo "Create additional swap partition"
|
||||||
|
|
Loading…
Reference in a new issue