summaryrefslogtreecommitdiff
path: root/morphlib/fsutils.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-03 09:59:42 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-09 11:03:20 +0000
commita93a71565b806f7331c37c458ec4f6ca9a6f3541 (patch)
tree30dc2f0c214d49948675410ab324ea69292768e9 /morphlib/fsutils.py
parent07f0770ff2149aade385b4301212e1788ec4a472 (diff)
downloadmorph-a93a71565b806f7331c37c458ec4f6ca9a6f3541.tar.gz
system image use systemd on vda1 and build in tmp
Use the tempdir of the staging area instead of the chroot directory as the basedir for building system images. It would be better to create it directly in the cache, then rename it when finished, but commands need a filename and the cache provides an open file handle. Change the generated fstab and extlinux.conf to use systemd as the init and expect the root filesystem to be on vda1 instead of sda1. vda1 is slightly more efficient and is the default storage device for libvirt. This is safe to add before systemd is fully integrated, as if the kernel can't find that file it run /sbin/init, which is busybox
Diffstat (limited to 'morphlib/fsutils.py')
-rw-r--r--morphlib/fsutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/fsutils.py b/morphlib/fsutils.py
index 0a773ed5..15ad7ebf 100644
--- a/morphlib/fsutils.py
+++ b/morphlib/fsutils.py
@@ -55,7 +55,7 @@ def setup_device_mapping(ex, image_name):
def create_fs(ex, partition):
# FIXME: the hardcoded size of 4GB is icky but the default broke
# when we used mkfs -t ext4
- ex.runv(['mkfs', '-t', 'btrfs', '-L', 'baserock',
+ ex.runv(['mkfs.btrfs', '-L', 'baserock',
'-b', '4294967296', partition])
def mount(ex, partition, mount_point):