From 2f24552fa99dff2c58db636e8a7cc2cfd24c289d Mon Sep 17 00:00:00 2001 From: William Douglas Date: Thu, 11 Apr 2013 05:51:54 -0700 Subject: [PATCH] Change update to use the update plymouth service and systemd target Signed-off-by: William Douglas --- Makefile | 1 - packaging/swup.spec | 2 -- system-update.service | 6 +++--- system-update.target | 5 ----- 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 system-update.target diff --git a/Makefile b/Makefile index 9655ebb..cbfb024 100644 --- a/Makefile +++ b/Makefile @@ -4,5 +4,4 @@ install: install -D -m 755 swup.py ${DESTDIR}/usr/bin/swup install -D -m 755 system-update.sh ${DESTDIR}/usr/bin/system-update install -D -m 755 tools/updateinfo/updateinfo.py ${DESTDIR}/usr/bin/updateinfo - install -D -m 644 system-update.target ${DESTDIR}/usr/lib/systemd/system/system-update.target install -D -m 644 system-update.service ${DESTDIR}/usr/lib/systemd/system/system-update.service diff --git a/packaging/swup.spec b/packaging/swup.spec index e1e43b3..8383735 100644 --- a/packaging/swup.spec +++ b/packaging/swup.spec @@ -22,7 +22,6 @@ Software Update Tool. %install %make_install -rm -f %{buildroot}%{_unitdir}/system-update.target %install_service system-update.target.wants system-update.service %files @@ -31,7 +30,6 @@ rm -f %{buildroot}%{_unitdir}/system-update.target %{_bindir}/system-update %{_bindir}/updateinfo %{_unitdir}/system-update.service -#%{_unitdir}/system-update.target %{_unitdir}/system-update.target.wants/system-update.service %changelog diff --git a/system-update.service b/system-update.service index 9ba9d73..983f170 100644 --- a/system-update.service +++ b/system-update.service @@ -2,12 +2,12 @@ Description=Tizen System Updater DefaultDependencies=no OnFailure=reboot.target -Requires=systemd-remount-fs.service connman.service -After=systemd-remount-fs.service connman.service +Requires=systemd-remount-fs.service plymouth-update.service +After=systemd-remount-fs.service plymouth-update.service [Service] Type=oneshot #StandardInput=tty-force -#StandardOutput=tty-force +StandardOutput=tty-force RemainAfterExit=no ExecStart=/usr/bin/system-update diff --git a/system-update.target b/system-update.target deleted file mode 100644 index 7f337ad..0000000 --- a/system-update.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=System Update -Documentation=man:systemd.special(7) -Requires=sysinit.target -After=sysinit.target -- 2.7.4