diff options
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oe/rootfs.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 045f4494c8..3239d5cf5e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -33,7 +33,7 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
33 | # IMAGE_FEATURES may contain any available package group | 33 | # IMAGE_FEATURES may contain any available package group |
34 | IMAGE_FEATURES ?= "" | 34 | IMAGE_FEATURES ?= "" |
35 | IMAGE_FEATURES[type] = "list" | 35 | IMAGE_FEATURES[type] = "list" |
36 | IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging" | 36 | IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging" |
37 | 37 | ||
38 | # Generate companion debugfs? | 38 | # Generate companion debugfs? |
39 | IMAGE_GEN_DEBUGFS ?= "0" | 39 | IMAGE_GEN_DEBUGFS ?= "0" |
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 4b747dd0f4..249c685dcf 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -217,6 +217,9 @@ class Rootfs(object, metaclass=ABCMeta): | |||
217 | self.progress_reporter.next_stage() | 217 | self.progress_reporter.next_stage() |
218 | 218 | ||
219 | if bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", | 219 | if bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", |
220 | True, False, self.d) and \ | ||
221 | not bb.utils.contains("IMAGE_FEATURES", | ||
222 | "read-only-rootfs-delayed-postinsts", | ||
220 | True, False, self.d): | 223 | True, False, self.d): |
221 | delayed_postinsts = self._get_delayed_postinsts() | 224 | delayed_postinsts = self._get_delayed_postinsts() |
222 | if delayed_postinsts is not None: | 225 | if delayed_postinsts is not None: |