On 07/04/2013 11:07 PM, qi.c...@windriver.com wrote:
From: Chen Qi <qi.c...@windriver.com>
We may want to add a user or group which does not logically belong to
any specific package. For example, we may want to add a user with the
name 'tester' to our image. Besides, we may want to delete or modify
user/group in our image.
This patch adds a variable, USER_GROUP_SETTINGS, which is dedicated
to these tasks. The configuration format is detailed in the local.conf.
sample.extended file.
This patch also adds a function, set_user_group, which happens at
the end of the ROOTFS_POSTPROCESS_COMMAND. It handles the settings
in the USER_GROUP_SETTINGS variable.
[YOCTO #4074]
Signed-off-by: Chen Qi <qi.c...@windriver.com>
---
meta/classes/image.bbclass | 48 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 380ed8e..8ce97be 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -179,6 +179,8 @@ ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES",
"debug-tweaks"
ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks",
"postinst_enable_logging; ", "",d)}'
# Set default postinst log file
POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
+# Image level user / group settings
+ROOTFS_POSTPROCESS_COMMAND_append = " set_user_group;"
# some default locales
IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
@@ -528,6 +530,52 @@ postinst_enable_logging () {
echo "LOGFILE=${POSTINST_LOGFILE}" >>
${IMAGE_ROOTFS}${sysconfdir}/default/postinst
}
+# Image level user / group settings
+set_user_group () {
+ user_group_settings="${USER_GROUP_SETTINGS}"
+ export PSEUDO="${FAKEROOTENV} ${STAGING_DIR_NATIVE}${bindir}/pseudo"
+ # login.def may no be present in rootfs, if so, we use that one in
sysroot as a default
+ if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/login.defs ]; then
+ cp ${STAGING_DIR_TARGET}/${sysconfdir}/login.defs
${IMAGE_ROOTFS}${sysconfdir}/login.defs
+ target_login_def="no"
+ fi
Since this gets run every time for image creation, we can be sure an
image won't be using someform of login, so finding login.defs might not
be the best thing to do.
take the poky.tiny example and failures:
cp: cannot stat
'/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/poky-tiny/build/build/tmp/sysroots/qemux86//etc/login.defs':
No such file or directory
ERROR: Function failed: do_rootfs (log file is located at
/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/poky-tiny/build/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.24531)
NOTE: recipe core-image-minimal-1.0-r0: task do_rootfs: Failed
Sau!
+ setting=`echo $user_group_settings | cut -d ';' -f1`
+ remaining=`echo $user_group_settings | cut -d ';' -f2-`
+ while test "x$setting" != "x"; do
+ user_group=`echo $setting | cut -d ',' -f1`
+ action=`echo $setting | cut -d ',' -f2`
+ opts=`echo $setting | cut -d ',' -f3`
+ # determine the command according to user_group and action
+ if [ "$user_group" = "USER" ]; then
+ cmd_prefix="user"
+ elif [ "$user_group" = "GROUP" ]; then
+ cmd_prefix="group"
+ else
+ echo "Error: invalid setting of $user_group in the
USER_GROUP_SETTINGS"
+ exit 1
+ fi
+ if [ "$action" = "ADD" ]; then
+ cmd_suffix="add"
+ elif [ "$action" = "DEL" ]; then
+ cmd_suffix="del"
+ elif [ "$action" = "MOD" ]; then
+ cmd_suffix="mod"
+ else
+ echo "Error: invalid setting of $user_group in the
USER_GROUP_SETTINGS"
+ exit 1
+ fi
+ cmd=$cmd_prefix$cmd_suffix
+ echo "using commond <$cmd> for setting <$setting> ..."
+ eval $PSEUDO $cmd -R ${IMAGE_ROOTFS} $opts
+ # iterate to the next setting
+ setting=`echo $remaining | cut -d ';' -f1`
+ remaining=`echo $remaining | cut -d ';' -f2-`
+ done
+ if [ "$target_login_def" = "no" ]; then
+ rm -f ${IMAGE_ROOTFS}${sysconfdir}/login.defs
+ fi
+}
+
# Turn any symbolic /sbin/init link into a file
remove_init_link () {
if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
