initial retooling #1

Merged
naturallaw777 merged 1130 commits from staging-dev into stable 2026-05-21 08:10:11 -05:00
2 changed files with 4 additions and 3 deletions
Showing only changes of commit 5fe2ecd56d - Show all commits
+3 -2
View File
@@ -699,7 +699,7 @@ class InstallerWindow(Adw.ApplicationWindow):
disk_group.add(data_row)
if self.data_drive_has_timechain:
note_row = Adw.ActionRow()
note_row.set_title(f"Existing Bitcoin timechain detected on /dev/{self.data_disk}")
note_row.set_title(f"Existing Bitcoin timechain detected on /dev/{self.data_disk}")
note_row.set_subtitle("Data will be preserved and mounted as-is.")
note_row.add_prefix(symbolic_icon("emblem-ok-symbolic"))
disk_group.add(note_row)
@@ -808,7 +808,8 @@ class InstallerWindow(Adw.ApplicationWindow):
):
proc = subprocess.run(cmd, capture_output=True, text=True)
if proc.returncode == 0:
label = proc.stdout.strip().splitlines()[0] if proc.stdout.strip() else ""
stdout = proc.stdout.strip()
label = stdout.splitlines()[0] if stdout else ""
if label:
break
+1 -1
View File
@@ -108,7 +108,7 @@ if [[ -n "$DATA_DISK" ]]; then
DATA_P1=$(part_suffix "$DATA_DISK" 1)
if [[ -b "$DATA_P1" ]]; then
DATA_LABEL=$(lsblk -no LABEL "$DATA_P1" 2>/dev/null | head -n1 || true)
if [[ "$DATA_LABEL" != "BTCEcoandBackup" ]]; then
if [[ -z "$DATA_LABEL" ]]; then
DATA_LABEL=$(blkid -o value -s LABEL "$DATA_P1" 2>/dev/null || true)
fi