From fb635b11cb75aff5e794fad8288cca679a98a8e9 Mon Sep 17 00:00:00 2001 From: Jim George Date: Thu, 18 Oct 2018 11:50:05 -0600 Subject: [PATCH 1/3] Made device name check a bit more robust and also handles symbolic links to devices --- encled | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/encled b/encled index 2d76327..196c26b 100755 --- a/encled +++ b/encled @@ -178,8 +178,10 @@ def main(argv): if result: return(result) return(0) - if 'sd' in argv[1] or '/dev' in argv[1]: - name = argv[1].lower().split('/')[-1] + #if 'sd' in argv[1] or '/dev' in argv[1]: + if os.path.exists(argv[1]): + devname = os.path.realpath(argv[1]); + name = devname.lower().split('/')[-1] for d in devlist: if(d[3][0] == name): dev = d From b44c3195ea39a3361e5921af254950645b0b38c1 Mon Sep 17 00:00:00 2001 From: Jim George Date: Thu, 18 Oct 2018 11:51:56 -0600 Subject: [PATCH 2/3] Removed a commented-out line --- encled | 1 - 1 file changed, 1 deletion(-) diff --git a/encled b/encled index 196c26b..2e2a208 100755 --- a/encled +++ b/encled @@ -178,7 +178,6 @@ def main(argv): if result: return(result) return(0) - #if 'sd' in argv[1] or '/dev' in argv[1]: if os.path.exists(argv[1]): devname = os.path.realpath(argv[1]); name = devname.lower().split('/')[-1] From ee6483a57bc7430337a5c012356918856db9ae36 Mon Sep 17 00:00:00 2001 From: Jim George Date: Thu, 18 Oct 2018 11:54:22 -0600 Subject: [PATCH 3/3] Fixed indentation --- encled | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encled b/encled index 2e2a208..16bab1a 100755 --- a/encled +++ b/encled @@ -179,7 +179,7 @@ def main(argv): return(0) if os.path.exists(argv[1]): - devname = os.path.realpath(argv[1]); + devname = os.path.realpath(argv[1]); name = devname.lower().split('/')[-1] for d in devlist: if(d[3][0] == name):