From ba72ab76d34d8d26d69ce68a9addc4518371c7bf Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 29 Aug 2024 08:45:04 +0200 Subject: [PATCH] system: remove (inconsistent) prefix from default snapshot names Also want to avoid confusion about "BE" meaning business edition. --- .../app/controllers/OPNsense/Core/Api/SnapshotsController.php | 2 +- src/opnsense/scripts/system/bectl.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/SnapshotsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/SnapshotsController.php index 2fee2ec1c..7d7e99945 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/SnapshotsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/SnapshotsController.php @@ -114,7 +114,7 @@ class SnapshotsController extends ApiControllerBase } } // new or not found - return ['name' => 'BE' . date('YmdHis'), 'uuid' => '']; + return ['name' => date('YmdHis'), 'uuid' => '']; } /** diff --git a/src/opnsense/scripts/system/bectl.py b/src/opnsense/scripts/system/bectl.py index 1a1eed99d..5a0b2c103 100755 --- a/src/opnsense/scripts/system/bectl.py +++ b/src/opnsense/scripts/system/bectl.py @@ -58,10 +58,10 @@ if __name__ == '__main__': elif inputargs.action == 'activate' and inputargs.beName: cmd = ['bectl', 'activate', inputargs.beName] elif inputargs.action == 'create': - name = inputargs.beName if inputargs.beName else "BE-{date:%Y%m%d%H%M%S}".format(date=datetime.datetime.now()) + name = inputargs.beName if inputargs.beName else "{date:%Y%m%d%H%M%S}".format(date=datetime.datetime.now()) cmd = ['bectl', 'create', name] elif inputargs.action == 'clone' and inputargs.from_source: - name = inputargs.beName if inputargs.beName else "BE-{date:%Y%m%d%H%M%S}".format(date=datetime.datetime.now()) + name = inputargs.beName if inputargs.beName else "{date:%Y%m%d%H%M%S}".format(date=datetime.datetime.now()) cmd = ['bectl', 'create', '-e', inputargs.from_source, name] elif inputargs.action == 'destroy' and inputargs.beName: cmd = ['bectl', 'destroy', inputargs.beName]