From 55cba57de62b19cd140c4e54ef20cd7f309bc3b9 Mon Sep 17 00:00:00 2001 From: Adrien Banlin Date: Tue, 6 Jun 2023 18:45:04 +0200 Subject: [PATCH] ifupdown.argv: replace lockfile global by an arg --- ifupdown2/ifupdown/argv.py | 4 ++++ ifupdown2/ifupdown/main.py | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ifupdown2/ifupdown/argv.py b/ifupdown2/ifupdown/argv.py index cee958a..f8fbb88 100644 --- a/ifupdown2/ifupdown/argv.py +++ b/ifupdown2/ifupdown/argv.py @@ -241,6 +241,10 @@ class Parse: ''' general parsing rules ''' argparser.add_argument('-V', '--version', action=VersionAction, nargs=0) + argparser.add_argument( + '-L', '--lock', default='/run/network/.lock', dest='lockfile', + help='use lock file instead of default /run/network/.lock' + ) argparser.add_argument( "--nldebug", dest="nldebug", diff --git a/ifupdown2/ifupdown/main.py b/ifupdown2/ifupdown/main.py index 903c477..8e0f13f 100644 --- a/ifupdown2/ifupdown/main.py +++ b/ifupdown2/ifupdown/main.py @@ -35,7 +35,6 @@ except (ImportError, ModuleNotFoundError): log = logging.getLogger() configmap_g = None -lockfile = "/run/network/.lock" class Ifupdown2: @@ -70,7 +69,7 @@ class Ifupdown2: self.read_config() self.init(stdin_buffer) - if self.op != 'query' and not utils.lockFile(lockfile): + if self.op != 'query' and not utils.lockFile(self.args.lockfile): log.error("Another instance of this program is already running.") return Status.Client.STATUS_ALREADY_RUNNING