From 856f04f16867a57f01a4a9e5d6c066e22082a856 Mon Sep 17 00:00:00 2001
From: Karol Lewandowski <k.lewandowsk@samsung.com>
Date: Mon, 17 Sep 2018 16:50:21 +0200
Subject: [PATCH] Remove unused multiuser accounts - guest, alice, bob & carol

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
---
 common.yaml                    |  5 +++--
 scripts/common-base.post       | 21 ---------------------
 scripts/iot-headless-base.post | 16 ----------------
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 scripts/common-base.post

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 ]
-- 
2.7.4