Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-systemd-integration:master commit in: system-preset/, /
Date: Sun, 27 Mar 2016 18:30:13
Message-Id: 1459103311.4250e383fe8c8ff946a709e23f90ea5deced3297.floppym@gentoo
1 commit: 4250e383fe8c8ff946a709e23f90ea5deced3297
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 18:28:31 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 18:28:31 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-systemd-integration.git/commit/?id=4250e383
7
8 Install a system-preset to disable services by default
9
10 Bug: https://bugs.gentoo.org/578386
11
12 Makefile.am | 2 ++
13 configure.ac | 5 +++++
14 system-preset/99-default.preset | 1 +
15 3 files changed, 8 insertions(+)
16
17 diff --git a/Makefile.am b/Makefile.am
18 index 3a3d585..c0bbe5e 100644
19 --- a/Makefile.am
20 +++ b/Makefile.am
21 @@ -11,6 +11,8 @@ dist_tmpfiles_DATA = \
22 dist_systemdsystemunit_DATA = \
23 mounts/var-lock.mount \
24 mounts/var-run.mount
25 +dist_systemdsystempreset_DATA = \
26 + system-preset/99-default.preset
27 dist_systemdsystemgenerator_SCRIPTS = \
28 system-generators/gentoo-local-generator
29
30
31 diff --git a/configure.ac b/configure.ac
32 index abcd3a2..d8d6b2a 100644
33 --- a/configure.ac
34 +++ b/configure.ac
35 @@ -19,6 +19,11 @@ if test -z "$systemdsystemgeneratordir"; then
36 AC_MSG_ERROR([systemdsystemgeneratordir must be set])
37 fi
38
39 +SYSTEMD_SYSTEMPRESETDIR
40 +if test -z "$systemdsystempresetdir"; then
41 + AC_MSG_ERROR([systemdsystempresetdir must be set])
42 +fi
43 +
44 PKG_CHECK_VAR([udevdir], [udev], [udevdir], [], [udevdir=/lib/udev])
45
46 AC_CONFIG_FILES([Makefile])
47
48 diff --git a/system-preset/99-default.preset b/system-preset/99-default.preset
49 new file mode 100644
50 index 0000000..1f29b50
51 --- /dev/null
52 +++ b/system-preset/99-default.preset
53 @@ -0,0 +1 @@
54 +disable *