Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=255ee59929993812f0ede5d806f46a32b11cae86
commit 255ee59929993812f0ede5d806f46a32b11cae86 Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Mar 7 00:18:06 2011 +0100 splashy-0.3.13-15-i686 - depend on systemd for service file handling in install scriptlet diff --git a/source/xapps/splashy/FrugalBuild b/source/xapps/splashy/FrugalBuild index 13432aa..f34079d 100644 --- a/source/xapps/splashy/FrugalBuild +++ b/source/xapps/splashy/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.3.13 themever=1.4 # see http://alioth.debian.org/project/showfiles.php?group_id=30657 rel_id=2691 -pkgrel=14 +pkgrel=15 pkgdesc="A complete user-space boot splash system" url="http://alioth.debian.org/projects/splashy/"; depends=('glib2' 'directfb-input-keyboard>=1.2.0-1' 'libgcc' 'file') @@ -28,12 +28,12 @@ sha1sums=('c98b6c113155b70de21cda1d23f4ee9320c92153' \ 'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \ '25b87e1a16cce20dde0d2c665c20820473676252' \ 'e1055a9018ed70b34c508f31ec46704c3d8134e9' \ - 'ca21f18d9aa20a7d1b9f72338301920a85c0a990' \ - 'a7ce082e5100abb73884508de94ad9f9d3aee9f2' \ - '0073a24a9d269d6283a1ed732a00032721f106fa' \ - 'f2070b7d19e4e11cf3d8127ee60843df92f73d61' \ - 'e6da5b4518cff4ecb2ae2d1a080c338f3027b7a6' \ - 'f6e18f76f2a2ef42c2adc54d7b639614bd2b3b09' \ + 'd604b563ee0d34a1bfd148f842d3d408ce78f44b' \ + '4c2c3f2e4c66face1a461a3ad3fb21094eb5c94c' \ + '8e30df01dd321b91f3b463413fd67a6e29931e52' \ + 'a81f14abceba50e22ea7b8904666e0191b470cd6' \ + '3caa9e37005ef4f9b754e2a6d1bebed4e60db1a9' \ + 'e84c09abb7d75b103d046893171b057f4d3c6da0' \ '384d1858bbbc99d155bf0607d714e8c0cd7f91f9') build() diff --git a/source/xapps/splashy/splashy-halt.service b/source/xapps/splashy/splashy-halt.service index cebb40a..164052e 100644 --- a/source/xapps/splashy/splashy-halt.service +++ b/source/xapps/splashy/splashy-halt.service @@ -7,3 +7,6 @@ DefaultDependencies=no [Service] ExecStart=/lib/systemd/systemd-splashy shutdown 'Halting...' Type=forking + +[Install] +WantedBy=halt.target diff --git a/source/xapps/splashy/splashy-kexec.service b/source/xapps/splashy/splashy-kexec.service index 6aba037..c4db6e9 100644 --- a/source/xapps/splashy/splashy-kexec.service +++ b/source/xapps/splashy/splashy-kexec.service @@ -7,3 +7,6 @@ DefaultDependencies=no [Service] ExecStart=/lib/systemd/systemd-splashy shutdown 'Rebooting with kexec...' Type=forking + +[Install] +WantedBy=kexec.target diff --git a/source/xapps/splashy/splashy-poweroff.service b/source/xapps/splashy/splashy-poweroff.service index b378f99..c02e042 100644 --- a/source/xapps/splashy/splashy-poweroff.service +++ b/source/xapps/splashy/splashy-poweroff.service @@ -7,3 +7,6 @@ DefaultDependencies=no [Service] ExecStart=/lib/systemd/systemd-splashy shutdown 'Powering Off...' Type=forking + +[Install] +WantedBy=poweroff.target diff --git a/source/xapps/splashy/splashy-quit.service b/source/xapps/splashy/splashy-quit.service index 10abfd6..abb8c88 100644 --- a/source/xapps/splashy/splashy-quit.service +++ b/source/xapps/splashy/splashy-quit.service @@ -6,3 +6,6 @@ After=dev-tty1.device local.service splashy-start.service [Service] ExecStart=-/usr/sbin/splashy_update exit Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/source/xapps/splashy/splashy-reboot.service b/source/xapps/splashy/splashy-reboot.service index 341dbdd..4e30adc 100644 --- a/source/xapps/splashy/splashy-reboot.service +++ b/source/xapps/splashy/splashy-reboot.service @@ -7,3 +7,6 @@ DefaultDependencies=no [Service] ExecStart=/lib/systemd/systemd-splashy shutdown 'Rebooting...' Type=forking + +[Install] +WantedBy=reboot.target diff --git a/source/xapps/splashy/splashy-start.service b/source/xapps/splashy/splashy-start.service index 2e77c7a..2365e86 100644 --- a/source/xapps/splashy/splashy-start.service +++ b/source/xapps/splashy/splashy-start.service @@ -6,3 +6,6 @@ After=systemd-vconsole-setup.service udev-settle.service [Service] ExecStart=/lib/systemd/systemd-splashy boot 'Booting...' Type=forking + +[Install] +WantedBy=sysinit.target diff --git a/source/xapps/splashy/splashy.install b/source/xapps/splashy/splashy.install index 4a08b2a..11168e1 100644 --- a/source/xapps/splashy/splashy.install +++ b/source/xapps/splashy/splashy.install @@ -1,42 +1,25 @@ -enable_units() -{ - ln -s ../splashy-halt.service /lib/systemd/system/halt.target.wants/ - ln -s ../splashy-kexec.service /lib/systemd/system/kexec.target.wants/ - ln -s ../splashy-poweroff.service /lib/systemd/system/poweroff.target.wants/ - ln -s ../splashy-quit.service /lib/systemd/system/multi-user.target.wants/ - ln -s ../splashy-reboot.service /lib/systemd/system/reboot.target.wants/ - ln -s ../splashy-start.service /lib/systemd/system/sysinit.target.wants/ -} - -disable_units() -{ - rm /lib/systemd/system/halt.target.wants/splashy-halt.service - rm /lib/systemd/system/kexec.target.wants/splashy-kexec.service - rm /lib/systemd/system/poweroff.target.wants/splashy-poweroff.service - rm /lib/systemd/system/multi-user.target.wants/splashy-quit.service - rm /lib/systemd/system/reboot.target.wants/splashy-reboot.service - rm /lib/systemd/system/sysinit.target.wants/splashy-start.service -} - post_install() { cd /etc/rc.d/rcS.d ln -sf ../rc.splash S03rc.splash /usr/sbin/chkconfig --add rc.splash /usr/sbin/chkconfig --add rc.zz-splash - enable_units + systemctl enable splashy-{halt,kexec,poweroff,quit,reboot,start}.service >/dev/null 2>&1 } post_upgrade() { - if [ -e /etc/rc.d/rcS.d/S03rc.splash ]; then - enable_units + systemctl daemon-reload >/dev/null 2>&1 + if [ `vercmp $2 0.3.13-14` -lt 0 ]; then + if [ -e /etc/rc.d/rcS.d/S03rc.splash ]; then + post_install + fi fi } pre_remove() { - disable_units + systemctl disable splashy-{halt,kexec,poweroff,quit,reboot,start}.service >/dev/null 2>&1 /usr/sbin/chkconfig --del rc.zz-splash /usr/sbin/chkconfig --del rc.splash rm /etc/rc.d/rcS.d/S03rc.splash _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
