[systemd-commits] 2 commits - .gitignore Makefile.am src/core src/system-update-generator units/system-update.target
Lennart Poettering
lennart at kemper.freedesktop.org
Tue May 22 10:50:16 PDT 2012
.gitignore | 1
Makefile.am | 14 ++
src/core/mount.c | 21 ----
src/system-update-generator/Makefile | 1
src/system-update-generator/system-update-generator.c | 86 ++++++++++++++++++
units/system-update.target | 16 +++
6 files changed, 116 insertions(+), 23 deletions(-)
New commits:
commit 399c5f96331ad5281fdb75a7c0c66cc703f7eeb6
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue May 22 19:50:10 2012 +0200
mount: drop unused function
diff --git a/src/core/mount.c b/src/core/mount.c
index e8f8856..11ac692 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1451,27 +1451,6 @@ fail:
return r;
}
-static int mount_find_pri(char *options) {
- char *end, *pri;
- unsigned long r;
-
- if (!(pri = mount_test_option(options, "pri")))
- return 0;
-
- pri += 4;
-
- errno = 0;
- r = strtoul(pri, &end, 10);
-
- if (errno != 0)
- return -errno;
-
- if (end == pri || (*end != ',' && *end != 0))
- return -EINVAL;
-
- return (int) r;
-}
-
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
int r = 0;
unsigned i;
diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 0cfccfb..30fdbc3 100644
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -27,6 +27,11 @@
#include "unit-name.h"
#include "path-util.h"
+/*
+ * Implements the logic described in
+ * http://freedesktop.org/wiki/Software/systemd/SystemUpdates
+ */
+
static const char *arg_dest = "/tmp";
static int generate_symlink(void) {
commit d360705f0f1262d49cccb6507abeafb7cfb5bbe0
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue May 22 19:48:51 2012 +0200
system-update: add system update generator
http://freedesktop.org/wiki/Software/systemd/SystemUpdates
diff --git a/.gitignore b/.gitignore
index e8d2fea..e97b1c7 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 08f8bfc..d5cf309 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 at .service \
@@ -1144,6 +1146,14 @@ systemd_fstab_generator_LDADD = \
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 0000000..d0b0e8e
--- /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 0000000..0cfccfb
--- /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 <http://www.gnu.org/licenses/>.
+***/
+
+#include <errno.h>
+#include <unistd.h>
+
+#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 0000000..5f63879
--- /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
More information about the systemd-commits
mailing list