[systemd-commits] 2 commits - Makefile.am units/arch units/debian units/suse units/sysinit.target.m4

[Lennart Poettering]

 Makefile.am                |   16 ----------------
 units/arch/sysinit.service |   19 -------------------
 units/debian/fsck.target   |   11 -----------
 units/suse/fsck.target     |   11 -----------
 units/sysinit.target.m4    |    5 -----
 5 files changed, 62 deletions(-)

New commits:
commit ac52853d6db67e80610d91a2bb643ee815cfa7de
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Oct 20 16:21:48 2010 +0200

    arch: remove obsolete sysinit.service
    
    This is now split into smaller units and shipped with the downstream package.

diff --git a/Makefile.am b/Makefile.am
index 9c76fc8..a55b244 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -317,7 +317,6 @@ endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
-	units/arch/sysinit.service \
 	units/arch/rc-local.service
 endif
 
diff --git a/units/arch/sysinit.service b/units/arch/sysinit.service
deleted file mode 100644
index ae80f18..0000000
--- a/units/arch/sysinit.service
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=System Initialization
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-
-[Service]
-ExecStart=/etc/rc.sysinit
-Type=forking
-TimeoutSec=0
-StandardInput=tty
-RemainAfterExit=yes
diff --git a/units/sysinit.target.m4 b/units/sysinit.target.m4
index 08b035d..792fcaf 100644
--- a/units/sysinit.target.m4
+++ b/units/sysinit.target.m4
@@ -18,8 +18,3 @@ m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit
 Requires=sysinit.service
 After=sysinit.service
 )m4_dnl
-m4_ifdef(`TARGET_ARCH',
-m4_dnl Hook in Arch's /etc/rc.sysinit
-Requires=sysinit.service
-After=sysinit.service
-)m4_dnl

commit 72de7bbf39af53a0d721f7f39c4383cef71712d9
Author: Tom Gundersen <teg at jklm.no>
Date:   Mon Oct 25 22:02:52 2010 +0200

    fsck: remove symlink from fsck.target to sysinit.target

diff --git a/Makefile.am b/Makefile.am
index b6cae41..9c76fc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,17 +305,11 @@ endif
 
 if TARGET_DEBIAN_OR_UBUNTU
 dist_systemunit_DATA += \
-	units/debian/fsck.target \
 	units/debian/umountfs.service \
 	units/debian/umountnfs.service \
 	units/debian/umountroot.service
 endif
 
-if TARGET_SUSE
-dist_systemunit_DATA += \
-	units/suse/fsck.target
-endif
-
 if TARGET_GENTOO
 dist_systemunit_DATA += \
 	units/gentoo/xdm.service
@@ -1230,15 +1224,6 @@ if TARGET_DEBIAN_OR_UBUNTU
 		rm -f runlevel5.target && \
 		$(LN_S) multi-user.target runlevel5.target )
 endif
-if !TARGET_SUSE
-if !TARGET_DEBIAN
-if !TARGET_UBUNTU
-	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f fsck.target && \
-		$(LN_S) sysinit.target fsck.target )
-endif
-endif
-endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
diff --git a/units/debian/fsck.target b/units/debian/fsck.target
deleted file mode 100644
index 5da9a4f..0000000
--- a/units/debian/fsck.target
+++ /dev/null
@@ -1,11 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=File System Check
diff --git a/units/suse/fsck.target b/units/suse/fsck.target
deleted file mode 100644
index 5da9a4f..0000000
--- a/units/suse/fsck.target
+++ /dev/null
@@ -1,11 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-# See systemd.special(7) for details
-
-[Unit]
-Description=File System Check