[systemd-commits] 3 commits - Makefile.am man/crypttab.xml man/systemd-cryptsetup-generator.xml man/systemd-cryptsetup at .service.xml man/systemd-getty-generator.xml src/delta src/shared
Lennart Poettering
lennart at kemper.freedesktop.org
Wed Jun 27 06:03:16 PDT 2012
Makefile.am | 4
man/crypttab.xml | 5 +
man/systemd-cryptsetup-generator.xml | 146 +++++++++++++++++++++++++++++++++++
man/systemd-cryptsetup at .service.xml | 14 ++-
man/systemd-getty-generator.xml | 90 +++++++++++++++++++++
src/delta/delta.c | 4
src/shared/install.c | 14 +--
7 files changed, 264 insertions(+), 13 deletions(-)
New commits:
commit f220d83cbc63678c765dd0b80983f17b1d5e615b
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jun 27 15:03:02 2012 +0200
man: document getty-generator
diff --git a/Makefile.am b/Makefile.am
index fb2fdfa..acbdeed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -497,7 +497,8 @@ MANPAGES = \
man/systemd-fsck at .service.8 \
man/systemd-ask-password-console.service.8 \
man/systemd-analyze.1 \
- man/systemd-tty-ask-password-agent.1
+ man/systemd-tty-ask-password-agent.1 \
+ man/systemd-getty-generator.8
MANPAGES_ALIAS = \
man/reboot.8 \
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 17e0ed9..dfe55c7 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -42,11 +42,11 @@
<refnamediv>
<refname>systemd-cryptsetup-generator</refname>
- <refpurpose>Unit generated for <filename>/etc/crypttab</filename></refpurpose>
+ <refpurpose>Unit generator for <filename>/etc/crypttab</filename></refpurpose>
</refnamediv>
<refsynopsisdiv>
- <para><filename>/usr/lib/systemd/systemd-cryptsetup</filename></para>
+ <para><filename>/usr/lib/systemd/system-generators/systemd-cryptsetup-generator</filename></para>
</refsynopsisdiv>
<refsect1>
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
new file mode 100644
index 0000000..4c6a247
--- /dev/null
+++ b/man/systemd-getty-generator.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ 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.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+<refentry id="systemd-getty-generator">
+
+ <refentryinfo>
+ <title>systemd-getty-generator</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-getty-generator</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-getty-generator</refname>
+ <refpurpose>Generator for enabling getty instances on
+ the console</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>/usr/lib/systemd/system-generators/systemd-getty-generator</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-getty-generator</filename> is
+ a generator that automatically instantiates
+ <filename>serial-getty at .service</filename> on the
+ kernel console <filename>/dev/console</filename> if
+ that is not directed to the virtual console
+ subsystem. It will also instantiate
+ <filename>serial-getty at .service</filename> instances
+ for virtualizer consoles, if execution in a
+ virtualized environment is detected. This should
+ ensure that the user is shown a login prompt at the
+ right place, regardless in which environment the
+ system is started. For example, it is sufficient to
+ redirect the kernel console with a kernel command line
+ argument such as <varname>console=</varname> to get
+ both kernel messages and a getty prompt on a serial
+ TTY. See <ulink
+ url="https://www.kernel.org/doc/Documentation/kernel-parameters.txt"><filename>kernel-parameters.txt</filename></ulink>
+ for more information on the
+ <varname>console=</varname> kernel parameter.</para>
+
+ <para><filename>systemd-getty-generator</filename>
+ implements the <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/Generator">generator
+ specification</ulink>.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>agetty</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
commit 8e129f5156569e1bc858b002ca54cd447c38f4f1
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jun 27 14:51:47 2012 +0200
man: document systemd-cryptsetup-generator
diff --git a/Makefile.am b/Makefile.am
index 55d7e39..fb2fdfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2611,6 +2611,7 @@ INSTALL_DATA_HOOKS += \
MANPAGES += \
man/systemd-cryptsetup at .service.8 \
+ man/systemd-cryptsetup-generator.8 \
man/crypttab.5
MANPAGES_ALIAS += \
diff --git a/man/crypttab.xml b/man/crypttab.xml
index d61ec95..f3bde71 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -255,6 +255,10 @@
</varlistentry>
</variablelist>
+ <para>At early boot and when the system manager
+ configuration is reloaded this file is translated into
+ native systemd units
+ by <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</refsect1>
<refsect1>
@@ -275,6 +279,7 @@ swap /dev/sda7 /dev/urandom swap</programlisting>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-cryptsetup at .service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
new file mode 100644
index 0000000..17e0ed9
--- /dev/null
+++ b/man/systemd-cryptsetup-generator.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ 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.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+<refentry id="systemd-cryptsetup-generator">
+
+ <refentryinfo>
+ <title>systemd-cryptsetup-generator</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-cryptsetup-generator</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-cryptsetup-generator</refname>
+ <refpurpose>Unit generated for <filename>/etc/crypttab</filename></refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>/usr/lib/systemd/systemd-cryptsetup</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-cryptsetup-generator</filename>
+ is a generator that translates
+ <filename>/etc/crypttab</filename> into native systemd
+ units early at boot and when configuration of the
+ system manager is reloaded. This will create
+ <citerefentry><refentrytitle>systemd-cryptsetup at .service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ units as necessary.</para>
+
+ <para><filename>systemd-cryptsetup-generator</filename>
+ implements the <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/Generator">generator
+ specification</ulink>.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Kernel Command Line</title>
+
+ <para><filename>systemd-cryptsetup-generator</filename> understands
+ the following kernel command line parameters:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term><varname>luks=</varname></term>
+ <term><varname>rd.luks=</varname></term>
+
+ <listitem><para>Takes a boolean
+ argument. Defaults to
+ <literal>yes</literal>. If
+ <literal>no</literal> disables the
+ generator
+ entirely. <varname>rd.luks=</varname>
+ is honoured only be initial RAM disk
+ (initrd) while
+ <varname>luks=</varname> is honoured
+ by both the main system and the
+ initrd. </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>luks.crypttab=</varname></term>
+ <term><varname>rd.luks.crypttab=</varname></term>
+
+ <listitem><para>Takes a boolean
+ argument. Defaults to
+ <literal>yes</literal>. If
+ <literal>no</literal> causes the
+ generator to ignore any devices
+ configured in
+ <filename>/etc/crypttab</filename>
+ (<varname>luks.uuid=</varname> will
+ still work
+ however). <varname>rd.luks.crypttab=</varname>
+ is honoured only be initial RAM disk
+ (initrd) while
+ <varname>luks.crypttab=</varname> is
+ honoured by both the main system and
+ the initrd. </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>luks.uuid=</varname></term>
+ <term><varname>rd.luks.uuid=</varname></term>
+
+ <listitem><para>Takes a LUKS super
+ block UUID as argument. This will
+ activate the specified device as part
+ of the boot process as if it was
+ listed in
+ <filename>/etc/fstab</filename>. This
+ option may be specified more than once
+ in order to set up multiple
+ devices. <varname>rd.luks.uuid=</varname>
+ is honoured only be initial RAM disk
+ (initrd) while
+ <varname>luks.uuid=</varname> is
+ honoured by both the main system and
+ the initrd.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-cryptsetup at .service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/man/systemd-cryptsetup at .service.xml b/man/systemd-cryptsetup at .service.xml
index 6e021d8..abbb9d7 100644
--- a/man/systemd-cryptsetup at .service.xml
+++ b/man/systemd-cryptsetup at .service.xml
@@ -65,15 +65,23 @@
password agent logic</ulink>, in order to query the
user for the password using the right mechanism at
boot and during runtime.</para>
+
+ <para>At early boot and when the system manager
+ configuration is reloaded this
+ <filename>/etc/crypttab</filename> is translated into
+ <filename>systemd-cryptsetup at .service</filename> units
+ by
+ <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</refsect1>
<refsect1>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- </para>
+ <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ </para>
</refsect1>
</refentry>
commit a7480dbad22cfb3d34c9bef5af562d3ff9e0227e
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Jun 27 14:34:24 2012 +0200
core: rename system.preset to system-presets to follow naming scheme of other dirs in /usr/lib/systemd/
Thankfully nobody is using this yet, and presets aren't documented yet,
hence take the liberty to rename this.
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 4694fc8..01c6335 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -453,8 +453,8 @@ int main(int argc, char *argv[]) {
"binfmt.d\0"
"systemd/system\0"
"systemd/user\0"
- "systemd/system.preset\0"
- "systemd/user.preset\0"
+ "systemd/system-preset\0"
+ "systemd/user-preset\0"
"udev/rules.d\0"
"modprobe.d\0";
diff --git a/src/shared/install.c b/src/shared/install.c
index 718ec52..13ae9a9 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1683,18 +1683,18 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
if (scope == UNIT_FILE_SYSTEM)
r = conf_files_list(&files, ".preset",
- "/etc/systemd/system.preset",
- "/usr/local/lib/systemd/system.preset",
- "/usr/lib/systemd/system.preset",
+ "/etc/systemd/system-preset",
+ "/usr/local/lib/systemd/system-preset",
+ "/usr/lib/systemd/system-preset",
#ifdef HAVE_SPLIT_USR
- "/lib/systemd/system.preset",
+ "/lib/systemd/system-preset",
#endif
NULL);
else if (scope == UNIT_FILE_GLOBAL)
r = conf_files_list(&files, ".preset",
- "/etc/systemd/user.preset",
- "/usr/local/lib/systemd/user.preset",
- "/usr/lib/systemd/user.preset",
+ "/etc/systemd/user-preset",
+ "/usr/local/lib/systemd/user-preset",
+ "/usr/lib/systemd/user-preset",
NULL);
else
return 1;
More information about the systemd-commits
mailing list