X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=vmdebootstrap;h=1b863e8ec78e3c8b36185cd8c2090c291c5b8025;hb=94d2cded1ec9cb98a2f1f9b0fe34d64fec1cc1f9;hp=967be518d7353ea4733e08339a8da05e55639f0c;hpb=8b6dac15852d499bca129ae49ec83e371a1c0e6b;p=forks%2Fvmdebootstrap.git diff --git a/vmdebootstrap b/vmdebootstrap index 967be51..1b863e8 100755 --- a/vmdebootstrap +++ b/vmdebootstrap @@ -27,7 +27,7 @@ import tempfile import time -__version__ = '0.6' +__version__ = '0.7' # pylint: disable=invalid-name @@ -74,6 +74,9 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth ['roottype'], 'specify file system type for /', default='ext4') + self.settings.bytesize( + ['swap'], + 'create swap space of size SIZE (min 256Mb)') self.settings.string( ['foreign'], 'set up foreign debootstrap environment using provided program (ie binfmt handler)') @@ -193,7 +196,10 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth self.partition_image() if self.settings['mbr'] or self.settings['extlinux']: self.install_mbr() - (rootdev, bootdev) = self.setup_kpartx() + (rootdev, bootdev, swapdev) = self.setup_kpartx() + if self.settings['swap'] > 0: + self.message("Creating swap space") + self.runcmd(['mkswap', swapdev]) self.mkfs(rootdev, fstype=roottype) rootdir = self.mount(rootdev) if bootdev: @@ -242,7 +248,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth if self.settings['owner']: self.chown() - except BaseException, e: + except BaseException as e: self.message('EEEK! Something bad happened...') if rootdir: db_log = os.path.join(rootdir, 'debootstrap', 'debootstrap.log') @@ -307,6 +313,15 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth 'mklabel', self.settings['part-type']]) partoffset = 0 bootsize = 0 + extent = '100%' + swap = 256 * 1024 * 1024 + if self.settings['swap'] > 0: + if self.settings['swap'] > swap: + swap = self.settings['swap'] + else: + # minimum 256Mb as default qemu ram is 128Mb + logging.debug("Setting minimum 256Mb swap space") + extent = "%s%%" % int(100 * (self.settings['size'] - swap) / self.settings['size']) if self.settings['bootoffset'] and self.settings['bootoffset'] is not '0': # turn v.small offsets into something at least possible to create. if self.settings['bootoffset'] < 1048576: @@ -324,15 +339,18 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth logging.debug("Starting boot partition at %sMb", bootsize) self.runcmd(['parted', '-s', self.settings['image'], 'mkpart', 'primary', 'fat16', str(partoffset), str(bootsize)]) - if partoffset == 0: + logging.debug("Starting root partition at %sMb", partoffset) self.runcmd(['parted', '-s', self.settings['image'], - 'mkpart', 'primary', '0%', '100%']) + 'mkpart', 'primary', str(bootsize), extent]) else: - logging.debug("Starting root partition at %sMb", partoffset) self.runcmd(['parted', '-s', self.settings['image'], - 'mkpart', 'primary', str(bootsize), '100%']) + 'mkpart', 'primary', '0%', extent]) self.runcmd(['parted', '-s', self.settings['image'], 'set', '1', 'boot', 'on']) + if self.settings['swap'] > 0: + logging.debug("Creating swap partition") + self.runcmd(['parted', '-s', self.settings['image'], + 'mkpart', 'primary', 'linux-swap', extent, '100%']) def update_initramfs(self, rootdir): cmd = os.path.join('usr', 'sbin', 'update-initramfs') @@ -351,26 +369,40 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth def setup_kpartx(self): bootindex = None + swapindex = None out = self.runcmd(['kpartx', '-avs', self.settings['image']]) - if self.settings['bootsize']: + if self.settings['bootsize'] and self.settings['swap'] > 0: bootindex = 0 rootindex = 1 + swapindex = 2 + parts = 3 + elif self.settings['bootsize']: + bootindex = 0 + rootindex = 1 + parts = 2 + elif self.settings['swap'] > 0: + rootindex = 0 + swapindex = 1 parts = 2 else: rootindex = 0 parts = 1 boot = None + swap = None devices = [line.split()[2] for line in out.splitlines() if line.startswith('add map ')] if len(devices) != parts: - msg = 'Surprising number of partitions' + msg = 'Surprising number of partitions - check output of losetup -a' + logging.debug("%s" % self.runcmd(['losetup', '-a'])) logging.debug("%s: devices=%s parts=%s", msg, devices, parts) raise cliapp.AppException(msg) root = '/dev/mapper/%s' % devices[rootindex] if self.settings['bootsize']: boot = '/dev/mapper/%s' % devices[bootindex] - return root, boot + if self.settings['swap'] > 0: + swap = '/dev/mapper/%s' % devices[swapindex] + return root, boot, swap def mkfs(self, device, fstype): self.message('Creating filesystem %s' % fstype) @@ -386,11 +418,13 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth include.append('acpid') if self.settings['grub']: - include.append('grub2') + include.append('grub-pc') if not self.settings['no-kernel']: if self.settings['arch'] == 'i386': kernel_arch = '486' + elif self.settings['arch'] == 'armhf': + kernel_arch = 'armmp' else: kernel_arch = self.settings['arch'] kernel_image = 'linux-image-%s' % kernel_arch @@ -470,6 +504,10 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth f.write('%s / %s errors=remount-ro 0 1\n' % (rootdevstr, roottype)) if bootdevstr: f.write('%s /boot %s errors=remount-ro 0 2\n' % (bootdevstr, boottype)) + if self.settings['swap'] > 0: + f.write("/dev/sda3 swap swap defaults 0 0\n") + elif self.settings['swap'] > 0: + f.write("/dev/sda2 swap swap defaults 0 0\n") def install_debs(self, rootdir): if not self.settings['custom-package']: @@ -561,6 +599,18 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth with open(inittab, 'a') as f: f.write('\nS0:23:respawn:%s\n' % serial_command) + def _grub_serial_console(self, rootdir): + cmdline = 'GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=tty1 console=ttyS0,38400n8"' + terminal = 'GRUB_TERMINAL="serial gfxterm"' + command = 'GRUB_SERIAL_COMMAND="serial --speed=38400 --unit=0 --parity=no --stop=1"' + grub_cfg = os.path.join(rootdir, 'etc', 'default', 'grub') + logging.debug("Allowing serial output in grub config %s", grub_cfg) + with open(grub_cfg, 'a+') as cfg: + cfg.write("# %s serial support\n" % os.path.basename(__file__)) + cfg.write("%s\n" % cmdline) + cfg.write("%s\n" % terminal) + cfg.write("%s\n" % command) + def install_grub2(self, rootdev, rootdir): self.message("Configuring grub2") # rely on kpartx using consistent naming to map loop0p1 to loop0 @@ -571,15 +621,18 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth '%s' % os.path.join(rootdir, 'proc')]) self.runcmd(['mount', '/sys', '-t', 'sysfs', '-obind', '%s' % os.path.join(rootdir, 'sys')]) + if self.settings['serial-console']: + self._grub_serial_console(rootdir) + try: self.runcmd(['chroot', rootdir, 'update-grub']) self.runcmd(['chroot', rootdir, 'grub-install', install_dev]) except cliapp.AppException: self.message("Failed. Is grub2-common installed? Using extlinux.") + self.install_extlinux(rootdev, rootdir) self.runcmd(['umount', os.path.join(rootdir, 'sys')]) self.runcmd(['umount', os.path.join(rootdir, 'proc')]) self.runcmd(['umount', os.path.join(rootdir, 'dev')]) - self.install_extlinux(rootdev, rootdir) def install_extlinux(self, rootdev, rootdir): if not os.path.exists("/usr/bin/extlinux"): @@ -697,7 +750,10 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro %(kserial)s self.message('Running customize script %s' % script) logging.info("rootdir=%s image=%s", rootdir, self.settings['image']) with open('/dev/tty', 'w') as tty: - cliapp.runcmd([script, rootdir, self.settings['image']], stdout=tty, stderr=tty) + try: + cliapp.runcmd([script, rootdir, self.settings['image']], stdout=tty, stderr=tty) + except IOError as e: + subprocess.call([script, rootdir, self.settings['image']]) def create_tarball(self, rootdir): # Create a tarball of the disk's contents