[systemd-commits] 2 commits - .gitignore Makefile.am src/ac-power.c src/ac-power.h src/fsck.c src/quotacheck.c src/systemctl.c src/umount.c
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Oct 19 12:19:19 PDT 2010
.gitignore | 2
Makefile.am | 34 +++++++-
src/ac-power.c | 98 ++++++++++++++++++++++++
src/ac-power.h | 27 ++++++
src/fsck.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/quotacheck.c | 115 +++++++++++++++++++++++++++++
src/systemctl.c | 8 +-
src/umount.c | 1
8 files changed, 495 insertions(+), 8 deletions(-)
New commits:
commit 3d20ed6d51e38968cd646e2b3b24f36673408024
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Oct 19 21:19:12 2010 +0200
fsck: add initial version of fsck and quotacheck wrappers
diff --git a/.gitignore b/.gitignore
index 5cb935e..ad0f5f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+systemd-fsck
+systemd-quotacheck
systemd-user-sessions
systemd-shutdown
systemd-tmpfiles
diff --git a/Makefile.am b/Makefile.am
index 0311302..92b1e22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,7 +108,9 @@ rootlibexec_PROGRAMS = \
systemd-readahead-collect \
systemd-readahead-replay \
systemd-tmpfiles \
- systemd-user-sessions
+ systemd-user-sessions \
+ systemd-fsck \
+ systemd-quotacheck
noinst_PROGRAMS = \
test-engine \
@@ -662,7 +664,7 @@ systemd_modules_load_SOURCES = \
systemd_modules_load_CFLAGS = \
$(AM_CFLAGS)
-systemd_tmpfiles_LDADD = \
+systemd_modules_load_LDADD = \
libsystemd-basic.la
systemd_tmpfiles_SOURCES = \
@@ -671,7 +673,31 @@ systemd_tmpfiles_SOURCES = \
systemd_tmpfiles_CFLAGS = \
$(AM_CFLAGS)
-systemd_user_sessions_LDADD = \
+systemd_tmpfiles_LDADD = \
+ libsystemd-basic.la
+
+systemd_fsck_SOURCES = \
+ src/fsck.c \
+ src/ac-power.c \
+ src/dbus-common.c
+
+systemd_fsck_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(UDEV_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+systemd_fsck_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS) \
+ $(DBUS_LIBS)
+
+systemd_quotacheck_SOURCES = \
+ src/quotacheck.c
+
+systemd_quotacheck_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_quotacheck_LDADD = \
libsystemd-basic.la
systemd_user_sessions_SOURCES = \
@@ -681,7 +707,7 @@ systemd_user_sessions_SOURCES = \
systemd_user_sessions_CFLAGS = \
$(AM_CFLAGS)
-systemd_modules_load_LDADD = \
+systemd_user_sessions_LDADD = \
libsystemd-basic.la
systemd_vconsole_setup_SOURCES = \
diff --git a/src/ac-power.c b/src/ac-power.c
new file mode 100644
index 0000000..a30216f
--- /dev/null
+++ b/src/ac-power.c
@@ -0,0 +1,98 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <string.h>
+#include <libudev.h>
+
+#include "util.h"
+#include "ac-power.h"
+
+int on_ac_power(void) {
+ int r;
+
+ struct udev *udev;
+ struct udev_enumerate *e = NULL;
+ struct udev_list_entry *item = NULL, *first = NULL;
+ bool found_offline = false, found_online = false;
+
+ if (!(udev = udev_new())) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!(e = udev_enumerate_new(udev))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (udev_enumerate_add_match_subsystem(e, "power_supply") < 0) {
+ r = -EIO;
+ goto finish;
+ }
+
+ if (udev_enumerate_scan_devices(e) < 0) {
+ r = -EIO;
+ goto finish;
+ }
+
+ first = udev_enumerate_get_list_entry(e);
+ udev_list_entry_foreach(item, first) {
+ struct udev_device *d;
+ const char *type, *online;
+
+ if (!(d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!(type = udev_device_get_sysattr_value(d, "type")))
+ goto next;
+
+ if (!streq(type, "Mains"))
+ goto next;
+
+ if (!(online = udev_device_get_sysattr_value(d, "online")))
+ goto next;
+
+ if (streq(online, "1")) {
+ found_online = true;
+ break;
+ } else if (streq(online, "0"))
+ found_offline = true;
+
+ next:
+ udev_device_unref(d);
+ }
+
+ r = found_online || !found_offline;
+
+finish:
+ if (e)
+ udev_enumerate_unref(e);
+
+ if (udev)
+ udev_unref(udev);
+
+ return r;
+}
diff --git a/src/ac-power.h b/src/ac-power.h
new file mode 100644
index 0000000..24f28b5
--- /dev/null
+++ b/src/ac-power.h
@@ -0,0 +1,27 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef fooacpowerhfoo
+#define fooacpowerhfoo
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+int on_ac_power(void);
+
+#endif
diff --git a/src/fsck.c b/src/fsck.c
new file mode 100644
index 0000000..0b0cf64
--- /dev/null
+++ b/src/fsck.c
@@ -0,0 +1,218 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <dbus/dbus.h>
+
+#include "util.h"
+#include "ac-power.h"
+#include "dbus-common.h"
+#include "special.h"
+
+static bool arg_skip = false;
+static bool arg_force = false;
+
+static void start_target(const char *target, bool isolate) {
+ DBusMessage *m = NULL, *reply = NULL;
+ DBusError error;
+ const char *mode;
+ DBusConnection *bus = NULL;
+
+ assert(target);
+
+ dbus_error_init(&error);
+
+ if (bus_connect(DBUS_BUS_SYSTEM, &bus, NULL, &error) < 0) {
+ log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
+ goto finish;
+ }
+
+ if (isolate)
+ mode = "isolate";
+ else
+ mode = "replace";
+
+ log_debug("Running request %s/start/%s", target, mode);
+
+ if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) {
+ log_error("Could not allocate message.");
+ goto finish;
+ }
+
+ if (!dbus_message_append_args(m,
+ DBUS_TYPE_STRING, &target,
+ DBUS_TYPE_STRING, &mode,
+ DBUS_TYPE_INVALID)) {
+ log_error("Could not attach target and flag information to message.");
+ goto finish;
+ }
+
+ if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
+ log_error("Failed to start unit: %s", bus_error_message(&error));
+ goto finish;
+ }
+
+finish:
+ if (m)
+ dbus_message_unref(m);
+
+ if (reply)
+ dbus_message_unref(reply);
+
+ if (bus) {
+ dbus_connection_flush(bus);
+ dbus_connection_close(bus);
+ dbus_connection_unref(bus);
+ }
+
+ dbus_error_free(&error);
+}
+
+static int parse_proc_cmdline(void) {
+ char *line, *w, *state;
+ int r;
+ size_t l;
+
+ if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
+ log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ return 0;
+ }
+
+ FOREACH_WORD_QUOTED(w, l, line, state) {
+
+ if (strneq(w, "fsck.mode=auto", l))
+ arg_force = arg_skip = false;
+ else if (strneq(w, "fsck.mode=force", l))
+ arg_force = true;
+ else if (strneq(w, "fsck.mode=skip", l))
+ arg_skip = true;
+ else if (startswith(w, "fsck.mode"))
+ log_warning("Invalid fsck.mode= parameter. Ignoring.");
+#ifdef TARGET_FEDORA
+ else if (strneq(w, "fastboot", l))
+ arg_skip = true;
+ else if (strneq(w, "forcefsck", l))
+ arg_force = true;
+#endif
+ }
+
+ free(line);
+ return 0;
+}
+
+static void test_files(void) {
+ if (access("/fastboot", F_OK) >= 0)
+ arg_skip = true;
+
+ if (access("/forcefsck", F_OK) >= 0)
+ arg_force = true;
+}
+
+int main(int argc, char *argv[]) {
+ static const char * cmdline[7];
+ int i = 0, r = EXIT_FAILURE, q;
+ pid_t pid;
+ siginfo_t status;
+
+ if (argc != 2) {
+ log_error("This program expects exactly one argument.");
+ return EXIT_FAILURE;
+ }
+
+ log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ log_parse_environment();
+ log_open();
+
+ parse_proc_cmdline();
+ test_files();
+
+ if (!arg_force) {
+ if (arg_skip)
+ return 0;
+
+ /* FIXME: only execute necessary fsck's if no AC power present */
+ if (on_ac_power() == 0)
+ return 0;
+ }
+
+ cmdline[i++] = "/sbin/fsck";
+ cmdline[i++] = "-a";
+ cmdline[i++] = "-T";
+ cmdline[i++] = "-C";
+
+ if (arg_force)
+ cmdline[i++] = "-f";
+
+ cmdline[i++] = argv[1];
+ cmdline[i++] = NULL;
+
+ if ((pid = fork()) < 0) {
+ log_error("fork(): %m");
+ goto finish;
+ } else if (pid == 0) {
+ /* Child */
+ execv(cmdline[0], (char**) cmdline);
+ _exit(8); /* Operational error */
+ }
+
+ if ((q = wait_for_terminate(pid, &status)) < 0) {
+ log_error("waitid(): %s", strerror(-q));
+ goto finish;
+ }
+
+ if (status.si_code == CLD_KILLED ||
+ status.si_code == CLD_DUMPED) {
+ log_error("fsck terminated by signal %s.", signal_to_string(status.si_status));
+ goto finish;
+
+ } else if (status.si_code != CLD_EXITED) {
+ log_error("fsck failed due to unknown reason.");
+ goto finish;
+ }
+
+ if (status.si_status & ~1) {
+
+ if (access("/dev/.systemd/late-fsck", F_OK) >= 0) {
+ log_error("fsck failed with error code %i.", status.si_status);
+ goto finish;
+ }
+
+ if (status.si_status & 2)
+ /* System should be rebooted. */
+ start_target(SPECIAL_REBOOT_TARGET, false);
+ else
+ /* Some other problem */
+ start_target(SPECIAL_EMERGENCY_TARGET, true);
+
+ } else
+ r = EXIT_SUCCESS;
+
+ if (status.si_status & 1)
+ touch("/dev/.systemd/quotacheck");
+
+finish:
+ return r;
+}
diff --git a/src/quotacheck.c b/src/quotacheck.c
new file mode 100644
index 0000000..a579c5e
--- /dev/null
+++ b/src/quotacheck.c
@@ -0,0 +1,115 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include "util.h"
+
+static bool arg_skip = false;
+static bool arg_force = false;
+
+static int parse_proc_cmdline(void) {
+ char *line, *w, *state;
+ int r;
+ size_t l;
+
+ if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
+ log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ return 0;
+ }
+
+ FOREACH_WORD_QUOTED(w, l, line, state) {
+
+ if (strneq(w, "quotacheck.mode=auto", l))
+ arg_force = arg_skip = false;
+ else if (strneq(w, "quotacheck.mode=force", l))
+ arg_force = true;
+ else if (strneq(w, "quotacheck.mode=skip", l))
+ arg_skip = true;
+ else if (startswith(w, "quotacheck.mode"))
+ log_warning("Invalid quotacheck.mode= parameter. Ignoring.");
+#ifdef TARGET_FEDORA
+ else if (strneq(w, "forcequotacheck", l))
+ arg_force = true;
+#endif
+ }
+
+ free(line);
+ return 0;
+}
+
+static void test_files(void) {
+#ifdef TARGET_FEDORA
+ /* This exists only on Fedora */
+ if (access("/forcequoatcheck", F_OK) >= 0)
+ arg_force = true;
+#endif
+}
+
+int main(int argc, char *argv[]) {
+ static const char * const cmdline[] = {
+ "/sbin/quotacheck",
+ "-anug",
+ NULL
+ };
+
+ int r = EXIT_FAILURE;
+ pid_t pid;
+
+ if (argc > 1) {
+ log_error("This program takes no arguments.");
+ return EXIT_FAILURE;
+ }
+
+ log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ log_parse_environment();
+ log_open();
+
+ parse_proc_cmdline();
+ test_files();
+
+ if (!arg_force) {
+
+ if (arg_skip)
+ return 0;
+
+ if (access("/dev/.systemd/quotacheck", F_OK) < 0)
+ return 0;
+ }
+
+ if ((pid = fork()) < 0) {
+ log_error("fork(): %m");
+ goto finish;
+ } else if (pid == 0) {
+ /* Child */
+ execv(cmdline[0], (char**) cmdline);
+ _exit(1); /* Operational error */
+ }
+
+ r = wait_for_terminate_and_warn("quotacheck", pid) >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+
+finish:
+ return r;
+}
diff --git a/src/umount.c b/src/umount.c
index c7f6208..ca4dbc2 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -223,7 +223,6 @@ static int loopback_list_get(MountPoint **head) {
}
first = udev_enumerate_get_list_entry(e);
-
udev_list_entry_foreach(item, first) {
MountPoint *lb;
struct udev_device *d;
commit 688c6725017bf9b8b229bfc5823121858925c035
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Oct 19 19:43:44 2010 +0200
systemctl: fix counting in list-units output
https://bugzilla.redhat.com/show_bug.cgi?id=643502
diff --git a/src/systemctl.c b/src/systemctl.c
index 555c171..a037690 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -265,7 +265,7 @@ static bool output_show_job(const struct unit_info *u) {
}
static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
- unsigned active_len, sub_len, job_len;
+ unsigned active_len, sub_len, job_len, n_shown = 0;
const struct unit_info *u;
active_len = sizeof("ACTIVE")-1;
@@ -300,6 +300,8 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
if (!output_show_job(u))
continue;
+ n_shown++;
+
if (!streq(u->load_state, "loaded") &&
!streq(u->load_state, "banned")) {
on_loaded = ansi_highlight(true);
@@ -352,9 +354,9 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
"JOB = Pending job for the unit.\n");
if (arg_all)
- printf("\n%u units listed.\n", c);
+ printf("\n%u units listed.\n", n_shown);
else
- printf("\n%u units listed. Pass --all to see inactive units, too.\n", c);
+ printf("\n%u units listed. Pass --all to see inactive units, too.\n", n_shown);
}
}
More information about the systemd-commits
mailing list