rootflags and swap support

This commit is contained in:
Ward from fusion-voyager-3 2024-02-17 19:07:11 +03:00
parent 29838afd82
commit 903d8d214d
3 changed files with 14 additions and 7 deletions

View File

@ -1,4 +1,4 @@
pikainstall (1.1.5-100pika2) pikauwu; urgency=medium pikainstall (1.1.6-100pika1) pikauwu; urgency=medium
* Initial release. * Initial release.

View File

@ -17,3 +17,10 @@ then
chmod +x /var/albius-crypttab-manual.sh chmod +x /var/albius-crypttab-manual.sh
/var/albius-crypttab-manual.sh /var/albius-crypttab-manual.sh
fi 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

View File

@ -16,16 +16,16 @@ print("pikainstall " + version + ": PikaOS terminal installer! for " + dist + ".
### text files ### text files
_REFIND_SETUP_FILE = """#!/usr/bin/bash _REFIND_SETUP_FILE = """#!/usr/bin/bash
touch /boot/refind_linux.conf 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 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 root=UUID={ROOT_PART_UUID} ---'"' >> /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 root=UUID={ROOT_PART_UUID} nomodeset ---'"' >> /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 _REFIND_CRYPT_SETUP_FILE = """#!/usr/bin/bash
touch /boot/refind_linux.conf 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 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 root=/dev/mapper/{ROOT_ENCRYPT_NAME} ---'"' >> /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 root=/dev/mapper/{ROOT_ENCRYPT_NAME} nomodeset ---'"' >> /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 _CRYPTTAB_ROOT_SETUP_FILE = """#!/usr/bin/bash