[gentoo-commits] proj/gentoo-systemd-integration:master commit in: system-preset/, /

[gentoo-commits] proj/gentoo-systemd-integration:master commit in: system-preset/, /

[Mike Gilbert]

commit:     4250e383fe8c8ff946a709e23f90ea5deced3297
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 18:28:31 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 18:28:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-systemd-integration.git/commit/?id=4250e383

Install a system-preset to disable services by default

Bug: https://bugs.gentoo.org/578386

 Makefile.am                     | 2 ++
 configure.ac                    | 5 +++++
 system-preset/99-default.preset | 1 +
 3 files changed, 8 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 3a3d585..c0bbe5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,8 @@ dist_tmpfiles_DATA = \
 dist_systemdsystemunit_DATA = \
 	mounts/var-lock.mount \
 	mounts/var-run.mount
+dist_systemdsystempreset_DATA = \
+	system-preset/99-default.preset
 dist_systemdsystemgenerator_SCRIPTS = \
 	system-generators/gentoo-local-generator
 

diff --git a/configure.ac b/configure.ac
index abcd3a2..d8d6b2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,11 @@ if test -z "$systemdsystemgeneratordir"; then
 	AC_MSG_ERROR([systemdsystemgeneratordir must be set])
 fi
 
+SYSTEMD_SYSTEMPRESETDIR
+if test -z "$systemdsystempresetdir"; then
+	AC_MSG_ERROR([systemdsystempresetdir must be set])
+fi
+
 PKG_CHECK_VAR([udevdir], [udev], [udevdir], [], [udevdir=/lib/udev])
 
 AC_CONFIG_FILES([Makefile])

diff --git a/system-preset/99-default.preset b/system-preset/99-default.preset
new file mode 100644
index 0000000..1f29b50
--- /dev/null
+++ b/system-preset/99-default.preset
@@ -0,0 +1 @@
+disable *