From a41b8906533afafaea28b46376c25b6bfea5c8b3 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Fri, 23 Aug 2024 21:52:18 +0300 Subject: [PATCH] fix some serious issues --- src/installation_progress_page/auto_basic.rs | 2 +- src/installation_progress_page/auto_btrfs.rs | 12 ++++++++++++ src/installation_progress_page/auto_ext4.rs | 8 ++++++++ src/installation_progress_page/auto_xfs.rs | 8 ++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/installation_progress_page/auto_basic.rs b/src/installation_progress_page/auto_basic.rs index 02067d5..e818ea4 100644 --- a/src/installation_progress_page/auto_basic.rs +++ b/src/installation_progress_page/auto_basic.rs @@ -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} diff --git a/src/installation_progress_page/auto_btrfs.rs b/src/installation_progress_page/auto_btrfs.rs index ff77939..b04b309 100644 --- a/src/installation_progress_page/auto_btrfs.rs +++ b/src/installation_progress_page/auto_btrfs.rs @@ -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/@ diff --git a/src/installation_progress_page/auto_ext4.rs b/src/installation_progress_page/auto_ext4.rs index 3027273..966a780 100644 --- a/src/installation_progress_page/auto_ext4.rs +++ b/src/installation_progress_page/auto_ext4.rs @@ -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 diff --git a/src/installation_progress_page/auto_xfs.rs b/src/installation_progress_page/auto_xfs.rs index f95ff58..c6936a2 100644 --- a/src/installation_progress_page/auto_xfs.rs +++ b/src/installation_progress_page/auto_xfs.rs @@ -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