dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 15:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add --root for systemd-update-done and other small fixups (#36803)

Browse Source
This commit is contained in:
Lennart Poettering
2025-03-20 18:19:17 +01:00
committed by GitHub
parent 0ffd176bf7 ace814f0a8
commit 112a9de6c4
2 changed files with 145 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
man/systemd-update-done.service.xml
View File

@@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-update-done.service">
<refentry id="systemd-update-done.service" xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>systemd-update-done.service</title>
@@ -18,7 +18,7 @@
<refnamediv>
<refname>systemd-update-done.service</refname>
<refname>systemd-update-done</refname>
<refpurpose>Mark <filename>/etc/</filename> and <filename>/var/</filename> fully updated</refpurpose>
<refpurpose>Mark <filename>/etc/</filename> and <filename>/var/</filename> as fully updated</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -37,12 +37,11 @@
<filename>/etc/</filename> or <filename>/var/</filename> on the
following boot.</para>
<para><filename>systemd-update-done.service</filename> updates the
file modification time (mtime) of the stamp files
<filename>/etc/.updated</filename> and
<filename>/var/.updated</filename> to the modification time of the
<filename>/usr/</filename> directory, unless the stamp files are
already newer.</para>
<para><filename>systemd-update-done.service</filename> updates the file modification time (mtime) stored
in and "on" the files <filename>/etc/.updated</filename> and <filename>/var/.updated</filename> to the
modification time of the <filename>/usr/</filename> directory, unless the stamp files are already newer.
(The timestamp is stored as the mtime field on the file, but also <emphasis>in</emphasis> the file
to support filesystems that do not store full timestamp precision.)</para>
<para>Services that shall run after offline upgrades of
<filename>/usr/</filename> should order themselves before
@@ -64,6 +63,25 @@
reboot where the kernel switch is not specified anymore.</para>
</refsect1>
<refsect1>
<title>Options</title>
<para>The following options are understood:</para>
<variablelist>
<varlistentry>
<term><option>--root=<replaceable>root</replaceable></option></term>
<listitem><para>Takes a directory path as an argument. The program
will operate on paths below the specified root directory.
</para>
<xi:include href="version-info.xml" xpointer="v258"/></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" />
</variablelist>
</refsect1>
<refsect1>
<title>See Also</title>
<para><simplelist type="inline">

141
src/update-done/update-done.c
View File

@@ -1,21 +1,28 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include "alloc-util.h"
#include "chase.h"
#include "fd-util.h"
#include "fileio.h"
#include "main-func.h"
#include "parse-argument.h"
#include "path-util.h"
#include "pretty-print.h"
#include "selinux-util.h"
#include "time-util.h"
#define MESSAGE \
"# This file was created by systemd-update-done. Its only\n" \
"# purpose is to hold a timestamp of the time this directory\n" \
"# was updated. See man:systemd-update-done.service(8).\n"
static char *arg_root = NULL;
static int apply_timestamp(const char *path, struct timespec *ts) {
_cleanup_free_ char *message = NULL;
STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
static int save_timestamp(const char *dir, struct timespec *ts) {
_cleanup_free_ char *message = NULL, *dirpath = NULL;
_cleanup_close_ int fd = -EBADF;
int r;
/*
@@ -23,37 +30,127 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
* to support filesystems which cannot store nanosecond-precision timestamps.
*/
fd = chase_and_open(dir, arg_root,
CHASE_PREFIX_ROOT | CHASE_WARN | CHASE_MUST_BE_DIRECTORY,
O_DIRECTORY | O_CLOEXEC | O_CREAT,
&dirpath);
if (fd < 0)
return log_error_errno(fd, "Failed to open %s%s: %m", strempty(arg_root), dir);
if (asprintf(&message,
MESSAGE
"# This file was created by systemd-update-done. The timestamp below is the\n"
"# modification time of /usr/ for which the most recent updates of %s have\n"
"# been applied. See man:systemd-update-done.service(8) for details.\n"
"TIMESTAMP_NSEC=" NSEC_FMT "\n",
dir,
timespec_load_nsec(ts)) < 0)
return log_oom();
r = write_string_file_full(AT_FDCWD, path, message, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_LABEL, ts, NULL);
if (r == -EROFS)
log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
r = write_string_file_full(fd, ".updated", message,
WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_LABEL,
ts, NULL);
if (r == -EROFS && !arg_root)
log_debug_errno(r, "Cannot create \"%s/.updated\", file system is read-only.", dirpath);
else if (r < 0)
return log_error_errno(r, "Failed to write \"%s\": %m", path);
return log_error_errno(r, "Failed to write \"%s/.updated\": %m", dirpath);
else
log_debug("%s/.updated updated to TIMESTAMP_NSEC="NSEC_FMT, dirpath, timespec_load_nsec(ts));
return 0;
}
int main(int argc, char *argv[]) {
static int help(void) {
_cleanup_free_ char *link = NULL;
int r;
r = terminal_urlify_man("systemd-update-done", "8", &link);
if (r < 0)
return log_oom();
printf("%1$s [OPTIONS...]\n\n"
"%5$sMark /etc/ and /var/ as fully updated.%6$s\n"
"\n%3$sOptions:%4$s\n"
" -h --help Show this help\n"
" --root=PATH Operate on root directory PATH\n"
"\nSee the %2$s for details.\n",
program_invocation_short_name,
link,
ansi_underline(),
ansi_normal(),
ansi_highlight(),
ansi_normal());
return 0;
}
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_ROOT = 0x100,
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "root", required_argument, NULL, ARG_ROOT },
{},
};
int r, c;
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
switch (c) {
case 'h':
return help();
case ARG_ROOT:
r = parse_path_argument(optarg, /* suppress_root= */ true, &arg_root);
if (r < 0)
return r;
break;
case '?':
return -EINVAL;
default:
assert_not_reached();
}
if (optind < argc)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments.");
return 1;
}
static int run(int argc, char *argv[]) {
struct stat st;
int r, q = 0;
int r;
r = parse_argv(argc, argv);
if (r <= 0)
return r;
log_setup();
if (stat("/usr", &st) < 0) {
log_error_errno(errno, "Failed to stat /usr: %m");
return EXIT_FAILURE;
}
r = chase_and_stat("/usr", arg_root,
CHASE_PREFIX_ROOT | CHASE_WARN | CHASE_MUST_BE_DIRECTORY,
/* ret_path = */ NULL,
&st);
if (r < 0)
return log_error_errno(r, "Failed to stat %s/usr/: %m", strempty(arg_root));
r = mac_init();
if (r < 0)
return EXIT_FAILURE;
return r;
r = apply_timestamp("/etc/.updated", &st.st_mtim);
q = apply_timestamp("/var/.updated", &st.st_mtim);
return r < 0 || q < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
r = 0;
RET_GATHER(r, save_timestamp("/etc/", &st.st_mtim));
RET_GATHER(r, save_timestamp("/var/", &st.st_mtim));
return r;
}
DEFINE_MAIN_FUNCTION(run);