Upgrade: set RW update script number

+ revert patch using binary instead of systemctl

Change-Id: I728645cb1a8d15b96dadf68942935b4925e5d454

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bb33dcd772a4398bfe7568ac66d8958caa7af36..a3a79c954f84296af0d28928c7fd1f698de01c42 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,11 +85,11 @@ ENDIF("${EMULATOR}" STREQUAL "on")
 
 #Upgrade script
 CONFIGURE_FILE(
-    script/system_info_upgrade.sh.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/system_info_upgrade.sh
+    script/500.system_info_upgrade.sh.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/500.system_info_upgrade.sh
     @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/system_info_upgrade.sh DESTINATION ${UPGRADE_SCRIPT_PATH})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/500.system_info_upgrade.sh DESTINATION ${UPGRADE_SCRIPT_PATH})
 
 
 IF(UNIX)

diff --git a/packaging/capi-system-info.spec b/packaging/capi-system-info.spec
index 6dfb9d956b9f4f3076c56bf6b2586026ddd69025..90e1733b0e861bd205638cbcfe7104ae40f52cde 100644 (file)
--- a/packaging/capi-system-info.spec
+++ b/packaging/capi-system-info.spec
@@ -98,7 +98,7 @@ mkdir -p %{buildroot}/%{sysinfo_shared_path}
 %{_unitdir}/sysinit.target.wants/tizenid.service
 
 #upgrade script
-%{upgrade_script_path}/system_info_upgrade.sh
+%{upgrade_script_path}/500.system_info_upgrade.sh
 
 %files devel
 %manifest %{name}.manifest

diff --git a/script/500.system_info_upgrade.sh.in b/script/500.system_info_upgrade.sh.in
new file mode 100644 (file)
index 0000000..90a1abd
--- /dev/null
+++ b/script/500.system_info_upgrade.sh.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+#--------------------------------------------#
+# system-info patch for upgrade (2.4 -> 3.0) #
+#--------------------------------------------#
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+mkdir -p @SHARED_PATH@
+chown root:system_share @SHARED_PATH@
+chmod 775 @SHARED_PATH@
+chsmack -a "System::Shared" -t @SHARED_PATH@
+
+systemctl start tizenid.service

diff --git a/script/system_info_upgrade.sh.in b/script/system_info_upgrade.sh.in
deleted file mode 100644 (file)
index 4f17a8c..0000000
--- a/script/system_info_upgrade.sh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-#--------------------------------------------#
-# system-info patch for upgrade (2.4 -> 3.0) #
-#--------------------------------------------#
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-mkdir -p @SHARED_PATH@
-chown root:system_share @SHARED_PATH@
-chmod 775 @SHARED_PATH@
-chsmack -a "System::Shared" -t @SHARED_PATH@
-
-/usr/bin/tizen_id