@@ -6,29 +6,42 @@ do_configure()
66{
77 msg " :: Configuring ${COMPONENT} ... "
88 # set min uid and gid
9- sed -i ' s|^[#]\?UID_MIN.*|UID_MIN 5000|' " ${CHROOT_DIR} /etc/login.defs"
10- sed -i ' s|^[#]\?GID_MIN.*|GID_MIN 5000|' " ${CHROOT_DIR} /etc/login.defs"
9+ local login_defs
10+ login_defs=" ${CHROOT_DIR} /etc/login.defs"
11+ if [ ! -e " ${login_defs} " ]; then
12+ touch " ${login_defs} "
13+ fi
14+ if ! $( grep -q ' ^ *UID_MIN' " ${login_defs} " ) ; then
15+ echo " UID_MIN 5000" >> " ${login_defs} "
16+ sed -i ' s|^[#]\?UID_MIN.*|UID_MIN 5000|' " ${login_defs} "
17+ fi
18+ if ! $( grep -q ' ^ *GID_MIN' " ${login_defs} " ) ; then
19+ echo " GID_MIN 5000" >> " ${login_defs} "
20+ sed -i ' s|^[#]\?GID_MIN.*|GID_MIN 5000|' " ${login_defs} "
21+ fi
1122 # add android groups
12- local aid uid
13- for aid in $( cat " ${COMPONENT_DIR} /android_groups" )
14- do
15- local xname=$( echo ${aid} | awk -F: ' {print $1}' )
16- local xid=$( echo ${aid} | awk -F: ' {print $2}' )
17- sed -i " s|^${xname} :.*|${xname} :x:${xid} :${USER_NAME} |" " ${CHROOT_DIR} /etc/group"
18- if ! $( grep -q " ^${xname} :" " ${CHROOT_DIR} /etc/group" ) ; then
19- echo " ${xname} :x:${xid} :${USER_NAME} " >> " ${CHROOT_DIR} /etc/group"
20- fi
21- if ! $( grep -q " ^${xname} :" " ${CHROOT_DIR} /etc/passwd" ) ; then
22- echo " ${xname} :x:${xid} :${xid} ::/:/bin/false" >> " ${CHROOT_DIR} /etc/passwd"
23- fi
24- # add users to aid_inet group
25- for uid in ${PRIVILEGED_USERS}
23+ if [ -n " ${PRIVILEGED_USERS} " ]; then
24+ local aid uid
25+ for aid in $( cat " ${COMPONENT_DIR} /android_groups" )
2626 do
27- if ! $( grep -q " ^${xname} :.*${uid} " " ${CHROOT_DIR} /etc/group" ) ; then
28- sed -i " s|^\(${xname} :.*\)|\1,${uid} |" " ${CHROOT_DIR} /etc/group"
27+ local xname=$( echo ${aid} | awk -F: ' {print $1}' )
28+ local xid=$( echo ${aid} | awk -F: ' {print $2}' )
29+ sed -i " s|^${xname} :.*|${xname} :x:${xid} :${USER_NAME} |" " ${CHROOT_DIR} /etc/group"
30+ if ! $( grep -q " ^${xname} :" " ${CHROOT_DIR} /etc/group" ) ; then
31+ echo " ${xname} :x:${xid} :${USER_NAME} " >> " ${CHROOT_DIR} /etc/group"
2932 fi
33+ if ! $( grep -q " ^${xname} :" " ${CHROOT_DIR} /etc/passwd" ) ; then
34+ echo " ${xname} :x:${xid} :${xid} ::/:/bin/false" >> " ${CHROOT_DIR} /etc/passwd"
35+ fi
36+ # add users to aid_inet group
37+ for uid in ${PRIVILEGED_USERS}
38+ do
39+ if ! $( grep -q " ^${xname} :.*${uid} " " ${CHROOT_DIR} /etc/group" ) ; then
40+ sed -i " s|^\(${xname} :.*\)|\1,${uid} |" " ${CHROOT_DIR} /etc/group"
41+ fi
42+ done
3043 done
31- done
44+ fi
3245 return 0
3346}
3447
0 commit comments