diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-16 12:20:24 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-17 12:27:19 +0000 |
| commit | 6f420c935496b2c22e16b5e975e9ece8326adc2b (patch) | |
| tree | d24a94a149a29a40bf549feb5233814ca0120363 /morphlib/builder2.py | |
| parent | 05afac450309a09f95dba4c245a521fd750964c2 (diff) | |
| download | morph-6f420c935496b2c22e16b5e975e9ece8326adc2b.tar.gz | |
SystemBuilder: expect rootfs to be /dev/sda1
vmware doesn't support virtio, so to be compatible, we have to use
/dev/sda1
Diffstat (limited to 'morphlib/builder2.py')
| -rw-r--r-- | morphlib/builder2.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index b993666e..19a4b1b3 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -494,7 +494,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover with open(fstab, 'w') as f: f.write('proc /proc proc defaults 0 0\n') f.write('sysfs /sys sysfs defaults 0 0\n') - f.write('/dev/vda1 / btrfs errors=remount-ro 0 1\n') + f.write('/dev/sda1 / btrfs errors=remount-ro 0 1\n') def _create_extlinux_config(self, path): logging.debug('Creating extlinux.conf in %s' % path) @@ -505,8 +505,8 @@ class SystemBuilder(BuilderBase): # pragma: no cover f.write('timeout 1\n') f.write('label linux\n') f.write('kernel /boot/vmlinuz\n') - f.write('append root=/dev/vda1 rootflags=subvol=factory-run ' - 'init=/lib/systemd/systemd rw\n') + f.write('append root=/dev/sda1 rootflags=subvol=factory-run ' + 'init=/sbin/init rw\n') def _create_subvolume_snapshot(self, path, source, target): logging.debug('Creating subvolume snapshot %s to %s' % |