From de98d9505cd1f2b7f508088efe68cb0a95f8ef88 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2016 03:19:59 -0400 Subject: oops --- src/systemd-remount-fs/remount-fs.c | 48 ++++++------- .../systemd-remount-fs.service.in | 8 +-- .../systemd-remount-fs.service.xml | 84 +++++++++++----------- 3 files changed, 70 insertions(+), 70 deletions(-) (limited to 'src/systemd-remount-fs') diff --git a/src/systemd-remount-fs/remount-fs.c b/src/systemd-remount-fs/remount-fs.c index cae9248477..116c370ef7 100644 --- a/src/systemd-remount-fs/remount-fs.c +++ b/src/systemd-remount-fs/remount-fs.c @@ -3,7 +3,7 @@ Copyright 2010 Lennart Poettering - systemd is free software; you can redistribute it anor modify it + 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. @@ -14,31 +14,31 @@ 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 . -** + along with systemd; If not, see . +***/ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include "systemd-basiexit-status.h" -#include "systemd-basilog.h" -#include "systemd-basimount-util.h" -#include "systemd-basipath-util.h" -#include "systemd-basiprocess-util.h" -#include "systemd-basisignal-util.h" -#include "systemd-basistrv.h" -#include "systemd-basiutil.h" +#include "basic/exit-status.h" +#include "basic/log.h" +#include "basic/mount-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/strv.h" +#include "basic/util.h" #include "mount-setup.h" -/* Goes throughetc/fstab and remounts all API file systems, applying - * options that are inetc/fstab that systemd might not have - * respected +/* Goes through /etc/fstab and remounts all API file systems, applying + * options that are in /etc/fstab that systemd might not have + * respected */ int main(int argc, char *argv[]) { _cleanup_hashmap_free_free_ Hashmap *pids = NULL; @@ -57,14 +57,14 @@ int main(int argc, char *argv[]) { umask(0022); - f = setmntent(etc/fstab", "r"); + f = setmntent("/etc/fstab", "r"); if (!f) { if (errno == ENOENT) { r = 0; goto finish; } - r = log_error_errno(errno, "Failed to openetc/fstab: %m"); + r = log_error_errno(errno, "Failed to open /etc/fstab: %m"); goto finish; } @@ -79,10 +79,10 @@ int main(int argc, char *argv[]) { int k; char *s; - * Remount the root fs, /usr and all API VFS */ + /* Remount the root fs, /usr and all API VFS */ if (!mount_point_is_api(me->mnt_dir) && - !path_equal(me->mnt_dir, ") && - !path_equal(me->mnt_dir, usr")) + !path_equal(me->mnt_dir, "/") && + !path_equal(me->mnt_dir, "/usr")) continue; log_debug("Remounting %s", me->mnt_dir); @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) { } if (pid == 0) { - * Child */ + /* Child */ (void) reset_all_signal_handlers(); (void) reset_signal_mask(); @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) { _exit(EXIT_FAILURE); } - * Parent */ + /* Parent */ s = strdup(me->mnt_dir); if (!s) { diff --git a/src/systemd-remount-fs/systemd-remount-fs.service.in b/src/systemd-remount-fs/systemd-remount-fs.service.in index ffc81b2691..8d9daacaa5 100644 --- a/src/systemd-remount-fs/systemd-remount-fs.service.in +++ b/src/systemd-remount-fs/systemd-remount-fs.service.in @@ -1,6 +1,6 @@ # This file is part of systemd. # -# systemd is free software; you can redistribute it anor modify it +# 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. @@ -8,15 +8,15 @@ [Unit] Description=Remount Root and Kernel File Systems Documentation=man:systemd-remount-fs.service(8) -Documentation=http/www.freedesktop.org/wiki/Software/systemd/APIFileSystems +Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no Conflicts=shutdown.target After=systemd-fsck-root.service Before=local-fs-pre.target local-fs.target shutdown.target Wants=local-fs-pre.target -ConditionPathExistsetc/fstab +ConditionPathExists=/etc/fstab [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@rootlibexecdirsystemd-remount-fs +ExecStart=@rootlibexecdir@/systemd-remount-fs diff --git a/src/systemd-remount-fs/systemd-remount-fs.service.xml b/src/systemd-remount-fs/systemd-remount-fs.service.xml index c2e9f0c721..176f2b2d20 100644 --- a/src/systemd-remount-fs/systemd-remount-fs.service.xml +++ b/src/systemd-remount-fs/systemd-remount-fs.service.xml @@ -1,12 +1,12 @@ - + - systemd-remount-fs.servicetitle> - <productname>systemdproductname> + <title>systemd-remount-fs.service + systemd - Developercontrib> - Lennartfirstname> - Poetteringsurname> - lennart@poettering.netemail> - author> - authorgroup> - refentryinfo> + Developer + Lennart + Poettering + lennart@poettering.net + + + - systemd-remount-fs.servicerefentrytitle> - 8manvolnum> - refmeta> + systemd-remount-fs.service + 8 + - systemd-remount-fs.servicerefname> - systemd-remount-fsrefname> - Remount root and kernel file systemsrefpurpose> - refnamediv> + systemd-remount-fs.service + systemd-remount-fs + Remount root and kernel file systems + - systemd-remount-fs.servicefilename> - - refsynopsisdiv> + systemd-remount-fs.service + /usr/lib/systemd/systemd-remount-fs + - Descriptiontitle> + <title>Description - systemd-remount-fs.servicefilename> is an + systemd-remount-fs.service is an early boot service that applies mount options listed in - fstabrefentrytitle>5 - to the root file system, the file system, + fstab5 + to the root file system, the /usr file system, and the kernel API file systems. This is required so that the mount options of these file systems — which are pre-mounted by the kernel, the initial RAM disk, container environments or system manager code — are updated to those listed in - . This service ignores normal file + /etc/fstab. This service ignores normal file systems and only changes the root file system (i.e. - ), /usr and the virtual - kernel API file systems such as , - or /dev. This - service executes no operation if + /), /usr and the virtual + kernel API file systems such as /proc, + /sys or /dev. This + service executes no operation if /etc/fstab does not exist or lists no entries for the mentioned file - systems.para> + systems. For a longer discussion of kernel API file systems see - API - File Systemsulink>. - refsect1> + API + File Systems. + - See Alsotitle> + <title>See Also - systemdrefentrytitle>1, - fstabrefentrytitle>5, - mountrefentrytitle>8 - para> - refsect1> + systemd1, + fstab5, + mount8 + + -refentry> + -- cgit v1.2.3-54-g00ecf