diff --git a/iso/installer.py b/iso/installer.py index ba2de72..dee3f0d 100644 --- a/iso/installer.py +++ b/iso/installer.py @@ -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 diff --git a/iso/sovran-install-headless.sh b/iso/sovran-install-headless.sh index 0571113..bf9fc35 100755 --- a/iso/sovran-install-headless.sh +++ b/iso/sovran-install-headless.sh @@ -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