summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Lewandowski <k.lewandowsk@samsung.com>2018-09-17 16:50:21 +0200
committerMaciej Wereski <m.wereski@partner.samsung.com>2018-09-17 15:39:28 +0000
commit856f04f16867a57f01a4a9e5d6c066e22082a856 (patch)
treea920f3a7fe6089ec9a5db598f638b5c808cd2910
parent93ee02134d7d594a34728f6f287c2660a9f81f0b (diff)
downloadmeta-856f04f16867a57f01a4a9e5d6c066e22082a856.tar.gz
meta-856f04f16867a57f01a4a9e5d6c066e22082a856.tar.bz2
meta-856f04f16867a57f01a4a9e5d6c066e22082a856.zip
Remove unused multiuser accounts - guest, alice, bob & carolsubmit/tizen/20180914.113308accepted/tizen/unified/20180917.195200
Owner user will be created using generic-users.post. According to Mr Hyotaek Shim and Woochang Kim these are no longer used. Change-Id: I36dd63282d9365b6c69baaa23d019e12473500ec
-rw-r--r--common.yaml5
-rw-r--r--scripts/common-base.post21
-rw-r--r--scripts/iot-headless-base.post16
3 files changed, 3 insertions, 39 deletions
diff --git a/common.yaml b/common.yaml
index 7a845ff..af6e330 100644
--- a/common.yaml
+++ b/common.yaml
@@ -107,7 +107,7 @@ Wayland:
PostScripts:
- generic-adaptation
- generic-base
- - common-base
+ - generic-users
- generic-console-tools
- generic-wayland
- common-wayland
@@ -157,7 +157,7 @@ RPi3:
PostScripts:
- generic-adaptation
- generic-base
- - common-base
+ - generic-users
- generic-console-tools
- generic-wayland
- common-wayland
@@ -181,6 +181,7 @@ Tizen IoT:
PostScripts:
- generic-adaptation
- generic-base
+ - generic-users
- iot-headless-base
- generic-wayland
- generic-middleware
diff --git a/scripts/common-base.post b/scripts/common-base.post
deleted file mode 100644
index a5e640a..0000000
--- a/scripts/common-base.post
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-echo "############### common-base.post ################"
-
-######### multiuser mode: create additional users and fix their homedirs
-if ! generic_base_user_exists owner; then
- gum-utils --offline --add-user --username=owner --usertype=admin --usecret=tizen
-fi
-
-for user in alice bob carol guest; do
- if ! generic_base_user_exists $user; then
- gum-utils --offline --add-user --username="$user" --usertype=normal --usecret=tizen
- fi
-done
-
-######### add 'guest' user that runs bt-service daemon to vconf_bt group
-function mygetid() { sed '/^'"$1"':/!d;s/^\([^:]*:\)\{2\}\([^:]*\):.*$/\2/' "$2"; }
-function mygetuid() { mygetid "$1" /etc/passwd; }
-function mygetgid() { mygetid "$1" /etc/group; }
-
-gum-utils --offline --add-member --gid=$(mygetgid vconf_bt) --mem_uid=$(mygetuid guest)
-
diff --git a/scripts/iot-headless-base.post b/scripts/iot-headless-base.post
index 8fa9285..e57a794 100644
--- a/scripts/iot-headless-base.post
+++ b/scripts/iot-headless-base.post
@@ -2,22 +2,6 @@
echo "############### iot-headless-base.post ################"
-######### multiuser mode: create additional users and fix their homedirs
-if ! generic_base_user_exists owner; then
- gum-utils --offline --add-user --username=owner --usertype=admin --usecret=tizen
-fi
-
-if ! generic_base_user_exists guest; then
- gum-utils --offline --add-user --username=guest --usertype=normal --usecret=tizen
-fi
-
-######### add 'guest' user that runs bt-service daemon to vconf_bt group
-function mygetid() { sed '/^'"$1"':/!d;s/^\([^:]*:\)\{2\}\([^:]*\):.*$/\2/' "$2"; }
-function mygetuid() { mygetid "$1" /etc/passwd; }
-function mygetgid() { mygetid "$1" /etc/group; }
-
-gum-utils --offline --add-member --gid=$(mygetgid vconf_bt) --mem_uid=$(mygetuid guest)
-
######### Execute pkg_initdb if there is no pkgmgr-tool pacakge
rpm -qa | grep pkgmgr-tool
if [ $? != 0 ]