custom-gui-packages/pika-installer-gtk4
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some serious issues

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-23 21:52:18 +03:00
parent 022a4138d2
commit a41b890653
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/installation_progress_page/auto_basic.rs
View File

@ -4,7 +4,7 @@ set -e
SOCKET_PATH="/tmp/pikainstall-status.sock"
PIKA_INSTALL_CHROOT_PATH={CHROOT_PATH}
PIKA_INSTALL_LOCALE={LOCALE}
PIKA_INSTALL_LOCALE="{LOCALE}.UTF-8"
PIKA_INSTALL_KEYMAP_BASE={KEYMAP_BASE}
PIKA_INSTALL_KEYMAP_VARIANT={KEYMAP_VARIANT}
PIKA_INSTALL_TIMEZONE={TIMEZONE}

12
src/installation_progress_page/auto_btrfs.rs
View File

@ -18,6 +18,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"p2
yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"p3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/"$AUTO_INSTALL_TARGET_DISK"p3 /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -39,6 +40,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"2
yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/"$AUTO_INSTALL_TARGET_DISK"3 /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -80,6 +82,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.btrfs -f /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/mapper/crypt_root /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -103,6 +106,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.btrfs -f /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/mapper/crypt_root /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -146,6 +150,7 @@ yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"p3
yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"p4
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/"$AUTO_INSTALL_TARGET_DISK"p3 /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -171,6 +176,7 @@ yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"3
yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"4
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/"$AUTO_INSTALL_TARGET_DISK"3 /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -220,6 +226,7 @@ yes | mkfs.btrfs -f /dev/mapper/crypt_root
yes | mkfs.btrfs -f /dev/mapper/crypt_home
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/mapper/crypt_root /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -249,6 +256,7 @@ yes | mkfs.btrfs -f /dev/mapper/crypt_root
yes | mkfs.btrfs -f /dev/mapper/crypt_home
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/mapper/crypt_root /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -291,6 +299,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"p2
yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"p3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/"$AUTO_INSTALL_TARGET_DISK"p3 /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -309,6 +318,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"2
yes | mkfs.btrfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/"$AUTO_INSTALL_TARGET_DISK"3 /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -347,6 +357,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.btrfs -f /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/mapper/crypt_root /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@
@ -367,6 +378,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.btrfs -f /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p /var/cache/root-mnt
mount /dev/mapper/crypt_root /var/cache/root-mnt
btrfs subvolume create /var/cache/root-mnt/@

8
src/installation_progress_page/auto_ext4.rs
View File

@ -23,6 +23,7 @@ yes | mkfs.ext4 -F /dev/"$AUTO_INSTALL_TARGET_DISK"p3
yes | mkfs.ext4 -F /dev/"$AUTO_INSTALL_TARGET_DISK"p4
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"p3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -40,6 +41,7 @@ yes | mkfs.ext4 -F /dev/"$AUTO_INSTALL_TARGET_DISK"3
yes | mkfs.ext4 -F /dev/"$AUTO_INSTALL_TARGET_DISK"4
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -81,6 +83,7 @@ yes | mkfs.ext4 -F /dev/mapper/crypt_root
yes | mkfs.ext4 -F /dev/mapper/crypt_home
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -102,6 +105,7 @@ yes | mkfs.ext4 -F /dev/mapper/crypt_root
yes | mkfs.ext4 -F /dev/mapper/crypt_home
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -136,6 +140,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"p2
yes | mkfs.ext4 -F /dev/"$AUTO_INSTALL_TARGET_DISK"p3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"p3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot
@ -150,6 +155,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"2
yes | mkfs.ext4 -F /dev/"$AUTO_INSTALL_TARGET_DISK"3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot
@ -184,6 +190,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.ext4 -F /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot
@ -200,6 +207,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.ext4 -F /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot

8
src/installation_progress_page/auto_xfs.rs
View File

@ -24,6 +24,7 @@ yes | mkfs.xfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"p3
yes | mkfs.xfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"p4
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"p3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -41,6 +42,7 @@ yes | mkfs.xfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"3
yes | mkfs.xfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"4
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -82,6 +84,7 @@ yes | mkfs.xfs -f /dev/mapper/crypt_root
yes | mkfs.xfs -f /dev/mapper/crypt_home
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -103,6 +106,7 @@ yes | mkfs.xfs -f /dev/mapper/crypt_root
yes | mkfs.xfs -f /dev/mapper/crypt_home
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/home
@ -137,6 +141,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"p2
yes | mkfs.xfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"p3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"p3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot
@ -151,6 +156,7 @@ yes | mkfs -t ext4 /dev/"$AUTO_INSTALL_TARGET_DISK"2
yes | mkfs.xfs -f /dev/"$AUTO_INSTALL_TARGET_DISK"3
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/"$AUTO_INSTALL_TARGET_DISK"3 $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot
@ -185,6 +191,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.xfs -f /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot
@ -201,6 +208,7 @@ printf "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" | cryptsetup -q -v luksOpen /dev/"$AUT
yes | mkfs.xfs -f /dev/mapper/crypt_root
sleep 2
# Begin Mounting
echo 'MOUNTING' | nc -U $SOCKET_PATH || true
mkdir -p $PIKA_INSTALL_CHROOT_PATH
mount /dev/mapper/crypt_root $PIKA_INSTALL_CHROOT_PATH/
mkdir -p $PIKA_INSTALL_CHROOT_PATH/boot