summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2013-04-05 22:51:03 +0100
committerLars Wirzenius <liw@liw.fi>2013-04-05 22:51:03 +0100
commit86e9ccdb20dea2645a8efe4359fd5d125159872a (patch)
tree8b5f2ac4db6bc9761686add77430697e21c3242b
parent6349ca31965698cab12fdd8038b4b19ba4ab8cfe (diff)
parent417e327adbe0f2a6167f5ea2aaf62ba5627341b2 (diff)
downloadvmdebootstrap-86e9ccdb20dea2645a8efe4359fd5d125159872a.tar.gz
Merge branch 'no-mbr'
-rw-r--r--README1
-rwxr-xr-xvmdebootstrap7
2 files changed, 1 insertions, 7 deletions
diff --git a/README b/README
index 31ed67e..75e6f3b 100644
--- a/README
+++ b/README
@@ -18,7 +18,6 @@ In order to use vmdebootstrap, you'll need a few things:
* extlinux
* qemu-img (in the qemu-utils package in Debian)
* parted
-* mbr
* kpartx
* python-cliapp (see http://liw.fi/cliapp/)
diff --git a/vmdebootstrap b/vmdebootstrap
index 9dd9ba5..b675b22 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright 2011, 2012 Lars Wirzenius
+# Copyright 2011, 2012, 2013 Lars Wirzenius
# Copyright 2012 Codethink Limited
#
# This program is free software: you can redistribute it and/or modify
@@ -92,7 +92,6 @@ class VmDebootstrap(cliapp.Application):
if self.settings['image']:
self.create_empty_image()
self.partition_image()
- self.install_mbr()
rootdev = self.setup_kpartx()
self.mkfs(rootdev)
rootdir = self.mount(rootdev)
@@ -165,10 +164,6 @@ class VmDebootstrap(cliapp.Application):
self.runcmd(['parted', '-s', self.settings['image'],
'set', '1', 'boot', 'on'])
- def install_mbr(self):
- self.message('Installing MBR')
- self.runcmd(['install-mbr', self.settings['image']])
-
def setup_kpartx(self):
out = self.runcmd(['kpartx', '-av', self.settings['image']])
devices = [line.split()[2]