add --sudo option

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index 05178ea36765c3a694a9df0004cd2e8d67396db7..dd729251d4aadc628ceb32539ee90cf8759bbbde 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -61,6 +61,11 @@ class VmDebootstrap(cliapp.Application):
         self.settings.string_list(['user'],
                                   'create USER with PASSWORD',
                                   metavar='USER/PASSWORD')
+        self.settings.boolean(['serial-console'], 
+                              'configure image to use a serial console')
+        self.settings.boolean(['sudo'], 
+                              'install sudo, and if user is created, add them '
+                                'to sudo group')
 
     def process_args(self, args):
         if not self.settings['image']:
@@ -167,6 +172,8 @@ class VmDebootstrap(cliapp.Application):
         kernel_image = 'linux-image-2.6-%s' % kernel_arch
 
         include = [kernel_image] + self.settings['package']
+        if self.settings['sudo'] and 'sudo' not in include:
+            include.append('sudo')
 
         self.runcmd(['debootstrap', 
                      '--arch=%s' % self.settings['arch'],
@@ -207,6 +214,8 @@ class VmDebootstrap(cliapp.Application):
         def create_user(user):
             self.runcmd(['chroot', rootdir, 'adduser', '--gecos', user,
                          '--disabled-password', user])
+            if self.settings['sudo']:
+                self.runcmd(['chroot', rootdir, 'adduser', user, 'sudo'])
 
         for userpass in self.settings['user']:
             if '/' in userpass:
@@ -272,13 +281,23 @@ timeout 1
 
 label linux
 kernel %(kernel)s
-append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet
+append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet %(kserial)s
+%(extserial)s
 ''' % {
     'kernel': kernel_image,
     'initrd': initrd_image,
     'uuid': uuid,
+    'kserial': 
+        'console=ttyS0,115200' if self.settings['serial-console'] else '',
+    'extserial': 'serial 0 115200' if self.settings['serial-console'] else '',
 })
         f.close()
+        
+        if self.settings['serial-console']:
+            logging.debug('adding getty to serial console')
+            inittab = os.path.join(rootdir, 'etc/inittab')
+            with open(inittab, 'a') as f:
+                f.write('\nS0:23:respawn:/sbin/getty -L ttyS0 115200 vt100\n')
 
         self.runcmd(['extlinux', '--install', rootdir])
         self.runcmd(['sync'])