From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.windriver.com ([147.11.1.11]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1To9UR-00060L-Fy for openembedded-core@lists.openembedded.org; Thu, 27 Dec 2012 10:11:03 +0100 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id qBR8u3kV005088 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Thu, 27 Dec 2012 00:56:03 -0800 (PST) Received: from [128.224.163.154] (128.224.163.154) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.2.318.4; Thu, 27 Dec 2012 00:56:03 -0800 Message-ID: <50DC0D23.6090804@windriver.com> Date: Thu, 27 Dec 2012 16:56:03 +0800 From: ChenQi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Martin Jansa References: <819997e2cad5d6a4bf2621fb7cc443105ca0fc87.1356576405.git.Qi.Chen@windriver.com> <20121227084244.GB3777@jama> In-Reply-To: <20121227084244.GB3777@jama> X-Originating-IP: [128.224.163.154] Cc: Zhenfeng.Zhao@windriver.com, openembedded-core@lists.openembedded.org Subject: Re: [PATCH 2/4] image.bbclass: add two hook funtions to support read-only rootfs X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Dec 2012 09:11:03 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit On 12/27/2012 04:42 PM, Martin Jansa wrote: > On Thu, Dec 27, 2012 at 10:57:39AM +0800, Qi.Chen@windriver.com wrote: >> From: Chen Qi >> >> 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 properly chooses the right >> conf file for volatile storage handling according to the IMAGE_FEATURES. > choose_volatile_conf_file is always called from core-image with or > without read-only-rootfs in IMAGE_FEATURES. > > So it will use /etc/default/volatiles_stage/volatiles-readonly-minimal > without read-only-rootfs. > > Cheers, Thanks for your review :) The commit message here is kind of misleading. Maybe I should modify the commit message here? Thanks, Chen Qi >> [YOCTO #3406] >> >> Signed-off-by: Chen Qi >> --- >> meta/classes/image.bbclass | 29 +++++++++++++++++++++++++++++ >> 1 file changed, 29 insertions(+) >> >> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass >> index 8bf718a..15d42d0 100644 >> --- a/meta/classes/image.bbclass >> +++ b/meta/classes/image.bbclass >> @@ -394,6 +394,35 @@ 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 '/rootfs/ s/defaults/ro/' < ${IMAGE_ROOTFS}/etc/fstab > ${IMAGE_ROOTFS}/etc/fstab.new >> + mv ${IMAGE_ROOTFS}/etc/fstab.new ${IMAGE_ROOTFS}/etc/fstab >> + # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes >> + sed 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/' < ${IMAGE_ROOTFS}/etc/default/rcS > ${IMAGE_ROOTFS}/etc/default/rcS.new >> + mv ${IMAGE_ROOTFS}/etc/default/rcS.new ${IMAGE_ROOTFS}/etc/default/rcS >> + # 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 >> + echo "${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh doesn't exist." >> + exit 1 >> + else >> + ${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 >> + cp ${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-sato \ >> + ${IMAGE_ROOTFS}/etc/default/volatiles/00_core_readonly >> + else >> + cp ${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-minimal \ >> + ${IMAGE_ROOTFS}/etc/default/volatiles/00_core_readonly >> + 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 >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core