diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-16 14:25:38 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-16 14:25:38 +0000 |
| commit | c0717ddf28f5b963531e7d28a007698e71ebfcb6 (patch) | |
| tree | 3f041b9a3ace14336e74f4671ad910b2766c1bfd /morphlib/builder.py | |
| parent | 2362ce30941e653905ce9bc2859498fa87afdec2 (diff) | |
| parent | 5c52cf732a36232a9d20fc70943aefea3b7c9781 (diff) | |
| download | morph-c0717ddf28f5b963531e7d28a007698e71ebfcb6.tar.gz | |
Merge remote branch 'origin/master' into rm/morph-pass1
Diffstat (limited to 'morphlib/builder.py')
| -rw-r--r-- | morphlib/builder.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py index 735e4334..05298994 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -494,7 +494,7 @@ class SystemBuilder(BlobBuilder): # pragma: no cover with self.build_watch('unpack-strata'): for name, filename in self.stage_items: self.msg('unpack %s from %s' % (name, filename)) - self.ex.runv(['tar', '-C', mount_point, '-xf', filename]) + self.ex.runv(['tar', '-C', mount_point, '-xhf', filename]) ldconfig(self.ex, mount_point) def _create_fstab(self, mount_point): @@ -503,9 +503,9 @@ class SystemBuilder(BlobBuilder): # pragma: no cover if not os.path.exists(os.path.dirname(fstab)): os.makedirs(os.path.dirname(fstab)) with open(fstab, 'w') as f: - f.write('proc /proc proc defaults 0 0') - f.write('sysfs /sys sysfs defaults 0 0') - f.write('/dev/sda1 / ext4 errors=remount-ro 0 1') + f.write('proc /proc proc defaults 0 0\n') + f.write('sysfs /sys sysfs defaults 0 0\n') + f.write('/dev/sda1 / ext4 errors=remount-ro 0 1\n') def _install_extlinux(self, mount_point): with self.build_watch('install-bootloader'): |