X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=vmdebootstrap;h=4bf8cfded88a287bc341fb77d4a0264a0f1aa9a2;hb=3106a9b2ea2a7778d1394a2c4b7e46ccbc39e6d7;hp=39822cd13dc43f717c5e229376b9e9b2136a863f;hpb=70e064a50e578c0c6a376fff794d9b4b4114e31d;p=forks%2Fvmdebootstrap.git

diff --git a/vmdebootstrap b/vmdebootstrap
index 39822cd..4bf8cfd 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -29,44 +29,35 @@ class VmDebootstrap(cliapp.Application):
     def add_settings(self):
         default_arch = 'amd64'
 
-        self.settings.add_boolean_setting(['verbose'], 
-                                          'report what is going on')
-        self.settings.add_string_setting(['image'],
-                                         'put created disk image in FILE',
-                                         metavar='FILE')
-        self.settings.add_bytesize_setting(['size'],
-                                           'create a disk image of size SIZE '
-                                            '(%default)',
-                                           metavar='SIZE',
-                                           default='1G')
-        self.settings.add_string_setting(['mirror'],
-                                         'use MIRROR as package source '
-                                            '(%default)',
-                                         metavar='URL',
-                                     default='http://cdn.debian.net/debian/')
-        self.settings.add_string_setting(['arch'],
-                                         'architecture to use '
-                                            '(%default)',
-                                         metavar='ARCH',
-                                         default=default_arch)
-        self.settings.add_string_setting(['distribution'],
-                                         'release to use (%default)',
-                                         metavar='NAME',
-                                         default='stable')
-        self.settings.add_string_list_setting(['package'],
-                                              'install PACKAGE onto system')
-        self.settings.add_boolean_setting(['enable-dhcp'],
-                                          'enable DHCP on eth0')
-        self.settings.add_string_setting(['root-password'],
-                                         'set root password',
-                                         metavar='PASSWORD')
-        self.settings.add_string_setting(['customize'],
-                                         'run SCRIPT after setting up system',
-                                         metavar='SCRIPT')
-        self.settings.add_string_setting(['hostname'],
-                                         'set name to HOSTNAME (%default)',
-                                         metavar='HOSTNAME',
-                                         default='debian')
+        self.settings.boolean(['verbose'], 'report what is going on')
+        self.settings.string(['image'], 'put created disk image in FILE',
+                             metavar='FILE')
+        self.settings.bytesize(['size'],
+                               'create a disk image of size SIZE (%default)',
+                               metavar='SIZE',
+                               default='1G')
+        self.settings.string(['mirror'],
+                             'use MIRROR as package source (%default)',
+                             metavar='URL',
+                             default='http://cdn.debian.net/debian/')
+        self.settings.string(['arch'], 'architecture to use (%default)',
+                             metavar='ARCH',
+                             default=default_arch)
+        self.settings.string(['distribution'],
+                             'release to use (%default)',
+                             metavar='NAME',
+                             default='stable')
+        self.settings.string_list(['package'], 'install PACKAGE onto system')
+        self.settings.boolean(['enable-dhcp'], 'enable DHCP on eth0')
+        self.settings.string(['root-password'], 'set root password',
+                             metavar='PASSWORD')
+        self.settings.string(['customize'],
+                             'run SCRIPT after setting up system',
+                             metavar='SCRIPT')
+        self.settings.string(['hostname'],
+                             'set name to HOSTNAME (%default)',
+                             metavar='HOSTNAME',
+                             default='debian')
 
     def process_args(self, args):
         if not self.settings['image']:
@@ -275,7 +266,7 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet
         script = self.settings['customize']
         if script:
             self.message('Running customize script %s' % script)
-            self.runcmd(['sh', '-c', script, rootdir])
+            self.runcmd([script, rootdir])
 
 
 if __name__ == '__main__':