From bafe5d15b1e3c1e31b9c4c32cd875dc5dfe2a2fb Mon Sep 17 00:00:00 2001 From: Tony Asleson Date: Thu, 3 Oct 2019 12:19:07 -0500 Subject: [PATCH] lvmdbusd: Add check for reserved name '_vdata' Added for vdo support. --- daemons/lvmdbusd/utils.py | 2 +- test/dbus/lvmdbustest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py index 8d64117b9..40b8a68dc 100644 --- a/daemons/lvmdbusd/utils.py +++ b/daemons/lvmdbusd/utils.py @@ -455,7 +455,7 @@ _ALLOWABLE_CH_SET = set(_ALLOWABLE_CH) _ALLOWABLE_VG_LV_CH = string.ascii_letters + string.digits + '.-_+' _ALLOWABLE_VG_LV_CH_SET = set(_ALLOWABLE_VG_LV_CH) _LV_NAME_RESERVED = ("_cdata", "_cmeta", "_corig", "_mimage", "_mlog", - "_pmspare", "_rimage", "_rmeta", "_tdata", "_tmeta", "_vorigin") + "_pmspare", "_rimage", "_rmeta", "_tdata", "_tmeta", "_vorigin", "_vdata") # Tags can have the characters, based on the code # a-zA-Z0-9._-+/=!:&# diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py index 4ae8b2517..31dc4ffa2 100755 --- a/test/dbus/lvmdbustest.py +++ b/test/dbus/lvmdbustest.py @@ -1670,7 +1670,7 @@ class TestDbusService(unittest.TestCase): for reserved in ( "_cdata", "_cmeta", "_corig", "_mimage", "_mlog", "_pmspare", "_rimage", "_rmeta", "_tdata", "_tmeta", - "_vorigin"): + "_vorigin", "_vdata"): with self.assertRaises(dbus.exceptions.DBusException): self.handle_return( vg_proxy.Vg.LvCreateLinear(