Drop unneeded tizen prefix in service name

Change-Id: I5d5be0fbaa69be7cd669742504629dd707c00154

diff --git a/packaging/system-recovery.spec b/packaging/system-recovery.spec
index d88b23d..19af9b6 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 d7da162..c2576c2 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 ceac51f..66acf0d 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/tizen-recovery.service b/units/recovery.service
similarity index 79%
rename from units/tizen-recovery.service
rename to units/recovery.service
index 887320a..5f77381 100644 (file)
--- a/units/tizen-recovery.service
+++ b/units/recovery.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Tizen recovery
+Description=Recovery
 DefaultDependencies=no
 Requires=sysinit.target local-fs.target
 After=sysinit.target local-fs.target
@@ -8,3 +8,4 @@ After=sysinit.target local-fs.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/true
+SmackProcessLabel=System