From 903d8d214d267c3d5526eadd619ab3a5c1258d1f Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sat, 17 Feb 2024 19:07:11 +0300 Subject: [PATCH] rootflags and swap support --- pikainstall/debian/changelog | 2 +- .../usr/lib/pika/pikainstall/pika-install-host.sh | 7 +++++++ pikainstall/usr/lib/pika/pikainstall/pikainstall | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pikainstall/debian/changelog b/pikainstall/debian/changelog index 4896a3b..bd2e7d9 100644 --- a/pikainstall/debian/changelog +++ b/pikainstall/debian/changelog @@ -1,4 +1,4 @@ -pikainstall (1.1.5-100pika2) pikauwu; urgency=medium +pikainstall (1.1.6-100pika1) pikauwu; urgency=medium * Initial release. diff --git a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh index 7aa232e..ef9186c 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh +++ b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh @@ -17,3 +17,10 @@ then chmod +x /var/albius-crypttab-manual.sh /var/albius-crypttab-manual.sh fi +if [ -f /tmp/pika-installer-gtk4-swaplist ] +then + for i in $(cat /tmp/pika-installer-gtk4-swaplist) + do + echo "UUID="$(blkid -s UUID -o value $i)" none swap sw 0 0" >> "$1"/etc/fstab + done +fi diff --git a/pikainstall/usr/lib/pika/pikainstall/pikainstall b/pikainstall/usr/lib/pika/pikainstall/pikainstall index 45d6623..9b5ecc3 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pikainstall +++ b/pikainstall/usr/lib/pika/pikainstall/pikainstall @@ -16,16 +16,16 @@ print("pikainstall " + version + ": PikaOS terminal installer! for " + dist + ". ### text files _REFIND_SETUP_FILE = """#!/usr/bin/bash touch /boot/refind_linux.conf -echo '"'Boot with standard options'"' '"'amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 root=UUID={ROOT_PART_UUID} quiet splash ---'"' > /boot/refind_linux.conf -echo '"'Boot with logging'"' '"'amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 root=UUID={ROOT_PART_UUID} ---'"' >> /boot/refind_linux.conf -echo '"'Boot with safe graphics'"' '"'amd_pstate=active nowatchdog amd_prefcore=enable root=UUID={ROOT_PART_UUID} nomodeset ---'"' >> /boot/refind_linux.conf +echo '"'Boot with standard options'"' '"'amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} quiet splash ---'"' > /boot/refind_linux.conf +echo '"'Boot with logging'"' '"'amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} ---'"' >> /boot/refind_linux.conf +echo '"'Boot with safe graphics'"' '"'amd_pstate=active nowatchdog amd_prefcore=enable rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=UUID={ROOT_PART_UUID} nomodeset ---'"' >> /boot/refind_linux.conf """ _REFIND_CRYPT_SETUP_FILE = """#!/usr/bin/bash touch /boot/refind_linux.conf -echo '"'Boot with standard options'"' '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 root=/dev/mapper/{ROOT_ENCRYPT_NAME} quiet splash ---'"' > /boot/refind_linux.conf -echo '"'Boot with logging'"' '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 root=/dev/mapper/{ROOT_ENCRYPT_NAME} ---'"' >> /boot/refind_linux.conf -echo '"'Boot with safe graphics'"' '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable root=/dev/mapper/{ROOT_ENCRYPT_NAME} nomodeset ---'"' >> /boot/refind_linux.conf +echo '"'Boot with standard options'"' '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} quiet splash ---'"' > /boot/refind_linux.conf +echo '"'Boot with logging'"' '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable nvidia-drm.modeset=1 rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} ---'"' >> /boot/refind_linux.conf +echo '"'Boot with safe graphics'"' '"'rd.luks.name={ROOT_CRYPT_UUID}={ROOT_ENCRYPT_NAME} amd_pstate=active nowatchdog amd_prefcore=enable rootflags=$(findmnt --fstab -T / -o Options | tail +2) root=/dev/mapper/{ROOT_ENCRYPT_NAME} nomodeset ---'"' >> /boot/refind_linux.conf """ _CRYPTTAB_ROOT_SETUP_FILE = """#!/usr/bin/bash