diff options
| -rw-r--r-- | src/grp-journal/90-journald.preset | 10 | ||||
| -rw-r--r-- | src/grp-journal/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-network/90-networkd.preset | 10 | ||||
| -rw-r--r-- | src/grp-network/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-resolve/90-resolved.preset | 8 | ||||
| -rw-r--r-- | src/grp-resolve/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-system/90-systemd.preset (renamed from src/grp-system/system-preset/90-systemd.preset) | 8 | ||||
| -rw-r--r-- | src/grp-system/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-system/systemctl/systemd.preset.xml (renamed from src/grp-system/systemd/systemd.preset.xml) | 0 | ||||
| -rw-r--r-- | src/systemd-timesyncd/90-timesyncd.preset | 8 | ||||
| -rw-r--r-- | src/systemd-timesyncd/Makefile | 3 |
11 files changed, 51 insertions, 8 deletions
diff --git a/src/grp-journal/90-journald.preset b/src/grp-journal/90-journald.preset new file mode 100644 index 0000000000..6a8c17b1fa --- /dev/null +++ b/src/grp-journal/90-journald.preset @@ -0,0 +1,10 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +disable syslog.socket + +disable systemd-journal-gatewayd.* diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index 25e34bda4b..f42ecedcc8 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -185,4 +185,7 @@ endif # HAVE_SYSV_COMPAT EXTRA_DIST += \ docs/var-log/README.in +dist_systempreset_DATA = \ + 90-journald.preset + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-network/90-networkd.preset b/src/grp-network/90-networkd.preset new file mode 100644 index 0000000000..a053f7a4b1 --- /dev/null +++ b/src/grp-network/90-networkd.preset @@ -0,0 +1,10 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +enable systemd-networkd.service + +disable systemd-networkd-wait-online.service diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile index e819a376d7..7502fcbdde 100644 --- a/src/grp-network/Makefile +++ b/src/grp-network/Makefile @@ -73,6 +73,9 @@ gperf_gperf_sources += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf +dist_systempreset_DATA = \ + 90-networkd.preset + nested.subdirs += libnetworkd-core nested.subdirs += networkctl nested.subdirs += systemd-networkd diff --git a/src/grp-resolve/90-resolved.preset b/src/grp-resolve/90-resolved.preset new file mode 100644 index 0000000000..6033cd7ccc --- /dev/null +++ b/src/grp-resolve/90-resolved.preset @@ -0,0 +1,8 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +enable systemd-resolved.service diff --git a/src/grp-resolve/Makefile b/src/grp-resolve/Makefile index 7969cc1298..849af75af5 100644 --- a/src/grp-resolve/Makefile +++ b/src/grp-resolve/Makefile @@ -23,6 +23,9 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +dist_systempreset_DATA = \ + 90-resolved.preset + nested.subdirs += libbasic-dns nested.subdirs += systemd-resolved systemd-resolve nss-resolve diff --git a/src/grp-system/system-preset/90-systemd.preset b/src/grp-system/90-systemd.preset index ee1b864bcf..138937011c 100644 --- a/src/grp-system/system-preset/90-systemd.preset +++ b/src/grp-system/90-systemd.preset @@ -12,9 +12,6 @@ enable remote-fs.target enable machines.target enable getty@.service -enable systemd-timesyncd.service -enable systemd-networkd.service -enable systemd-resolved.service disable console-getty.service disable console-shell.service @@ -25,8 +22,3 @@ disable kexec.target disable poweroff.target disable reboot.target disable rescue.target - -disable syslog.socket - -disable systemd-journal-gatewayd.* -disable systemd-networkd-wait-online.service diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile index e031e2814f..d97f45afcd 100644 --- a/src/grp-system/Makefile +++ b/src/grp-system/Makefile @@ -23,6 +23,9 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +dist_systempreset_DATA = \ + 90-systemd.preset + nested.subdirs += systemctl systemd systemd-shutdown nested.subdirs += libcore nested.subdirs += grp-utils diff --git a/src/grp-system/systemd/systemd.preset.xml b/src/grp-system/systemctl/systemd.preset.xml index b7164014f0..b7164014f0 100644 --- a/src/grp-system/systemd/systemd.preset.xml +++ b/src/grp-system/systemctl/systemd.preset.xml diff --git a/src/systemd-timesyncd/90-timesyncd.preset b/src/systemd-timesyncd/90-timesyncd.preset new file mode 100644 index 0000000000..d40b418358 --- /dev/null +++ b/src/systemd-timesyncd/90-timesyncd.preset @@ -0,0 +1,8 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +enable systemd-timesyncd.service diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile index 2b81fe74fd..511c86ba82 100644 --- a/src/systemd-timesyncd/Makefile +++ b/src/systemd-timesyncd/Makefile @@ -61,6 +61,9 @@ EXTRA_DIST += \ units/systemd-timesyncd.service.in \ src/timesync/timesyncd.conf.in +dist_systempreset_DATA = \ + 90-timesyncd.preset + sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk |