general-packages/pikainstall
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't do fstab twice

Browse Source
This commit is contained in:
ferreo 2024-09-04 19:30:40 +02:00
parent f21e4da8f8
commit b10e21e58c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh
View File

@ -5,9 +5,8 @@ SOCKET_PATH="/tmp/pikainstall-status.sock"
# Clear fstab # Clear fstab
echo 'GEN_FSTAB' | nc -U $SOCKET_PATH || true echo 'GEN_FSTAB' | nc -U $SOCKET_PATH || true
touch /etc/fstab touch /etc/fstab
# Generate fstab entries # Install fstab packages
dpkg -s arch-install-scripts || apt install -y arch-install-scripts cryptsetup dpkg -s arch-install-scripts || apt install -y arch-install-scripts cryptsetup
#genfstab -U / | grep -v zram | grep -v portal | grep -v loop | grep -v cdrom | grep -v swap > /etc/fstab
# Enable zram if there's no swaplist # Enable zram if there's no swaplist
if [ ! -f /tmp/pika-installer-gtk4-swaplist ] if [ ! -f /tmp/pika-installer-gtk4-swaplist ]
then then
@ -45,7 +44,6 @@ apt install -y /var/cache/apt/archives/pika-refind-theme*.deb /var/cache/apt/arc
# EFI workaround for MSI # EFI workaround for MSI
mkdir -p /boot/efi/EFI/BOOT mkdir -p /boot/efi/EFI/BOOT
cp -vf /boot/efi/EFI/refind/refind_x64.efi /boot/efi/EFI/BOOT/BOOTX64.EFI cp -vf /boot/efi/EFI/refind/refind_x64.efi /boot/efi/EFI/BOOT/BOOTX64.EFI
refind-install
# Remove installer from installed system # Remove installer from installed system
echo 'LIVE_REMOVE' | nc -U $SOCKET_PATH || true echo 'LIVE_REMOVE' | nc -U $SOCKET_PATH || true
apt remove live-boot pika-installer-gtk4 -y || true apt remove live-boot pika-installer-gtk4 -y || true