From aa08f555c3066c0d9a96c87ede0f93ac5b36e3b7 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 30 Sep 2011 11:20:03 +0200 Subject: [PATCH] dom0+vm: minor fixes in qvm-block scripts --- common/block_add_change | 2 +- dom0/qvm-core/qubesutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/block_add_change b/common/block_add_change index a9f7e063..b4bd0f03 100755 --- a/common/block_add_change +++ b/common/block_add_change @@ -19,7 +19,7 @@ fi # Special case for CD if [ "$ID_TYPE" = "cd" ]; then - if [ "$ID_MEDIA_CDROM" != "1" ]; then + if [ "$ID_CDROM_MEDIA" != "1" ]; then # Hide empty cdrom drive xenstore-rm "$XS_KEY" exit 0 diff --git a/dom0/qvm-core/qubesutils.py b/dom0/qvm-core/qubesutils.py index 4c1a17be..20ee08da 100644 --- a/dom0/qvm-core/qubesutils.py +++ b/dom0/qvm-core/qubesutils.py @@ -123,7 +123,7 @@ def block_name_to_devid(name): return major << 8 | minor def block_list(vm = None): - device_re = re.compile(r"^[a-z1-9]{1,8}$") + device_re = re.compile(r"^[a-z0-9]{1,8}$") # FIXME: any better idea of desc_re? desc_re = re.compile(r"^.{1,255}$") mode_re = re.compile(r"^[rw]$")