From 4a3c393c249faa6ac99137ef5a6f334bc004f890 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 6 Sep 2024 12:20:19 +0000 Subject: [PATCH] Autosign: run blkid as user --- mmgen/autosign.py | 3 ++- test/overlay/fakemods/mmgen/autosign.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mmgen/autosign.py b/mmgen/autosign.py index f36bd9a4..dec3fa56 100755 --- a/mmgen/autosign.py +++ b/mmgen/autosign.py @@ -328,6 +328,7 @@ class Autosign: linux_mount_subdir = 'mmgen_autosign' macOS_ramdisk_name = 'AutosignRamDisk' wallet_subdir = 'autosign' + linux_blkid_cmd = '/sbin/blkid -s LABEL -o value' cmds = ('setup', 'xmr_setup', 'sign', 'wait') @@ -758,7 +759,7 @@ class Autosign: if self.cfg.no_insert_check: return True if sys.platform == 'linux': - cp = run('sudo blkid -s LABEL -o value'.split(), stdout=PIPE, text=True) + cp = run(self.linux_blkid_cmd.split(), stdout=PIPE, text=True) if cp.returncode not in (0, 2): die(2, f'blkid exited with error code {cp.returncode}') return self.dev_label in cp.stdout.splitlines() diff --git a/test/overlay/fakemods/mmgen/autosign.py b/test/overlay/fakemods/mmgen/autosign.py index 8d839fc3..13a25fdf 100644 --- a/test/overlay/fakemods/mmgen/autosign.py +++ b/test/overlay/fakemods/mmgen/autosign.py @@ -14,6 +14,7 @@ class overlay_fake_Autosign: self.dev_label = 'MMGEN_TS_ONLINE' if self.cfg.online else 'MMGEN_TS_OFFLINE' self.mount_cmd = f'sudo mount LABEL={self.dev_label} {self.mountpoint}' self.umount_cmd = f'sudo umount {self.mountpoint}' + self.linux_blkid_cmd = 'sudo blkid -s LABEL -o value' Autosign.dev_label = 'MMGEN_TS_TX' # autosign_live only (Linux) Autosign.linux_mount_subdir = 'mmgen_ts_autosign'