Changeset 338 for trunk

Timestamp:

Mar 30, 2008, 4:02:48 AM (17 years ago)

Author:

price

Message:

some cleanups in copying autoinstaller

File:

• trunk/packages/sipb-xen-guest-installer/files/usr/sbin/sipb-xen-lvcopy (moved) (moved from trunk/packages/sipb-xen-guest-installer/files/usr/sbin/sipb-xen-duplicate) (4 diffs)

trunk/packages/sipb-xen-guest-installer/files/usr/sbin/sipb-xen-lvcopy

@@ -79 +79 @@
 
 def frob_copy(target, *args):
+  '''UNUSED: maybe we'll use this someday; it does isolate the frobber.'''
   # 1. prepare arguments volume
   args_volume = prefix+target+'_args'
@@ -95 +96 @@
   # XXX should check_call(['/sbin/lvremove', '-f', 'xenvg/'+args_volume])
 
-def frob_copy_simple(target, hostname, rootpw, *args):
+def frob_copy_simple(target, hostname, rootpw):
   """target should be an LV device filename
 
@@ -128 +129 @@
   os.chdir('/')
   call(['umount', mntdir])
+  os.rmdir(mntdir)
   call(['losetup', '-d', fs])
 
-def duplicate_by_vm(source, target, *args):
+def duplicate_by_vm(source, target, rootpw, nodd=False):
   # source, target should be machine names
   prefix = 'd_'
@@ -136 +138 @@
   source_device = '/dev/xenvg/' + prefix + source + '_hda'
   target_device = '/dev/xenvg/' + prefix + target + '_hda'
-  check_call(['/bin/dd', 'bs=1M', 'conv=nocreat',
-              'if='+source_device, 'of='+target_device])
+  if not nodd:
+    check_call(['/bin/dd', 'bs=1M', 'conv=nocreat',
+                'if='+source_device, 'of='+target_device])
   # 2. frob target
-  frob_copy_simple(target_device, *args)
+  frob_copy_simple(target_device, target, rootpw)
+
+def main(*argv):
+  subcommand = argv[1]
+  args = argv[2:]
+  os.environ['PATH'] = '/usr/sbin:/usr/bin:/sbin:/bin'
+  if subcommand == 'lvcopy':
+    kwargs = {}
+    if args[0] == '--nodd':
+      args = args[1:]
+      kwargs['nodd'] = True
+    duplicate_by_vm(*args, **kwargs)
+  else:
+    print >>sys.stderr, argv[0]+": unknown subcommand: "+subcommand
+    return 2
+  return 0
 
 if __name__ == '__main__':
-  duplicate_by_vm(*sys.argv[1:])
+  sys.exit(main(*sys.argv))