Back out from previous change, since it didn't actually work.

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index ce163b4f47a474112e4087e8b68d5f2adf18c05c..19238c7dab98deacb8d4aaa2bff42d3d9314d32f 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import cliapp
+import crypt
 import logging
 import os
 import re
@@ -56,6 +57,16 @@ class VmDebootstrap(cliapp.Application):
                                               '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')
 
     def process_args(self, args):
         if not self.settings['image']:
@@ -74,10 +85,12 @@ class VmDebootstrap(cliapp.Application):
             self.mkfs(rootdev)
             rootdir = self.mount(rootdev)
             self.debootstrap(rootdir)
+            self.set_hostname(rootdir)
             self.set_root_password(rootdir)
             self.remove_udev_persistent_rules(rootdir)
             self.setup_networking(rootdir)
             self.install_extlinux(rootdev, rootdir)
+            self.customize(rootdir)
         except:
             self.cleanup()
             raise
@@ -165,9 +178,21 @@ class VmDebootstrap(cliapp.Application):
                      rootdir, 
                      self.settings['mirror']])
 
+    def set_hostname(self, rootdir):
+        hostname = self.settings['hostname']
+        f = open(os.path.join(rootdir, 'etc', 'hostname'), 'w')
+        f.write(hostname)
+        f.close()
+
     def set_root_password(self, rootdir):
-        self.message('Removing root password')
-        self.runcmd(['chroot', rootdir, 'passwd', '-d', 'root'])
+        if self.settings['root-password']:
+            self.message('Setting root password')
+            encrypted = crypt.crypt(self.settings['root-password'], '..')
+            self.runcmd(['chroot', rootdir, 'usermod', '-p', encrypted, 
+                         'root'])
+        else:
+            self.message('Locking root password')
+            self.runcmd(['chroot', rootdir, 'passwd', '-l', 'root'])
         
     def remove_udev_persistent_rules(self, rootdir):
         self.message('Removing udev persistent cd and net rules')
@@ -246,6 +271,12 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet
         for dirname in self.remove_dirs:
             shutil.rmtree(dirname)
 
+    def customize(self, rootdir):
+        script = self.settings['customize']
+        if script:
+            self.message('Running customize script %s' % script)
+            self.runcmd([script, rootdir])
+
 
 if __name__ == '__main__':
     VmDebootstrap().run()