From: Chen Qi <[email protected]> read_only_rootfs_hook: this funtion is invoked only if 'read-only-rootfs' is in IMAGE_FEATURES. It tweaks some basic files and makes populate- volatile.sh script run at rootfs time.
choose_volatile_conf_file: this function is invoked no matter 'read-only-rootfs' is in IMAGE_FEATURES or not, it properly chooses the right conf file for volatile storage handling according to the IMAGE_FEATURES. [YOCTO #3406] Signed-off-by: Chen Qi <[email protected]> --- meta/classes/image.bbclass | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d3a416d..57bd0e3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -396,6 +396,36 @@ zap_root_password () { mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd } +# A hook function to support read-only-rootfs IMAGE_FEATURES +read_only_rootfs_hook () { + # Tweak the mount option in fstab + sed -i '/rootfs/ s/defaults/ro/' ${IMAGE_ROOTFS}/etc/fstab + # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes + if [ -e ${IMAGE_ROOTFS}/etc/default/rcS ]; then + sed -i 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/' ${IMAGE_ROOTFS}/etc/default/rcS + fi + # Run populate-volatile.sh at rootfs time to set up basic files + # and directories to support read-only rootfs. + if [ -e ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh ]; then + ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh + fi +} + +# Choose the correct config file for volatile storage handling according to the image type +choose_volatile_conf_file () { + if ${@base_contains("IMAGE_FEATURES", "x11-sato", "true", "false" ,d)}; then + if [ -e ${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-sato ]; then + cp ${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-sato \ + ${IMAGE_ROOTFS}/etc/default/volatiles/00_core_readonly + fi + else + if [ -e ${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-minimal ]; then + cp ${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-minimal \ + ${IMAGE_ROOTFS}/etc/default/volatiles/00_core_readonly + fi + fi +} + # allow openssh accept login with empty password string openssh_allow_empty_password () { if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then -- 1.7.9.5 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
