From a40b75f648ea6a71584a38c332ad3ad2c7ce9113 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 29 Aug 2010 12:18:30 +0200 Subject: [PATCH] Get rid of our own targets; use the ones from upstream instead --- debian/system/basic.target | 4 ---- debian/system/checkfs.service | 9 --------- debian/system/checkroot.service | 9 --------- debian/system/ctrl-alt-del.target | 1 - debian/system/default.target | 1 - debian/system/getty.target | 2 -- debian/system/getty.target.wants/getty@tty1.service | 1 - debian/system/getty.target.wants/getty@tty2.service | 1 - debian/system/getty.target.wants/getty@tty3.service | 1 - debian/system/getty.target.wants/getty@tty4.service | 1 - debian/system/getty.target.wants/getty@tty5.service | 1 - debian/system/getty.target.wants/getty@tty6.service | 1 - debian/system/getty@.service | 11 ----------- debian/system/halt.service | 12 ------------ debian/system/halt.target | 3 --- debian/system/kbrequest.target | 1 - debian/system/killall.service | 8 -------- debian/system/local-fs.target | 3 --- debian/system/local.service | 1 - debian/system/multi-user.target | 5 ----- debian/system/multi-user.target.wants/getty.target | 1 - .../multi-user.target.wants/systemd-initctl.socket | 1 - .../multi-user.target.wants/systemd-logger.socket | 1 - debian/system/network.target | 2 -- debian/system/nss-lookup.target | 4 ---- debian/system/poweroff.service | 11 ----------- debian/system/poweroff.target | 4 ---- debian/system/rc-local.service | 12 ------------ debian/system/reboot.service | 11 ----------- debian/system/reboot.target | 4 ---- debian/system/remote-fs.target | 4 ---- debian/system/rescue.target | 5 ----- debian/system/rtc-set.target | 2 -- debian/system/runlevel0.target | 1 - debian/system/runlevel1.target | 1 - debian/system/runlevel2.target | 1 - debian/system/runlevel3.target | 4 ---- debian/system/runlevel4.target | 4 ---- debian/system/runlevel5.target | 4 ---- debian/system/runlevel6.target | 1 - debian/system/shutdown.target | 3 --- debian/system/sigpwr.target | 2 -- debian/system/sysinit.service | 9 --------- debian/system/syslog.target | 4 ---- 44 files changed, 172 deletions(-) delete mode 100644 debian/system/basic.target delete mode 100644 debian/system/checkfs.service delete mode 100644 debian/system/checkroot.service delete mode 120000 debian/system/ctrl-alt-del.target delete mode 120000 debian/system/default.target delete mode 100644 debian/system/getty.target delete mode 120000 debian/system/getty.target.wants/getty@tty1.service delete mode 120000 debian/system/getty.target.wants/getty@tty2.service delete mode 120000 debian/system/getty.target.wants/getty@tty3.service delete mode 120000 debian/system/getty.target.wants/getty@tty4.service delete mode 120000 debian/system/getty.target.wants/getty@tty5.service delete mode 120000 debian/system/getty.target.wants/getty@tty6.service delete mode 100644 debian/system/getty@.service delete mode 100644 debian/system/halt.service delete mode 100644 debian/system/halt.target delete mode 120000 debian/system/kbrequest.target delete mode 100644 debian/system/killall.service delete mode 100644 debian/system/local-fs.target delete mode 120000 debian/system/local.service delete mode 100644 debian/system/multi-user.target delete mode 120000 debian/system/multi-user.target.wants/getty.target delete mode 120000 debian/system/multi-user.target.wants/systemd-initctl.socket delete mode 120000 debian/system/multi-user.target.wants/systemd-logger.socket delete mode 100644 debian/system/network.target delete mode 100644 debian/system/nss-lookup.target delete mode 100644 debian/system/poweroff.service delete mode 100644 debian/system/poweroff.target delete mode 100644 debian/system/rc-local.service delete mode 100644 debian/system/reboot.service delete mode 100644 debian/system/reboot.target delete mode 100644 debian/system/remote-fs.target delete mode 100644 debian/system/rescue.target delete mode 100644 debian/system/rtc-set.target delete mode 120000 debian/system/runlevel0.target delete mode 120000 debian/system/runlevel1.target delete mode 120000 debian/system/runlevel2.target delete mode 100644 debian/system/runlevel3.target delete mode 100644 debian/system/runlevel4.target delete mode 100644 debian/system/runlevel5.target delete mode 120000 debian/system/runlevel6.target delete mode 100644 debian/system/shutdown.target delete mode 100644 debian/system/sigpwr.target delete mode 100644 debian/system/sysinit.service delete mode 100644 debian/system/syslog.target diff --git a/debian/system/basic.target b/debian/system/basic.target deleted file mode 100644 index b2c8e8a9..00000000 --- a/debian/system/basic.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Basic System -Requires=local-fs.target sysinit.service rc-local.service -After=local-fs.target sysinit.service diff --git a/debian/system/checkfs.service b/debian/system/checkfs.service deleted file mode 100644 index b10aa305..00000000 --- a/debian/system/checkfs.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Check non-root file systems - -[Service] -ExecStart=/etc/init.d/checkfs.sh start -Type=finish -TimeoutSec=0 -StandardInput=tty -ValidNoProcess=yes diff --git a/debian/system/checkroot.service b/debian/system/checkroot.service deleted file mode 100644 index db6b4b29..00000000 --- a/debian/system/checkroot.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Check root file system - -[Service] -ExecStart=/etc/init.d/checkroot.sh start -Type=finish -TimeoutSec=0 -StandardInput=tty -ValidNoProcess=yes diff --git a/debian/system/ctrl-alt-del.target b/debian/system/ctrl-alt-del.target deleted file mode 120000 index f2fde431..00000000 --- a/debian/system/ctrl-alt-del.target +++ /dev/null @@ -1 +0,0 @@ -reboot.target \ No newline at end of file diff --git a/debian/system/default.target b/debian/system/default.target deleted file mode 120000 index 19c4c93c..00000000 --- a/debian/system/default.target +++ /dev/null @@ -1 +0,0 @@ -multi-user.target \ No newline at end of file diff --git a/debian/system/getty.target b/debian/system/getty.target deleted file mode 100644 index 6d9da7c6..00000000 --- a/debian/system/getty.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Login Prompts diff --git a/debian/system/getty.target.wants/getty@tty1.service b/debian/system/getty.target.wants/getty@tty1.service deleted file mode 120000 index c466b299..00000000 --- a/debian/system/getty.target.wants/getty@tty1.service +++ /dev/null @@ -1 +0,0 @@ -../getty@.service \ No newline at end of file diff --git a/debian/system/getty.target.wants/getty@tty2.service b/debian/system/getty.target.wants/getty@tty2.service deleted file mode 120000 index c466b299..00000000 --- a/debian/system/getty.target.wants/getty@tty2.service +++ /dev/null @@ -1 +0,0 @@ -../getty@.service \ No newline at end of file diff --git a/debian/system/getty.target.wants/getty@tty3.service b/debian/system/getty.target.wants/getty@tty3.service deleted file mode 120000 index c466b299..00000000 --- a/debian/system/getty.target.wants/getty@tty3.service +++ /dev/null @@ -1 +0,0 @@ -../getty@.service \ No newline at end of file diff --git a/debian/system/getty.target.wants/getty@tty4.service b/debian/system/getty.target.wants/getty@tty4.service deleted file mode 120000 index c466b299..00000000 --- a/debian/system/getty.target.wants/getty@tty4.service +++ /dev/null @@ -1 +0,0 @@ -../getty@.service \ No newline at end of file diff --git a/debian/system/getty.target.wants/getty@tty5.service b/debian/system/getty.target.wants/getty@tty5.service deleted file mode 120000 index c466b299..00000000 --- a/debian/system/getty.target.wants/getty@tty5.service +++ /dev/null @@ -1 +0,0 @@ -../getty@.service \ No newline at end of file diff --git a/debian/system/getty.target.wants/getty@tty6.service b/debian/system/getty.target.wants/getty@tty6.service deleted file mode 120000 index c466b299..00000000 --- a/debian/system/getty.target.wants/getty@tty6.service +++ /dev/null @@ -1 +0,0 @@ -../getty@.service \ No newline at end of file diff --git a/debian/system/getty@.service b/debian/system/getty@.service deleted file mode 100644 index 4cc9d2c8..00000000 --- a/debian/system/getty@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Getty on %I -Before=getty.target -After=basic.target -Conflicts=shutdown.target - -[Service] -ExecStart=/sbin/getty 38400 %I -Type=simple -Restart=restart-always -RestartSec=0 diff --git a/debian/system/halt.service b/debian/system/halt.service deleted file mode 100644 index d2ac6d01..00000000 --- a/debian/system/halt.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Halt -Requires=shutdown.target killall.service -After=shutdown.target killall.service -Before=halt.target - -[Service] -Type=finish -ValidNoProcess=yes -Environment=INIT_HALT=HALT -Environment=RUNLEVEL=0 -ExecStart=/etc/init.d/halt stop diff --git a/debian/system/halt.target b/debian/system/halt.target deleted file mode 100644 index 03b81175..00000000 --- a/debian/system/halt.target +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Description=Halt -Requires=halt.service diff --git a/debian/system/kbrequest.target b/debian/system/kbrequest.target deleted file mode 120000 index eedb17fb..00000000 --- a/debian/system/kbrequest.target +++ /dev/null @@ -1 +0,0 @@ -rescue.target \ No newline at end of file diff --git a/debian/system/killall.service b/debian/system/killall.service deleted file mode 100644 index e5c82895..00000000 --- a/debian/system/killall.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Kill All Processes -After=shutdown.target - -[Service] -Type=finish -ValidNoProcess=yes -ExecStart=/etc/init.d/sendsigs stop diff --git a/debian/system/local-fs.target b/debian/system/local-fs.target deleted file mode 100644 index 60cce4d7..00000000 --- a/debian/system/local-fs.target +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Description=Local File Systems -After=sysinit.service diff --git a/debian/system/local.service b/debian/system/local.service deleted file mode 120000 index ad0e40fc..00000000 --- a/debian/system/local.service +++ /dev/null @@ -1 +0,0 @@ -rc-local.service \ No newline at end of file diff --git a/debian/system/multi-user.target b/debian/system/multi-user.target deleted file mode 100644 index e246687c..00000000 --- a/debian/system/multi-user.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Multi-User Target -Requires=basic.target -After=basic.target -Names=runlevel2.target diff --git a/debian/system/multi-user.target.wants/getty.target b/debian/system/multi-user.target.wants/getty.target deleted file mode 120000 index bdba1fe4..00000000 --- a/debian/system/multi-user.target.wants/getty.target +++ /dev/null @@ -1 +0,0 @@ -../getty.target \ No newline at end of file diff --git a/debian/system/multi-user.target.wants/systemd-initctl.socket b/debian/system/multi-user.target.wants/systemd-initctl.socket deleted file mode 120000 index 9a828b02..00000000 --- a/debian/system/multi-user.target.wants/systemd-initctl.socket +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/systemd-initctl.socket \ No newline at end of file diff --git a/debian/system/multi-user.target.wants/systemd-logger.socket b/debian/system/multi-user.target.wants/systemd-logger.socket deleted file mode 120000 index 253aa938..00000000 --- a/debian/system/multi-user.target.wants/systemd-logger.socket +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/systemd-logger.socket \ No newline at end of file diff --git a/debian/system/network.target b/debian/system/network.target deleted file mode 100644 index c84fb990..00000000 --- a/debian/system/network.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Network diff --git a/debian/system/nss-lookup.target b/debian/system/nss-lookup.target deleted file mode 100644 index c889ac31..00000000 --- a/debian/system/nss-lookup.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Name Lookups -Wants=network.target -After=network.target diff --git a/debian/system/poweroff.service b/debian/system/poweroff.service deleted file mode 100644 index 459ea598..00000000 --- a/debian/system/poweroff.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Poweroff -Requires=shutdown.target killall.service -After=shutdown.target killall.service -Before=poweroff.target - -[Service] -Type=finish -ValidNoProcess=yes -Environment=RUNLEVEL=0 -ExecStart=/etc/init.d/halt stop diff --git a/debian/system/poweroff.target b/debian/system/poweroff.target deleted file mode 100644 index c1fd9f73..00000000 --- a/debian/system/poweroff.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Power Off -Names=runlevel0.target -Requires=poweroff.service diff --git a/debian/system/rc-local.service b/debian/system/rc-local.service deleted file mode 100644 index 93e182c9..00000000 --- a/debian/system/rc-local.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=/etc/rc.local Compatibility -Requires=basic.target -Names=local.service - -[Service] -ExecStart=/etc/rc.local start -Type=finish -TimeoutSec=0 -StandardInput=tty -ValidNoProcess=yes -SysVStartPriority=99 diff --git a/debian/system/reboot.service b/debian/system/reboot.service deleted file mode 100644 index 020cc651..00000000 --- a/debian/system/reboot.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Reboot -Requires=shutdown.target killall.service -After=shutdown.target killall.service -Before=reboot.target - -[Service] -Type=finish -ValidNoProcess=yes -Environment=RUNLEVEL=6 -ExecStart=/etc/init.d/reboot stop diff --git a/debian/system/reboot.target b/debian/system/reboot.target deleted file mode 100644 index 3afc7300..00000000 --- a/debian/system/reboot.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Reboot -Names=runlevel6.target -Requires=reboot.service diff --git a/debian/system/remote-fs.target b/debian/system/remote-fs.target deleted file mode 100644 index 58234a37..00000000 --- a/debian/system/remote-fs.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Remote File Systems -Requires=network.target -After=network.target diff --git a/debian/system/rescue.target b/debian/system/rescue.target deleted file mode 100644 index e0b02ca2..00000000 --- a/debian/system/rescue.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Rescue Target -Requires=basic.target -After=basic.target -Names=runlevel1.target diff --git a/debian/system/rtc-set.target b/debian/system/rtc-set.target deleted file mode 100644 index 58bcd82d..00000000 --- a/debian/system/rtc-set.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=RTC Set diff --git a/debian/system/runlevel0.target b/debian/system/runlevel0.target deleted file mode 120000 index fe6c668a..00000000 --- a/debian/system/runlevel0.target +++ /dev/null @@ -1 +0,0 @@ -poweroff.target \ No newline at end of file diff --git a/debian/system/runlevel1.target b/debian/system/runlevel1.target deleted file mode 120000 index eedb17fb..00000000 --- a/debian/system/runlevel1.target +++ /dev/null @@ -1 +0,0 @@ -rescue.target \ No newline at end of file diff --git a/debian/system/runlevel2.target b/debian/system/runlevel2.target deleted file mode 120000 index 19c4c93c..00000000 --- a/debian/system/runlevel2.target +++ /dev/null @@ -1 +0,0 @@ -multi-user.target \ No newline at end of file diff --git a/debian/system/runlevel3.target b/debian/system/runlevel3.target deleted file mode 100644 index f5ce2613..00000000 --- a/debian/system/runlevel3.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Compatibility for Runlevel 3 -Requires=multi-user.target -After=multi-user.target diff --git a/debian/system/runlevel4.target b/debian/system/runlevel4.target deleted file mode 100644 index 1200b869..00000000 --- a/debian/system/runlevel4.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Compatibility for Runlevel 4 -Requires=multi-user.target -After=multi-user.target diff --git a/debian/system/runlevel5.target b/debian/system/runlevel5.target deleted file mode 100644 index 6f765974..00000000 --- a/debian/system/runlevel5.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Compatibility for Runlevel 5 -Requires=multi-user.target -After=multi-user.target diff --git a/debian/system/runlevel6.target b/debian/system/runlevel6.target deleted file mode 120000 index f2fde431..00000000 --- a/debian/system/runlevel6.target +++ /dev/null @@ -1 +0,0 @@ -reboot.target \ No newline at end of file diff --git a/debian/system/shutdown.target b/debian/system/shutdown.target deleted file mode 100644 index e7252069..00000000 --- a/debian/system/shutdown.target +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Names=shutdown.target -Description=Shutdown diff --git a/debian/system/sigpwr.target b/debian/system/sigpwr.target deleted file mode 100644 index 9903184c..00000000 --- a/debian/system/sigpwr.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Power Failure diff --git a/debian/system/sysinit.service b/debian/system/sysinit.service deleted file mode 100644 index 12663782..00000000 --- a/debian/system/sysinit.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=System Initialization - -[Service] -ExecStart=/etc/init.d/rcS -Type=finish -TimeoutSec=0 -StandardInput=tty -ValidNoProcess=yes diff --git a/debian/system/syslog.target b/debian/system/syslog.target deleted file mode 100644 index 11d4fda2..00000000 --- a/debian/system/syslog.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=System Logger -Requires=rsyslog.service -After=rsyslog.service -- 2.39.5