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

Fix problem :P

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-24 01:55:15 +03:00
parent 7f747b4e8c
commit 3bfd2d7139
5 changed files with 18 additions and 18 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

@ -10,7 +10,7 @@ for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get
done done
wipefs -af /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" wipefs -af /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
"###; "###;

12
src/installation_progress_page/auto_btrfs.rs
View File

@ -6,7 +6,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then then
@ -68,7 +68,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
# add p to partition if it's nvme # add p to partition if it's nvme
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@ -137,7 +137,7 @@ mkpart "linux-root" 1500Mib "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \ mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then then
@ -209,7 +209,7 @@ mkpart "linux-root" 1500Mib "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \ mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
# add p to partition if it's nvme # add p to partition if it's nvme
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@ -287,7 +287,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then then
@ -343,7 +343,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
# add p to partition if it's nvme # add p to partition if it's nvme
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"

8
src/installation_progress_page/auto_ext4.rs
View File

@ -10,7 +10,7 @@ mkpart "linux-root" 1500Mib "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \ mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then then
@ -66,7 +66,7 @@ mkpart "linux-root" 1500Mib "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \ mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
# add p to partition if it's nvme # add p to partition if it's nvme
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@ -128,7 +128,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then then
@ -176,7 +176,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
# add p to partition if it's nvme # add p to partition if it's nvme
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"

8
src/installation_progress_page/auto_xfs.rs
View File

@ -11,7 +11,7 @@ mkpart "linux-root" 1500Mib "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \ mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then then
@ -67,7 +67,7 @@ mkpart "linux-root" 1500Mib "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \ mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib 100% \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
# add p to partition if it's nvme # add p to partition if it's nvme
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@ -129,7 +129,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then then
@ -177,7 +177,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
mkpart "linux-root" 1500Mib 100%Mib \ mkpart "linux-root" 1500Mib 100%Mib \
print print
blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
# add p to partition if it's nvme # add p to partition if it's nvme
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme" if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"

6
src/installation_progress_page/manual_basic.rs
View File

@ -1,18 +1,18 @@
pub const manual_partition_mount_prog: &str = r###" pub const manual_partition_mount_prog: &str = r###"
mkdir -p "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}' mkdir -p "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
mount {PART} "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}' mount /dev/{PART} "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
"###; "###;
pub const manual_partition_mount_with_opts_prog: &str = r###" pub const manual_partition_mount_with_opts_prog: &str = r###"
mkdir -p "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}' mkdir -p "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
mount -o '{OPTS}' '{PART}' "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}' mount -o '{OPTS}' /dev/'{PART}' "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
"###; "###;
pub const manual_swap_mount_prog: &str = r###" pub const manual_swap_mount_prog: &str = r###"
echo '{PART}' >> /tmp/pika-installer-gtk4-swaplist echo /dev/'{PART}' >> /tmp/pika-installer-gtk4-swaplist
"###; "###;
pub const manual_crypt_entry: &str = r###" pub const manual_crypt_entry: &str = r###"