diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-02 16:03:53 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-02 16:03:53 +0100 |
| commit | 1b1e2258439022ddd215f4fcf5a86b0b5e7cbc6d (patch) | |
| tree | 77d63f2f3364848b343d06ebfbcc7819ba3d90d7 | |
| parent | 633cf57d6cbd4e28891d2e4db2c1cafc4355c4e2 (diff) | |
| parent | 6953c87c92d95bc6a895b931b0f54005b590a2ec (diff) | |
| download | morph-1b1e2258439022ddd215f4fcf5a86b0b5e7cbc6d.tar.gz | |
Merge remote branch 'origin/baserock/bugfix/S2528-remount-rw'
| -rw-r--r-- | morphlib/builder2.py | 4 | ||||
| -rw-r--r-- | morphlib/cachekeycomputer.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 6bdf7cc3..301890b2 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -610,7 +610,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/sda1 / btrfs errors=remount-ro 0 1\n') + f.write('/dev/sda1 / btrfs defaults,rw,noatime 0 1\n') def _create_extlinux_config(self, path): self.app.status(msg='Creating extlinux.conf in %(path)s', @@ -623,7 +623,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover f.write('label linux\n') f.write('kernel /boot/vmlinuz\n') f.write('append root=/dev/sda1 rootflags=subvol=factory-run ' - 'init=/sbin/init rw\n') + 'init=/sbin/init ro\n') def _create_subvolume_snapshot(self, path, source, target): self.app.status(msg='Creating subvolume snapshot ' diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 720ec4c2..c2e7490a 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -96,6 +96,8 @@ class CacheKeyComputer(object): keys['morphology-sha1'] = checksum.hexdigest() if kind == 'stratum': keys['stratum-format-version'] = 1 + elif kind == 'system': + keys['system-compatibility-version'] = 1 return keys |