From cbfdda8fb21525c8eff8d2d4e6dfad3d83095111 Mon Sep 17 00:00:00 2001 From: Joonsub Lee Date: Wed, 16 Dec 2015 17:18:16 +0900 Subject: [PATCH] Move generating users in end of the postscripts To accelerate mic image creation speed Change-Id: If0abcb8afa337a1d979130482fa2996cba3a2882 Signed-off-by: Joonsub Lee --- scripts/tv-base.post | 6 ---- scripts/tv-user.post | 9 +++++ scripts/tv-users.post | 94 --------------------------------------------------- tv.yaml | 2 ++ 4 files changed, 11 insertions(+), 100 deletions(-) create mode 100644 scripts/tv-user.post delete mode 100644 scripts/tv-users.post diff --git a/scripts/tv-base.post b/scripts/tv-base.post index 72226d5..5132c04 100644 --- a/scripts/tv-base.post +++ b/scripts/tv-base.post @@ -7,9 +7,3 @@ 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 - diff --git a/scripts/tv-user.post b/scripts/tv-user.post new file mode 100644 index 0000000..a0e66b3 --- /dev/null +++ b/scripts/tv-user.post @@ -0,0 +1,9 @@ +#!/bin/sh +echo "############### tv-user.post ################" + +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 + diff --git a/scripts/tv-users.post b/scripts/tv-users.post deleted file mode 100644 index a0ec197..0000000 --- a/scripts/tv-users.post +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -echo "#################### tv-users.post ##################" - -# enable TLM (Tizen Login Manager) and generate tlm.conf -if [ -e /usr/lib/systemd/system/tlm.service ]; then - mkdir -p /usr/lib/systemd/system/multi-user.target.wants - ln -s ../tlm.service /usr/lib/systemd/system/multi-user.target.wants/tlm.service - - cat > /etc/tlm.conf << EOF -# This file is generated by post script in .ks file. - -# -# This group contains top-level settings. -# -[General] -# -# Name of the account plugin to use to manage(add/remove) guest user accounts -ACCOUNTS_PLUGIN=gumd -# -# Number of seats -# Default: obtain from systemd -NSEATS=1 -# -# Auto-login default user -# Default: off -# AUTO_LOGIN=1 -# -# Prepare default/guest users before auto-login -# Default: off -# PREPARE_DEFAULT=1 -# -# PAM service file to use -# PAM_SERVICE=tlm-login -# -# PAM service file for default user -# DEFAULT_PAM_SERVICE=tlm-default-login -# -# Default (guest) username or template to use -# %S - seat number -# %I - seat id string -# Default: "guest" -# DEFAULT_USER=guest_%S -# -# Session command : The command run after successfull login -# Default: $SHELL -# In case shell is not defined in /etc/passwd fallback is "systemd --user" -#SESSION_CMD=systemd --user -# -# Session termination timeout in seconds -# Default: 10 -#TERMINATE_TIMEOUT=10 -# -# Setup terminal for session -# Default: off -#SETUP_TERMINAL=1 -# -# Use X11 style sessions -# Default: off -#X11_SESSION=1 -# -# Do not launch anything, let systemd handle it through PAM -# Default: off -#PAUSE_SESSION=1 -# -# Specify session type, needs to be specified for -# XDG_SESSION_CLASS and XDG_SESSION_TYPE to be set -# Default: unspecified -#SESSION_TYPE=wayland -# -# -# Seat specific settings where the group name is seat id -[seat0] -DEFAULT_USER=owner -#DEFAULT_USER=tizen -SETUP_TERMINAL=1 -VTNR=7 -#SESSION_CMD=weston-launch -#DEFAULT_PAM_SERVICE=tlm-system-login -#SETUP_RUNTIME_DIR=1 -#RUNTIME_MODE=0700 -# -#[seat1] -#ACTIVE=0 -#DEFAULT_USER=guest_%S -#DEFAULT_USER=app -# -# -# plugin specific settings. -# -#[pluginname] -# -EOF -fi - diff --git a/tv.yaml b/tv.yaml index 3d45c62..207daac 100644 --- a/tv.yaml +++ b/tv.yaml @@ -79,6 +79,7 @@ Wayland: - generic-desktop-applications - tv-bluetooth - tv-web-framework + - tv-user Repos: [] NoChrootScripts: - buildname @@ -126,6 +127,7 @@ Emulator-wayland: - generic-desktop-applications - tv-bluetooth - tv-web-framework + - tv-user Repos: [] NoChrootScripts: - buildname -- 2.7.4