[systemd-commits] 2 commits - man/systemd-remount-fs.service.xml src/fstab-generator

[Zbigniew Jędrzejewski-Szmek]

 man/systemd-remount-fs.service.xml    |    6 +++---
 src/fstab-generator/fstab-generator.c |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 336b5c615e9c101476784b32df1b86aaeac96431
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat May 2 12:01:28 2015 -0500

    fstab-generator: fix memleak
    
    filtered was used to store an allocated string twice. The first allocation was
    thus lost. The string is not needed for anything, so simply skip the allocation.
    
    Fixup for deb0a77cf0b409141c4.

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index cb5112e..7aee335 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -154,13 +154,13 @@ static bool mount_in_initrd(struct mntent *me) {
                streq(me->mnt_dir, "/usr");
 }
 
-static int write_idle_timeout(FILE *f, const char *where, const char *opts, char **filtered) {
+static int write_idle_timeout(FILE *f, const char *where, const char *opts) {
         _cleanup_free_ char *timeout = NULL;
         char timespan[FORMAT_TIMESPAN_MAX];
         usec_t u;
         int r;
 
-        r = fstab_filter_options(opts, "x-systemd.idle-timeout\0", NULL, &timeout, filtered);
+        r = fstab_filter_options(opts, "x-systemd.idle-timeout\0", NULL, &timeout, NULL);
         if (r < 0)
                 return log_warning_errno(r, "Failed to parse options: %m");
         if (r == 0)
@@ -315,7 +315,7 @@ static int add_mount(
                         "Where=%s\n",
                         where);
 
-                r = write_idle_timeout(f, where, opts, &filtered);
+                r = write_idle_timeout(f, where, opts);
                 if (r < 0)
                         return r;
 

commit 35c0808fe05f9a90fc7d50cc4eb4e1a4e0d366fa
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat May 2 12:01:28 2015 -0500

    man: use utf-8 in systemd-remount-fs.service(8)

diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index 8e60e31..9bc07fc 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -57,11 +57,11 @@
     <para><filename>systemd-remount-fs.service</filename> is an
     early-boot service that applies mount options listed in
     <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    to the root file system, the <filename>/usr</filename> file system
+    to the root file system, the <filename>/usr</filename> 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
+    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
+    manager code — are updated to those listed in
     <filename>/etc/fstab</filename>. This service ignores normal file
     systems and only changes the root file system (i.e.
     <filename>/</filename>), <filename>/usr</filename> and the virtual