diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-09 15:25:36 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-09 15:25:36 +0000 |
| commit | f653e5fc67c521668d07896ca164c5615c2f9dae (patch) | |
| tree | 8716e5137836c244bdffa6879f4fd280ed6e090e | |
| parent | e129ee7d23add77ecc06c4e2ba7c63c18b8dfa50 (diff) | |
| parent | f3325d07ebaf7fdd85787520f7e2c3fb33b9f9cc (diff) | |
| download | morph-f653e5fc67c521668d07896ca164c5615c2f9dae.tar.gz | |
Merge branch 'baserock/bugfix/extlinux-mount-rw'
| -rw-r--r-- | morphlib/builder2.py | 2 | ||||
| -rw-r--r-- | morphlib/cachekeycomputer.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 41583149..36bcd7b6 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -646,7 +646,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 ro\n') + 'init=/sbin/init rw\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 c2e7490a..85d13934 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -97,7 +97,7 @@ class CacheKeyComputer(object): if kind == 'stratum': keys['stratum-format-version'] = 1 elif kind == 'system': - keys['system-compatibility-version'] = 1 + keys['system-compatibility-version'] = "1~ (temporary, root rw)" return keys |