Index: /trunk/packages/sipb-xen-database/sipb-xen-database/client/usr/bin/sipb-xen-lvcreate
===================================================================
--- /trunk/packages/sipb-xen-database/sipb-xen-database/client/usr/bin/sipb-xen-lvcreate	(revision 109)
+++ /trunk/packages/sipb-xen-database/sipb-xen-database/client/usr/bin/sipb-xen-lvcreate	(revision 110)
@@ -8,7 +8,13 @@
 connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
 
+def check(b):
+    if not b:
+        exit(1)
+
 vg = "xenvg"
 for d in Disk.select():
+    check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
     machine = Machine.get(d.machine_id)
+    check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
     lvname = machine.name + "_" + d.guest_device_name
     if not os.path.exists("/dev/%s/%s" % (vg, lvname)):