chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsck: add new -l switch to fsck mount options
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index cede2690dc7b3fb4f7f6e365d488812c825700a4..03a6a4e594660bc6d270febffe86205c1b975d53 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-163,6
+163,7
@@
dist_tmpfiles_DATA = \
dist_systemunit_DATA = \
units/emergency.service \
units/emergency.target \
dist_systemunit_DATA = \
units/emergency.service \
units/emergency.target \
+ units/sysinit.target \
units/basic.target \
units/getty.target \
units/halt.target \
units/basic.target \
units/getty.target \
units/halt.target \
@@
-215,7
+216,6
@@
dist_systemunit_DATA = \
units/systemd-ask-password-plymouth.path
nodist_systemunit_DATA = \
units/systemd-ask-password-plymouth.path
nodist_systemunit_DATA = \
- units/sysinit.target \
units/getty@.service \
units/serial-getty@.service \
units/graphical.target \
units/getty@.service \
units/serial-getty@.service \
units/graphical.target \
@@
-247,7
+247,8
@@
nodist_systemunit_DATA = \
units/kexec.service \
units/fsck@.service \
units/fsck-root.service \
units/kexec.service \
units/fsck@.service \
units/fsck-root.service \
- units/quotacheck.service
+ units/quotacheck.service \
+ units/rescue.service
dist_sessionunit_DATA = \
units/session/default.target \
dist_sessionunit_DATA = \
units/session/default.target \
@@
-258,12
+259,12
@@
nodist_sessionunit_DATA = \
units/session/exit.service
EXTRA_DIST = \
units/session/exit.service
EXTRA_DIST = \
- units/sysinit.target.m4 \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/remote-fs.target.m4 \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/remote-fs.target.m4 \
+ units/rescue.service.m4 \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
units/systemd-shutdownd.service.in \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
units/systemd-shutdownd.service.in \
@@
-299,9
+300,11
@@
dist_systemunit_DATA += \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service \
- units/fedora/single.service \
+ units/fedora/plymouth-start.service \
+ units/fedora/plymouth-read-write.service \
units/fedora/plymouth-quit.service \
units/fedora/plymouth-reboot.service \
units/fedora/plymouth-quit.service \
units/fedora/plymouth-reboot.service \
+ units/fedora/plymouth-kexec.service \
units/fedora/plymouth-poweroff.service \
units/fedora/plymouth-halt.service
endif
units/fedora/plymouth-poweroff.service \
units/fedora/plymouth-halt.service
endif
@@
-922,7
+925,7
@@
SED_PROCESS = \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-e 's,@prefix\@,$(prefix),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-e 's,@prefix\@,$(prefix),g' \
- < $< > $@
+ < $< > $@
|| rm $@
units/%: units/%.in Makefile
$(SED_PROCESS)
units/%: units/%.in Makefile
$(SED_PROCESS)
@@
-935,11
+938,11
@@
man/%: man/%.in Makefile
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
+ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
|| rm $@
M4_PROCESS_SESSION = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
M4_PROCESS_SESSION = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
+ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
|| rm $@
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
@@
-1035,6
+1038,7
@@
install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir)/basic.target.wants \
$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
$(DESTDIR)$(systemunitdir)/basic.target.wants \
$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
@@
-1047,10
+1051,9
@@
install-data-hook:
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
$(DESTDIR)$(systemunitdir)/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
$(DESTDIR)$(systemunitdir)/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
- $(DESTDIR)$(pkgsysconfdir)/system/
basic
.target.wants \
+ $(DESTDIR)$(pkgsysconfdir)/system/
sysinit
.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
- $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd
@@
-1137,10
+1140,10
@@
install-data-hook:
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/
basic
.target.wants && \
+ ( cd $(DESTDIR)$(pkgsysconfdir)/system/
sysinit
.target.wants && \
rm -f hwclock-load.service && \
$(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
rm -f hwclock-load.service && \
$(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
- ( cd $(DESTDIR)$(systemunitdir)/
basic
.target.wants && \
+ ( cd $(DESTDIR)$(systemunitdir)/
sysinit
.target.wants && \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
@@
-1150,8
+1153,7
@@
install-data-hook:
systemd-modules-load.service \
systemd-random-seed-load.service \
systemd-tmpfiles-setup.service \
systemd-modules-load.service \
systemd-random-seed-load.service \
systemd-tmpfiles-setup.service \
- sysctl.service \
- systemd-tmpfiles-clean.timer && \
+ sysctl.service && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
@@
-1161,7
+1163,9
@@
install-data-hook:
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
- $(LN_S) ../sysctl.service sysctl.service && \
+ $(LN_S) ../sysctl.service sysctl.service )
+ ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+ rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
@@
-1170,10
+1174,9
@@
if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
$(DESTDIR)$(systemunitdir)/reboot.target.wants \
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
$(DESTDIR)$(systemunitdir)/reboot.target.wants \
+ $(DESTDIR)$(systemunitdir)/kexec.target.wants \
$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
$(DESTDIR)$(systemunitdir)/halt.target.wants \
$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
$(DESTDIR)$(systemunitdir)/halt.target.wants \
- $(DESTDIR)$(systemunitdir)/rescue.target.wants \
- $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
$(DESTDIR)$(systemunitdir)/final.target.wants
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f rc-local.service && \
$(DESTDIR)$(systemunitdir)/final.target.wants
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
rm -f rc-local.service && \
@@
-1181,16
+1184,20
@@
if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
- ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
- rm -f single.service && \
- $(LN_S) $(systemunitdir)/single.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f plymouth-quit.service systemd-ask-password-plymouth.path && \
- $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \
+ $(LN_S) ../plymouth-start.service plymouth-start.service && \
+ $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
$(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
$(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+ rm -f plymouth-quit.service && \
+ $(LN_S) ../plymouth-quit.service plymouth-quit.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+ ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
+ rm -f plymouth-kexec.service && \
+ $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
rm -f plymouth-poweroff.service && \
$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
rm -f plymouth-poweroff.service && \
$(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
@@
-1205,12
+1212,12
@@
if TARGET_FEDORA
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_GENTOO
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_GENTOO
- ( cd $(DESTDIR)$(
pkgsysconfdir)/system
&& \
+ ( cd $(DESTDIR)$(
systemunitdir)
&& \
rm -f display-manager.service && \
rm -f display-manager.service && \
- $(LN_S)
$(systemunitdir)/
xdm.service display-manager.service )
- ( cd $(DESTDIR)$(
pkgsysconfdir)/system
/graphical.target.wants && \
- rm -f
xdm
.service && \
- $(LN_S) $(systemunitdir)/
xdm.service xdm
.service )
+ $(LN_S) xdm.service display-manager.service )
+ ( cd $(DESTDIR)$(
systemunitdir)
/graphical.target.wants && \
+ rm -f
display-manager
.service && \
+ $(LN_S) $(systemunitdir)/
display-manager.service display-manager
.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
$(MKDIR_P) -m 0755 \
endif
if TARGET_DEBIAN_OR_UBUNTU
$(MKDIR_P) -m 0755 \
@@
-1246,5
+1253,3
@@
git-tag:
fedora: install
rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
fedora: install
rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
- sed -i -e 's/^#MountAuto=yes$$/MountAuto=no/' \
- -e 's/^#SwapAuto=yes$$/SwapAuto=no/' $(DESTDIR)/etc/systemd/system.conf