From d360705f0f1262d49cccb6507abeafb7cfb5bbe0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 22 May 2012 19:48:51 +0200 Subject: [PATCH 1/1] system-update: add system update generator http://freedesktop.org/wiki/Software/systemd/SystemUpdates --- .gitignore | 1 + Makefile.am | 14 +++- src/system-update-generator/Makefile | 1 + .../system-update-generator.c | 81 +++++++++++++++++++ units/system-update.target | 16 ++++ 5 files changed, 111 insertions(+), 2 deletions(-) create mode 120000 src/system-update-generator/Makefile create mode 100644 src/system-update-generator/system-update-generator.c create mode 100644 units/system-update.target diff --git a/.gitignore b/.gitignore index e8d2feae4..e97b1c7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/systemd-system-update-generator /systemd-fstab-generator /systemd-delta /systemd-sleep diff --git a/Makefile.am b/Makefile.am index 08f8bfc53..d5cf3095f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,7 +238,8 @@ rootlibexec_PROGRAMS = \ systemgenerator_PROGRAMS = \ systemd-getty-generator \ - systemd-fstab-generator + systemd-fstab-generator \ + systemd-system-update-generator dist_bashcompletion_DATA = \ bash-completion/systemd-bash-completion.sh @@ -306,7 +307,8 @@ dist_systemunit_DATA = \ units/syslog.target \ units/systemd-udev-control.socket \ units/systemd-udev-kernel.socket \ - units/systemd-timedated-ntp.target + units/systemd-timedated-ntp.target \ + units/system-update.target nodist_systemunit_DATA = \ units/getty@.service \ @@ -1143,6 +1145,14 @@ systemd_fstab_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_system_update_generator_SOURCES = \ + src/system-update-generator/system-update-generator.c + +systemd_system_update_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator/rc-local-generator.c diff --git a/src/system-update-generator/Makefile b/src/system-update-generator/Makefile new file mode 120000 index 000000000..d0b0e8e00 --- /dev/null +++ b/src/system-update-generator/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c new file mode 100644 index 000000000..0cfccfb49 --- /dev/null +++ b/src/system-update-generator/system-update-generator.c @@ -0,0 +1,81 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + 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 . +***/ + +#include +#include + +#include "log.h" +#include "util.h" +#include "unit-name.h" +#include "path-util.h" + +static const char *arg_dest = "/tmp"; + +static int generate_symlink(void) { + struct stat st; + char *p; + + if (lstat("/system-update", &st) < 0) { + if (errno == ENOENT) + return 0; + + log_error("Failed to check for system update: %m"); + return -EINVAL; + } + + p = strappend(arg_dest, "/default.target"); + if (!p) { + log_error("Out of memory."); + return -ENOMEM; + } + + if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) { + free(p); + log_error("Failed to create symlink: %m"); + return -errno; + } + + free(p); + + return 0; +} + +int main(int argc, char *argv[]) { + int r; + + if (argc > 2) { + log_error("This program takes one or no arguments."); + return EXIT_FAILURE; + } + + if (argc > 1) + arg_dest = argv[1]; + + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); + + umask(0022); + + r = generate_symlink(); + + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/units/system-update.target b/units/system-update.target new file mode 100644 index 000000000..5f638792d --- /dev/null +++ b/units/system-update.target @@ -0,0 +1,16 @@ +# This file is part of systemd. +# +# 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. + +[Unit] +Description=System Update +Documentation=http://freedesktop.org/wiki/Software/systemd/SystemUpdates +Documentation=man:systemd.special(7) +Requires=sysinit.target +Conflicts=shutdown.target +After=sysinit.target +Before=shutdown.target +AllowIsolate=yes -- 2.30.2