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

try fixing autoscroll & and failure on auto parting when parts are mounted
All checks were successful
PikaOS Package Build & Release (amd64-v3) / build (push) Successful in 2m15s
Details

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-26 01:11:03 +03:00
parent f8f51e6fee
commit f3c2580c0e
7 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/release-nest-v3 vendored
View File

@ -1 +1 @@
3 4

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
pika-installer-gtk4 (2.0.0-101pika2) pika; urgency=low pika-installer-gtk4 (2.0.0-101pika3) pika; urgency=low
* First Release of new installer * First Release of new installer

2
src/installation_progress_page/mod.rs
View File

@ -125,7 +125,7 @@ pub fn installation_progress_page(
installation_progress_log_scroll, installation_progress_log_scroll,
move |_| move |_|
{ {
if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.2 ) { if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.35 ) {
installation_progress_log_scroll.vadjustment().set_value(installation_progress_log_scroll.vadjustment().upper()) installation_progress_log_scroll.vadjustment().set_value(installation_progress_log_scroll.vadjustment().upper())
} }
} }

27
src/installation_summary_page/script_gen/auto_basic.rs
View File

@ -4,13 +4,30 @@ echo 'PARTING' | nc -U $SOCKET_PATH || true
PIKA_INSTALL_AUTO_TARGET_DISK={AUTO_INSTALL_TARGET_DISK} PIKA_INSTALL_AUTO_TARGET_DISK={AUTO_INSTALL_TARGET_DISK}
for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep "$PIKA_INSTALL_AUTO_TARGET_DISK"); do # Unmount host partitions from chroot
PARTITION="/dev/$part" umount "$PIKA_INSTALL_CHROOT_PATH/media/cdrom" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/media/cdrom" || true
swapoff $PARTITION || true umount "$PIKA_INSTALL_CHROOT_PATH/dev" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/dev" || true
done umount "$PIKA_INSTALL_CHROOT_PATH/run" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/run" || true
umount "$PIKA_INSTALL_CHROOT_PATH/proc" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/proc" || true
umount "$PIKA_INSTALL_CHROOT_PATH/sys" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/sys" || true
if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
then
for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep "$PIKA_INSTALL_AUTO_TARGET_DISK")p; do
PARTITION="/dev/$part"
swapoff $PARTITION || true
umount -l $PARTITION || true
done
else
for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep "$PIKA_INSTALL_AUTO_TARGET_DISK"); do
PARTITION="/dev/$part"
swapoff $PARTITION || true
umount -l $PARTITION || true
done
fi
wipefs -af /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" wipefs -af /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
"###; "###;

12
src/installation_summary_page/script_gen/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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
# 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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
# 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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
# 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_summary_page/script_gen/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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
# 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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
# 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_summary_page/script_gen/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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
# 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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
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 /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
# 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"