Move tizenglobalapp user creation from slp-pkgmgr to ail

(linked to https://review.tizen.org/gerrit/#/c/28031/)

Clean pkg_initdb code by removing duplicate #define

Change-Id: Icb698fa791c50ef39f3b757769e2b15593b558a3
Signed-off-by: Baptiste DURAND <baptiste.durand@open.eurogiciel.org>

diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
index e882b580f44d834ac63f48b465a0588859ab473d..e51868bac576fe88b28960306c31e147c19facb8 100644 (file)
--- a/packaging/pkgmgr.spec
+++ b/packaging/pkgmgr.spec
@@ -123,13 +123,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/package-manager/server
 # Update mime database to support package mime types
 update-mime-database /usr/share/mime
 
-# Create tizenglobalapp user needed for global installation
-%{_sbindir}/useradd -d %TZ_SYS_RW_APP -m %TZ_SYS_GLOBALAPP_USER -r -c "system user for common applications" -g root
-
-#mkdir -p %TZ_SYS_RW_APP/.config/xwalk-service/applications
-#cd %TZ_SYS_RW_APP/
-#ln -s .config/xwalk-service/applications/
-
 %post -n pkgmgr-server -p /sbin/ldconfig
 
 %post -n pkgmgr-client -p /sbin/ldconfig

diff --git a/tool/pkg_initdb.c b/tool/pkg_initdb.c
index 7249e92a8b2dddf681c3caab626c1cb8217f33c7..36c3425b8c20207351908d9545fe8c4a89425c4b 100755 (executable)
--- a/tool/pkg_initdb.c
+++ b/tool/pkg_initdb.c
@@ -44,8 +44,7 @@
 #define PACKAGE_INFO_DB_FILE tzplatform_mkpath(TZ_SYS_DB, ".pkgmgr_parser.db")
 #define PACKAGE_INFO_DB_FILE_JOURNAL tzplatform_mkpath(TZ_SYS_DB, ".pkgmgr_parser.db-journal")
 
-#define PKG_PARSER_DB_FILE tzplatform_mkpath(TZ_SYS_DB, ".pkgmgr_parser.db")
-#define PKG_PARSER_DB_FILE_JOURNAL tzplatform_mkpath(TZ_SYS_DB, ".pkgmgr_parser.db-journal")
+
 #define PKG_CERT_DB_FILE tzplatform_mkpath(TZ_SYS_DB, ".pkgmgr_cert.db")
 #define PKG_CERT_DB_FILE_JOURNAL tzplatform_mkpath(TZ_SYS_DB, ".pkgmgr_cert.db-journal")
 #define PKG_INFO_DB_LABEL "*"
@@ -277,8 +276,8 @@ int main(int argc, char *argv[])
 
        setuid(OWNER_ROOT);
        
-       SET_DEFAULT_LABEL(PKG_PARSER_DB_FILE);
-       SET_DEFAULT_LABEL(PKG_PARSER_DB_FILE_JOURNAL);
+       SET_DEFAULT_LABEL(PACKAGE_INFO_DB_FILE);
+       SET_DEFAULT_LABEL(PACKAGE_INFO_DB_FILE_JOURNAL);
        SET_DEFAULT_LABEL(PKG_CERT_DB_FILE);
        SET_DEFAULT_LABEL(PKG_CERT_DB_FILE_JOURNAL);