[systemd-devel] [PATCH] man: replace obsolete wiki link with man page
--- man/systemd-cryptsetup-generator.xml| 6 ++ man/systemd-debug-generator.xml | 6 ++ man/systemd-efi-boot-generator.xml | 4 +--- man/systemd-fstab-generator.xml | 6 ++ man/systemd-getty-generator.xml | 5 ++--- man/systemd-gpt-auto-generator.xml | 4 +--- man/systemd-system-update-generator.xml | 6 ++ man/systemd-sysv-generator.xml | 6 ++ man/systemd.unit.xml| 4 ++-- man/systemd.xml | 5 ++--- 10 files changed, 18 insertions(+), 34 deletions(-) diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml index 0e48e79..1974cd7 100644 --- a/man/systemd-cryptsetup-generator.xml +++ b/man/systemd-cryptsetup-generator.xml @@ -59,10 +59,8 @@ citerefentryrefentrytitlesystemd-cryptsetup@.service/refentrytitlemanvolnum8/manvolnum/citerefentry units as necessary./para -parafilenamesystemd-cryptsetup-generator/filename -implements the ulink -url=http://www.freedesktop.org/wiki/Software/systemd/Generators;generator -specification/ulink./para +parafilenamesystemd-cryptsetup-generator/filename implements + citerefentryrefentrytitlesystemd.generator/refentrytitlemanvolnum7/manvolnum/citerefentry./para /refsect1 refsect1 diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml index 74c3b26..5c5e9fc 100644 --- a/man/systemd-debug-generator.xml +++ b/man/systemd-debug-generator.xml @@ -79,10 +79,8 @@ citerefentryrefentrytitlesystemctl/refentrytitlemanvolnum1/manvolnum/citerefentry's commandenable/command command./para -parafilenamesystemd-debug-generator/filename implements the -ulink -url=http://www.freedesktop.org/wiki/Software/systemd/Generators;generator -specification/ulink./para +parafilenamesystemd-debug-generator/filename implements + citerefentryrefentrytitlesystemd.generator/refentrytitlemanvolnum7/manvolnum/citerefentry./para /refsect1 refsect1 diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml index d05d84a..91f8815 100644 --- a/man/systemd-efi-boot-generator.xml +++ b/man/systemd-efi-boot-generator.xml @@ -68,9 +68,7 @@ only be activated on-demand, when accessed./para parafilenamesystemd-efi-boot-generator/filename implements -the ulink -url=http://www.freedesktop.org/wiki/Software/systemd/Generators;generator -specification/ulink./para + citerefentryrefentrytitlesystemd.generator/refentrytitlemanvolnum7/manvolnum/citerefentry./para /refsect1 refsect1 diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml index 8f82e33..022efb4 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -71,10 +71,8 @@ for more information about special filename/etc/fstab/filename mount options this generator understands./para -parafilenamesystemd-fstab-generator/filename implements the -ulink -url=http://www.freedesktop.org/wiki/Software/systemd/Generators;generator -specification/ulink./para +parafilenamesystemd-fstab-generator/filename implements + citerefentryrefentrytitlesystemd.generator/refentrytitlemanvolnum7/manvolnum/citerefentry./para /refsect1 refsect1 diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml index 0b5b2f2..3389259 100644 --- a/man/systemd-getty-generator.xml +++ b/man/systemd-getty-generator.xml @@ -75,9 +75,8 @@ for more information on the varnameconsole=/varname kernel parameter./para -parafilenamesystemd-getty-generator/filename implements the -ulink url=http://www.freedesktop.org/wiki/Software/systemd/Generators;generator -specification/ulink./para +parafilenamesystemd-getty-generator/filename implements + citerefentryrefentrytitlesystemd.generator/refentrytitlemanvolnum7/manvolnum/citerefentry./para paraFurther information about configuration of gettys you may find in diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 9c706df..8d2eaca 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -157,9 +157,7 @@ using commandbtrfs subvolume set-default/command./para parafilenamesystemd-gpt-auto-generator/filename implements -the -ulink url=http://www.freedesktop.org/wiki/Software/systemd/Generators;Generator -Specification/ulink./para + citerefentryrefentrytitlesystemd.generator/refentrytitlemanvolnum7/manvolnum/citerefentry./para /refsect1 refsect1 diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml index 3eec1d7..e7fc95c 100644 --- a/man/systemd-system-update-generator.xml +++ b/man/systemd-system-update-generator.xml @@ -61,10 +61,8 @@ Updates Specification/ulink. /para -parafilenamesystemd-system-update-generator/filename -implements
[systemd-devel] [PATCH] man: systemd-bootchart - fix spacing in command
Use the same formatting as the systemd-analyze man page, so that man shows a space. --- man/systemd-bootchart.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml index d0adaad..1715d5d 100644 --- a/man/systemd-bootchart.xml +++ b/man/systemd-bootchart.xml @@ -78,8 +78,8 @@ in which order, and where possible problems exist in the startup sequence of the system. It is essentially a more detailed version of -the commandsystemd-analyze/command -commandplot/command function. +the commandsystemd-analyze plot/command +function. /para para Of course, bootchart can also be used at any -- 1.9.0 ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH] systemd: record efi timestamps after /sys is mounted
This partially reverts commit c3a170f3, which moved
efi_get_boot_timestamps too early in main(), before
/sys is assured to be mounted
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64371
---
src/core/main.c| 9 +
src/core/manager.c | 6 ++
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
index 7fc06be..bf1e3e8 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -69,7 +69,6 @@
#include ima-setup.h
#include fileio.h
#include smack-setup.h
-#include efivars.h
static enum {
ACTION_RUN,
@@ -1239,8 +1238,6 @@ int main(int argc, char *argv[]) {
dual_timestamp initrd_timestamp = { 0ULL, 0ULL };
dual_timestamp userspace_timestamp = { 0ULL, 0ULL };
dual_timestamp kernel_timestamp = { 0ULL, 0ULL };
-dual_timestamp firmware_timestamp = { 0ULL, 0ULL };
-dual_timestamp loader_timestamp = { 0ULL, 0ULL };
static char systemd[] = systemd;
bool skip_setup = false;
int j;
@@ -1289,9 +1286,7 @@ int main(int argc, char *argv[]) {
log_show_color(isatty(STDERR_FILENO) 0);
if (getpid() == 1 detect_container(NULL) = 0) {
-#ifdef ENABLE_EFI
-efi_get_boot_timestamps(userspace_timestamp,
firmware_timestamp, loader_timestamp);
-#endif
+
/* Running outside of a container as PID 1 */
arg_running_as = SYSTEMD_SYSTEM;
make_null_stdio();
@@ -1627,8 +1622,6 @@ int main(int argc, char *argv[]) {
m-shutdown_watchdog = arg_shutdown_watchdog;
m-userspace_timestamp = userspace_timestamp;
m-kernel_timestamp = kernel_timestamp;
-m-firmware_timestamp = firmware_timestamp;
-m-loader_timestamp = loader_timestamp;
m-initrd_timestamp = initrd_timestamp;
manager_set_default_rlimits(m, arg_default_rlimit);
diff --git a/src/core/manager.c b/src/core/manager.c
index 0508628..a7cfe57 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -70,6 +70,7 @@
#include cgroup-util.h
#include path-util.h
#include audit-fd.h
+#include efivars.h
#include env-util.h
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
@@ -439,6 +440,11 @@ int manager_new(SystemdRunningAs running_as, Manager **_m)
{
if (!m)
return -ENOMEM;
+#ifdef ENABLE_EFI
+if (detect_container(NULL) = 0)
+efi_get_boot_timestamps(m-userspace_timestamp,
m-firmware_timestamp, m-loader_timestamp);
+#endif
+
m-running_as = running_as;
m-name_data_slot = m-conn_data_slot = m-subscribed_data_slot = -1;
m-exit_code = _MANAGER_EXIT_CODE_INVALID;
--
1.8.2.3
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
