mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-24 18:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

units: split fsck.target from sysinit.target for suse compat

Browse Source
This commit is contained in:
Lennart Poettering 2010-08-06 01:30:20 +02:00
parent 0ff4cdd967
commit 922cc00119
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -195,7 +195,8 @@ if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/halt.service \
units/suse/poweroff.service \
units/suse/reboot.service
units/suse/reboot.service \
units/suse/fsck.target
endif
if TARGET_GENTOO
@ -787,6 +788,11 @@ if TARGET_GENTOO
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
if !TARGET_SUSE
( cd $(DESTDIR)$(systemunitdir) && \
rm -f fsck.target && \
$(LN_S) sysinit.target fsck.target )
endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \

2
src/mount.c
View File

@ -281,7 +281,7 @@ static int mount_add_default_dependencies(Mount *m) {
if (m->meta.manager->running_as == MANAGER_SYSTEM) {
if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
return r;
if (!path_equal(m->where, "/"))

1
src/special.h
View File

@ -51,6 +51,7 @@
#define SPECIAL_BASIC_TARGET "basic.target"
#define SPECIAL_SOCKETS_TARGET "sockets.target"
#define SPECIAL_SYSINIT_TARGET "sysinit.target"
#define SPECIAL_FSCK_TARGET "fsck.target"
#define SPECIAL_RESCUE_TARGET "rescue.target"
#define SPECIAL_EXIT_SERVICE "exit.service"
#define SPECIAL_EMERGENCY_TARGET "emergency.target"

4
units/sysinit.target.m4
View File

@ -23,3 +23,7 @@ m4_dnl Hook in Arch's /etc/rc.sysinit
Requires=sysinit.service
After=sysinit.service
)m4_dnl
m4_ifdef(`TARGET_SUSE',`',
m4_dnl On Suse, fsck.target is seperate, everywhere else it is just an alias for sysinit.target
Names=fsck.target
)m4_dnl