morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

update-done: adjust comments

Browse Source 
The man page was right, but the comment in the generated file was wrong. The
timestamp is *not* the timestamp when the update is being done. While at it,
say to what directory the message applies. This makes it easier for a casual
reader to figure out what is happening.

Also rename the function to better reflect what it does.

Inspired by https://github.com/systemd/systemd/issues/36045.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-03-19 16:18:27 +01:00
parent 511bf79b4e
commit 04db1a6aec
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -6,16 +6,12 @@
#include "alloc-util.h"
#include "fileio.h"
#include "path-util.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 int apply_timestamp(const char *path, struct timespec *ts) {
_cleanup_free_ char *message = NULL;
static int save_timestamp(const char *dir, struct timespec *ts) {
_cleanup_free_ char *message = NULL, *path = NULL;
int r;
/*
@@ -23,9 +19,16 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
* to support filesystems which cannot store nanosecond-precision timestamps.
*/
path = path_join(dir, ".updated");
if (!path)
return log_oom();
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();
@@ -52,8 +55,8 @@ int main(int argc, char *argv[]) {
if (r < 0)
return EXIT_FAILURE;
r = apply_timestamp("/etc/.updated", &st.st_mtim);
q = apply_timestamp("/var/.updated", &st.st_mtim);
r = save_timestamp("/etc/", &st.st_mtim);
q = save_timestamp("/var/", &st.st_mtim);
return r < 0 || q < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}