X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=vmdebootstrap;h=b5e02a0f1d8d82eb004aa4543e0d515ea6376f23;hb=7ed9b152319e02090b1265a22eed041a7f93af40;hp=19238c7dab98deacb8d4aaa2bff42d3d9314d32f;hpb=4947c4df8dc3e8a7cafb5d5b0f017f37d4d1ec10;p=forks%2Fvmdebootstrap.git

diff --git a/vmdebootstrap b/vmdebootstrap
index 19238c7..b5e02a0 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']:
@@ -86,12 +77,14 @@ class VmDebootstrap(cliapp.Application):
             rootdir = self.mount(rootdev)
             self.debootstrap(rootdir)
             self.set_hostname(rootdir)
+            self.create_fstab(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:
+        except BaseException, e:
+            self.message('EEEK! Something bad happened...')
             self.cleanup()
             raise
         else:
@@ -180,9 +173,23 @@ class VmDebootstrap(cliapp.Application):
 
     def set_hostname(self, rootdir):
         hostname = self.settings['hostname']
-        f = open(os.path.join(rootdir, 'etc', 'hostname'), 'w')
-        f.write(hostname)
-        f.close()
+        with open(os.path.join(rootdir, 'etc', 'hostname'), 'w') as f:
+            f.write('%s\n' % hostname)
+            
+        etc_hosts = os.path.join(rootdir, 'etc', 'hosts')
+        with open(etc_hosts, 'r') as f:
+            data = f.read()
+        with open(etc_hosts, 'w') as f:
+            for line in data.splitlines():
+                if line.startswith('127.0.0.1'):
+                    line += ' %s' % hostname
+                f.write('%s\n' % line)
+
+    def create_fstab(self, rootdir):
+        fstab = os.path.join(rootdir, 'etc', 'fstab')
+        with open(fstab, 'w') as f:
+            f.write('proc /proc proc defaults 0 0\n')
+            f.write('/dev/sda1 / ext4 errors=remount-ro 0 1\n')
 
     def set_root_password(self, rootdir):
         if self.settings['root-password']: