X-Git-Url: https://git.siccegge.de//index.cgi?p=forks%2Fvmdebootstrap.git;a=blobdiff_plain;f=vmdebootstrap;h=2ffe6634bb58303aa13241f9f9736e0bb600d149;hp=dd729251d4aadc628ceb32539ee90cf8759bbbde;hb=1f23b06cbc7c3e20284ed7d1b0a66a5665ecf1e2;hpb=e3571547c2a9ce6b37739aae626c03de2aea96cb

diff --git a/vmdebootstrap b/vmdebootstrap
index dd72925..2ffe663 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -1,5 +1,6 @@
 #!/usr/bin/python
-# Copyright 2011  Lars Wirzenius
+# Copyright 2011, 2012  Lars Wirzenius
+# Copyright 2012  Codethink Limited
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,9 +49,16 @@ class VmDebootstrap(cliapp.Application):
                              metavar='NAME',
                              default='stable')
         self.settings.string_list(['package'], 'install PACKAGE onto system')
+        self.settings.string_list(['custom-package'],
+                                  'install package in DEB file onto system '
+                                    '(not from mirror)',
+                                  metavar='DEB')
+        self.settings.boolean(['no-kernel'], 'do not install a linux package')
         self.settings.boolean(['enable-dhcp'], 'enable DHCP on eth0')
         self.settings.string(['root-password'], 'set root password',
                              metavar='PASSWORD')
+        self.settings.boolean(['lock-root-password'], 
+                              'lock root account so they cannot login?')
         self.settings.string(['customize'],
                              'run SCRIPT after setting up system',
                              metavar='SCRIPT')
@@ -86,20 +94,22 @@ class VmDebootstrap(cliapp.Application):
             self.debootstrap(rootdir)
             self.set_hostname(rootdir)
             self.create_fstab(rootdir)
+            self.install_debs(rootdir)
             self.set_root_password(rootdir)
             self.create_users(rootdir)
             self.remove_udev_persistent_rules(rootdir)
             self.setup_networking(rootdir)
-            self.install_extlinux(rootdev, rootdir)
             self.customize(rootdir)
+            self.install_extlinux(rootdev, rootdir)
         except BaseException, e:
             self.message('EEEK! Something bad happened...')
-            self.cleanup()
+            self.cleanup_system()
             raise
         else:
-            self.cleanup()
+            self.cleanup_system()
 
     def message(self, msg):
+        logging.info(msg)
         if self.settings['verbose']:
             print msg
 
@@ -165,13 +175,16 @@ class VmDebootstrap(cliapp.Application):
     def debootstrap(self, rootdir):
         self.message('Debootstrapping')
 
-        if self.settings['arch'] == 'i386':
-            kernel_arch = '686'
-        else:
-            kernel_arch = self.settings['arch']
-        kernel_image = 'linux-image-2.6-%s' % kernel_arch
+        include = self.settings['package']
+
+        if not self.settings['no-kernel']:
+            if self.settings['arch'] == 'i386':
+                kernel_arch = '686'
+            else:
+                kernel_arch = self.settings['arch']
+            kernel_image = 'linux-image-2.6-%s' % kernel_arch
+            include.append(kernel_image)
 
-        include = [kernel_image] + self.settings['package']
         if self.settings['sudo'] and 'sudo' not in include:
             include.append('sudo')
 
@@ -202,13 +215,35 @@ class VmDebootstrap(cliapp.Application):
             f.write('proc /proc proc defaults 0 0\n')
             f.write('/dev/sda1 / ext4 errors=remount-ro 0 1\n')
 
+    def install_debs(self, rootdir):
+        if not self.settings['custom-package']:
+            return
+        self.message('Installing custom packages')
+        tmp = os.path.join(rootdir, 'tmp', 'install_debs')
+        os.mkdir(tmp)
+        for deb in self.settings['custom-package']:
+            shutil.copy(deb, tmp)
+        filenames = [os.path.join('/tmp/install_debs', os.path.basename(deb))
+                     for deb in self.settings['custom-package']]
+        out, err, exit = \
+            self.runcmd_unchecked(['chroot', rootdir, 'dpkg', '-i'] + filenames)
+        logging.debug('stdout:\n%s' % out)
+        logging.debug('stderr:\n%s' % err)
+        out = self.runcmd(['chroot', rootdir, 
+                     'apt-get', '-f', '--no-remove', 'install'])
+        logging.debug('stdout:\n%s' % out)
+        shutil.rmtree(tmp)
+
     def set_root_password(self, rootdir):
         if self.settings['root-password']:
             self.message('Setting root password')
             self.set_password(rootdir, 'root', self.settings['root-password'])
-        else:
+        elif self.settings['lock-root-password']:
             self.message('Locking root password')
             self.runcmd(['chroot', rootdir, 'passwd', '-l', 'root'])
+        else:
+            self.message('Give root an empty password')
+            self.delete_password(rootdir, 'root')
 
     def create_users(self, rootdir):
         def create_user(user):
@@ -224,11 +259,15 @@ class VmDebootstrap(cliapp.Application):
                 self.set_password(rootdir, user, password)
             else:
                 create_user(userpass)
+                self.delete_password(rootdir, userpass)
 
     def set_password(self, rootdir, user, password):
         encrypted = crypt.crypt(password, '..')
         self.runcmd(['chroot', rootdir, 'usermod', '-p', encrypted, user])
 
+    def delete_password(self, rootdir, user):
+        self.runcmd(['chroot', rootdir, 'passwd', '-d', user])
+
     def remove_udev_persistent_rules(self, rootdir):
         self.message('Removing udev persistent cd and net rules')
         for x in ['70-persistent-cd.rules', '70-persistent-net.rules']:
@@ -303,7 +342,7 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet %(kserial)s
         self.runcmd(['sync'])
         import time; time.sleep(2)
         
-    def cleanup(self):
+    def cleanup_system(self):
         # Clean up after any errors.
 
         self.message('Cleaning up')
@@ -320,7 +359,8 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet %(kserial)s
         script = self.settings['customize']
         if script:
             self.message('Running customize script %s' % script)
-            self.runcmd([script, rootdir])
+            with open('/dev/tty', 'w') as tty:
+                cliapp.runcmd([script, rootdir], stdout=tty, stderr=tty)
 
 
 if __name__ == '__main__':