Hey, as killall.service is not necessary anymore here two patches to remove it completely the first removes it from the default units, the second removes from the Debian and Fedora specific files. As I neither have Debian nor Fedora those are untested! they work well for Gentoo though. hope I did all right... first patch ;)
>From 65643466f4a15bce8f9529b0d62caaf1a5a816bf Mon Sep 17 00:00:00 2001 From: Franz Dietrich <[email protected]> Date: Wed, 20 Oct 2010 13:05:50 +0200 Subject: [PATCH 1/2] Since killall.service does not exist anymore remove all references. This commit deletes all references to killall.service for the default services. The distribution specific services will be modified in a separate commit. --- units/hwclock-save.service | 2 +- units/systemd-random-seed-save.service.in | 2 +- units/systemd-update-utmp-runlevel.service.in | 2 +- units/systemd-update-utmp-shutdown.service.in | 2 +- units/tmpwatch.service | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/units/hwclock-save.service b/units/hwclock-save.service index 067196f..5f3eeb4 100644 --- a/units/hwclock-save.service +++ b/units/hwclock-save.service @@ -8,7 +8,7 @@ [Unit] Description=Update RTC With System Clock DefaultDependencies=no -Before=poweroff.service reboot.service halt.service killall.service +Before=poweroff.service reboot.service halt.service [Service] Type=oneshot diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in index 7cfd2c0..1349e64 100644 --- a/units/systemd-random-seed-save.service.in +++ b/units/systemd-random-seed-save.service.in @@ -8,7 +8,7 @@ [Unit] Description=Save Random Seed DefaultDependencies=no -Before=poweroff.service reboot.service halt.service killall.service +Before=poweroff.service reboot.service halt.service Conflicts=systemd-random-seed-load.service [Service] diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in index 0cbde37..78d92af 100644 --- a/units/systemd-update-utmp-runlevel.service.in +++ b/units/systemd-update-utmp-runlevel.service.in @@ -10,7 +10,7 @@ Description=Notify Audit System and Update UTMP about System Runlevel Changes DefaultDependencies=no Wants=local-fs.target sysinit.target After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target -Before=poweroff.service reboot.service halt.service killall.service +Before=poweroff.service reboot.service halt.service [Service] Type=oneshot diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in index 0b4fe92..007ffad 100644 --- a/units/systemd-update-utmp-shutdown.service.in +++ b/units/systemd-update-utmp-shutdown.service.in @@ -10,7 +10,7 @@ Description=Notify Audit System and Update UTMP about System Shutdown DefaultDependencies=no Wants=local-fs.target sysinit.target After=local-fs.target sysinit.target auditd.service systemd-update-utmp-runlevel.service -Before=poweroff.service reboot.service halt.service killall.service +Before=poweroff.service reboot.service halt.service [Service] Type=oneshot diff --git a/units/tmpwatch.service b/units/tmpwatch.service index 636faf9..fb9dc23 100644 --- a/units/tmpwatch.service +++ b/units/tmpwatch.service @@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories DefaultDependencies=no Wants=local-fs.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target -Before=basic.target poweroff.service reboot.service halt.service killall.service +Before=basic.target poweroff.service reboot.service halt.service [Service] Type=oneshot -- 1.7.2.2
>From 5ab33c5be4771f810d25f0c8b80286322cf99a16 Mon Sep 17 00:00:00 2001 From: Franz Dietrich <[email protected]> Date: Wed, 20 Oct 2010 13:11:27 +0200 Subject: [PATCH 2/2] Remove the distro specific references to killall.service. Maybe debian and fedora still have the killall.service but usually it shouldn't be necessary anymore. --- units/debian/umountfs.service | 2 +- units/debian/umountnfs.service | 2 +- units/debian/umountroot.service | 2 +- units/fedora/plymouth-halt.service | 2 +- units/fedora/plymouth-poweroff.service | 2 +- units/fedora/plymouth-reboot.service | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/units/debian/umountfs.service b/units/debian/umountfs.service index 804db88..e36fb1d 100644 --- a/units/debian/umountfs.service +++ b/units/debian/umountfs.service @@ -8,7 +8,7 @@ [Unit] Description=Turn off swap and umount all local file systems DefaultDependencies=no -After=killall.service +After= Before=reboot.service poweroff.service halt.service umountroot.service [Service] diff --git a/units/debian/umountnfs.service b/units/debian/umountnfs.service index 598c3d4..22086d7 100644 --- a/units/debian/umountnfs.service +++ b/units/debian/umountnfs.service @@ -8,7 +8,7 @@ [Unit] Description=Umount all network file systems DefaultDependencies=no -After=killall.service +After= Before=reboot.service poweroff.service halt.service umountfs.service [Service] diff --git a/units/debian/umountroot.service b/units/debian/umountroot.service index 5d11602..42ba82a 100644 --- a/units/debian/umountroot.service +++ b/units/debian/umountroot.service @@ -8,7 +8,7 @@ [Unit] Description=Mount the root file system read-only DefaultDependencies=no -After=killall.service +After= Before=reboot.service poweroff.service halt.service [Service] diff --git a/units/fedora/plymouth-halt.service b/units/fedora/plymouth-halt.service index 69a9197..c0c137e 100644 --- a/units/fedora/plymouth-halt.service +++ b/units/fedora/plymouth-halt.service @@ -8,7 +8,7 @@ [Unit] Description=Show Plymouth Halt Screen [email protected] prefdm.service -Before=killall.service halt.service +Before= halt.service DefaultDependencies=no [Service] diff --git a/units/fedora/plymouth-poweroff.service b/units/fedora/plymouth-poweroff.service index be699ba..ad6e404 100644 --- a/units/fedora/plymouth-poweroff.service +++ b/units/fedora/plymouth-poweroff.service @@ -8,7 +8,7 @@ [Unit] Description=Show Plymouth Power Off Screen [email protected] prefdm.service -Before=killall.service poweroff.service +Before= poweroff.service DefaultDependencies=no [Service] diff --git a/units/fedora/plymouth-reboot.service b/units/fedora/plymouth-reboot.service index 5d252ad..0f77f78 100644 --- a/units/fedora/plymouth-reboot.service +++ b/units/fedora/plymouth-reboot.service @@ -8,7 +8,7 @@ [Unit] Description=Show Plymouth Reboot Screen [email protected] prefdm.service -Before=killall.service reboot.service +Before= reboot.service DefaultDependencies=no [Service] -- 1.7.2.2
_______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
