Drop unneeded tizen prefix in service name

Change-Id: I5d5be0fbaa69be7cd669742504629dd707c00154
(cherry picked from commit 958e177000c908c594d6073724de980d7ac167a3)

diff --git a/packaging/system-recovery.spec b/packaging/system-recovery.spec
index d88b23dcbb0e9f43a5b8ec095e14ab2b54da2944..19af9b6b39ae91c6abee5878a83da30786113091 100644 (file)
--- a/packaging/system-recovery.spec
+++ b/packaging/system-recovery.spec
@@ -1,6 +1,6 @@
 Name:           system-recovery
 Summary:        System recovery
-Version:        0.5.2
+Version:        0.6.0
 Release:        0
 Group:          System/Utilities
 License:        Apache-2.0
@@ -33,8 +33,8 @@ mkdir -p %{buildroot}%{_unitdir}/recovery.target.wants
 install -m 644 units/recovery.target %{buildroot}%{_unitdir}
 install -m 644 units/recovery-reboot.service %{buildroot}%{_unitdir}
 ln -s ../recovery-reboot.service %{buildroot}%{_unitdir}/recovery.target.wants
-install -m 644 units/tizen-recovery.service %{buildroot}%{_unitdir}
-ln -s ../tizen-recovery.service %{buildroot}%{_unitdir}/recovery.target.wants
+install -m 644 units/recovery.service %{buildroot}%{_unitdir}
+ln -s ../recovery.service %{buildroot}%{_unitdir}/recovery.target.wants
 
 
 %files
@@ -46,5 +46,5 @@ ln -s ../tizen-recovery.service %{buildroot}%{_unitdir}/recovery.target.wants
 %{_unitdir}/recovery.target
 %{_unitdir}/recovery-reboot.service
 %{_unitdir}/recovery.target.wants/recovery-reboot.service
-%{_unitdir}/tizen-recovery.service
-%{_unitdir}/recovery.target.wants/tizen-recovery.service
+%{_unitdir}/recovery.service
+%{_unitdir}/recovery.target.wants/recovery.service

diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt
index d7da1621575b07ece628190ca82f046b1082d8f9..c2576c228be3e0e767d7d702dbcb73177ad57da7 100644 (file)
--- a/units/CMakeLists.txt
+++ b/units/CMakeLists.txt
@@ -1,5 +1,4 @@
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
 
-# recovery-init
 SET(RECOVERY_REBOOT_SERVICE ${CMAKE_CURRENT_SOURCE_DIR}/recovery-reboot.service)
 CONFIGURE_FILE(${RECOVERY_REBOOT_SERVICE}.in ${RECOVERY_REBOOT_SERVICE} @ONLY)

diff --git a/units/recovery-reboot.service.in b/units/recovery-reboot.service.in
index ceac51f817583cb401ac1c674c17649f05782f3a..66acf0d5523da22132e4a777fff94fa13bafc459 100644 (file)
--- a/units/recovery-reboot.service.in
+++ b/units/recovery-reboot.service.in
@@ -1,8 +1,8 @@
 [Unit]
 Description=Reboot after recovery
 DefaultDependencies=no
-Requires=tizen-recovery.service
-After=tizen-recovery.service
+Requires=recovery.service
+After=recovery.service
 
 [Service]
 ExecStart=/usr/sbin/reboot -f

diff --git a/units/recovery.service b/units/recovery.service
new file mode 100644 (file)
index 0000000..5f77381
--- /dev/null
+++ b/units/recovery.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Recovery
+DefaultDependencies=no
+Requires=sysinit.target local-fs.target
+After=sysinit.target local-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/true
+SmackProcessLabel=System

diff --git a/units/tizen-recovery.service b/units/tizen-recovery.service
deleted file mode 100644 (file)
index 887320a..0000000
--- a/units/tizen-recovery.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Tizen recovery
-DefaultDependencies=no
-Requires=sysinit.target local-fs.target
-After=sysinit.target local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/true