Index: updates/storage/__init__.py
===================================================================
RCS file: /cvsroot/smeserver/cdrom.image/sme9/updates/storage/__init__.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- updates/storage/__init__.py	6 Nov 2013 02:06:23 -0000	1.3
+++ updates/storage/__init__.py	3 Dec 2013 04:09:59 -0000	1.4
@@ -918,7 +918,7 @@
         vgnames = [vg.name for vg in self.vgs]
         if hn is not None and hn != '':
             if hn == 'localhost' or hn == 'localhost.localdomain':
-                vgtemplate = "VolGroup"
+                vgtemplate = "main"
             elif hn.find('.') != -1:
                 template = "vg_%s" % (hn.split('.')[0].lower(),)
                 vgtemplate = safeLvmName(template)
@@ -926,7 +926,7 @@
                 template = "vg_%s" % (hn.lower(),)
                 vgtemplate = safeLvmName(template)
         else:
-            vgtemplate = "VolGroup"
+            vgtemplate = "main"
 
         if vgtemplate not in vgnames and \
                 vgtemplate not in lvm.lvm_vg_blacklist:
@@ -951,12 +951,12 @@
         if mountpoint:
             # try to incorporate the mountpoint into the name
             if mountpoint == '/':
-                lvtemplate = 'lv_root'
+                lvtemplate = 'root'
             else:
                 if mountpoint.startswith("/"):
-                    template = "lv_%s" % mountpoint[1:]
+                    template = "%s" % mountpoint[1:]
                 else:
-                    template = "lv_%s" % (mountpoint,)
+                    template = "%s" % (mountpoint,)
 
                 lvtemplate = safeLvmName(template)
         else:
@@ -964,13 +964,13 @@
                 if len([s for s in self.swaps if s in vg.lvs]):
                     idx = len([s for s in self.swaps if s in vg.lvs])
                     while True:
-                        lvtemplate = "lv_swap%02d" % idx
+                        lvtemplate = "swap%02d" % idx
                         if lvtemplate in [lv.lvname for lv in vg.lvs]:
                             idx += 1
                         else:
                             break
                 else:
-                    lvtemplate = "lv_swap"
+                    lvtemplate = "swap"
             else:
                 idx = len(vg.lvs)
                 while True: