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

RR: Fix perm error and disable swaps for automatic target

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-02-17 23:54:33 +03:00
parent 96a1a2a9b2
commit 776c48fe04
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/scripts/automatic-partition-install.sh
View File

@ -13,7 +13,11 @@ touch "/tmp/pika-installer-gtk4-status-parting.txt"
if [[ ! -f "/tmp/pika-installer-gtk4-target-automatic-luks.txt" ]] if [[ ! -f "/tmp/pika-installer-gtk4-target-automatic-luks.txt" ]]
then then
wipefs -a /dev/${DISK} for part in $(sudo /usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep ${DISK}); do
PARTITION="/dev/$part"
sudo swapoff $PARTITION || true
done
wipefs -af /dev/${DISK}
# Partition the drives # Partition the drives
parted -s -a optimal /dev/${DISK} mklabel gpt \ parted -s -a optimal /dev/${DISK} mklabel gpt \
mkpart "linux-efi" 1MiB 513Mib \ mkpart "linux-efi" 1MiB 513Mib \
@ -63,7 +67,11 @@ then
fi fi
else else
LUKS_KEY="$(cat "/tmp/pika-installer-gtk4-target-automatic-luks.txt")" LUKS_KEY="$(cat "/tmp/pika-installer-gtk4-target-automatic-luks.txt")"
wipefs -a /dev/${DISK} for part in $(sudo /usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep ${DISK}); do
PARTITION="/dev/$part"
sudo swapoff $PARTITION || true
done
wipefs -af /dev/${DISK}
# Partition the drives # Partition the drives
parted -s -a optimal /dev/${DISK} mklabel gpt \ parted -s -a optimal /dev/${DISK} mklabel gpt \
mkpart "linux-efi" 1MiB 513Mib \ mkpart "linux-efi" 1MiB 513Mib \

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
pika-installer-gtk4 (1.0.0-100pika12) pikauwu; urgency=low pika-installer-gtk4 (1.0.0-100pika13) pikauwu; urgency=low
* First release * First release

9
src/partitioning_page/mod.rs
View File

@ -17,6 +17,8 @@ use std::path::Path;
use std::cell::RefCell; use std::cell::RefCell;
use std::rc::Rc; use std::rc::Rc;
use duct::*;
use crate::{manual_partitioning}; use crate::{manual_partitioning};
use manual_partitioning::DriveMount; use manual_partitioning::DriveMount;
@ -262,14 +264,13 @@ pub fn partitioning_page(
fs::remove_file("/tmp/pika-installer-gtk4-target-manual-luks.txt").expect("Bad permissions on /tmp/pika-installer-gtk4-target-manual.txt"); fs::remove_file("/tmp/pika-installer-gtk4-target-manual-luks.txt").expect("Bad permissions on /tmp/pika-installer-gtk4-target-manual.txt");
} }
if Path::new("/tmp/pika-installer-gtk4-fail.txt").exists() { if Path::new("/tmp/pika-installer-gtk4-fail.txt").exists() {
fs::remove_file("/tmp/pika-installer-gtk4-fail.txt").expect("Bad permissions on /tmp/pika-installer-gtk4-fail.txt"); cmd!("sudo", "rm", "-rf", "/tmp/pika-installer-gtk4-fail.txt").run();
} }
if Path::new("/tmp/pika-installer-gtk4-successful.txt").exists() { if Path::new("/tmp/pika-installer-gtk4-successful.txt").exists() {
fs::remove_file("/tmp/pika-installer-gtk4-successful.txt").expect("Bad permissions on /tmp/pika-installer-gtk4-successful.txt"); cmd!("sudo", "rm", "-rf", "/tmp/pika-installer-gtk4-successful.txt").run();
} }
for status_file in glob("/tmp/pika-installer-gtk4-status*").expect("Failed to read glob pattern") { for status_file in glob("/tmp/pika-installer-gtk4-status*").expect("Failed to read glob pattern") {
let status_file = status_file.unwrap(); cmd!("sudo", "rm", "-rf", "/tmp/pika-installer-gtk4-status*").run();
fs::remove_file(&status_file).expect(&status_file.to_str().unwrap());
} }
for partition_file in glob("/tmp/pika-installer-gtk4-target-manual-p*").expect("Failed to read glob pattern") { for partition_file in glob("/tmp/pika-installer-gtk4-target-manual-p*").expect("Failed to read glob pattern") {
let partition_file = partition_file.unwrap(); let partition_file = partition_file.unwrap();