[systemd-commits] 4 commits - TODO src/fstab-generator units/container-getty at .service.m4.in

[Lennart Poettering]

 TODO                                  |    2 --
 src/fstab-generator/fstab-generator.c |   16 ++++++++++++++--
 units/container-getty at .service.m4.in  |    1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit eb5800026d5a6754514fb8f8a8561b49974fc879
Author: Michael Marineau <michael.marineau at coreos.com>
Date:   Mon Dec 8 11:05:31 2014 -0800

    fstab-generator: Allow mount.usr without mount.usrflags, honor rw/ro
    
    There is no need to require mount.usrflags. The original implementation
    assumed that a btrfs subvolume would always be needed but that is not
    applicable to systems that do not use btrfs for /usr.
    
    Similar to using rootflags= for the default of mount.usrflags=, append
    the classic 'ro' and 'rw' flags to the mount options.

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 568b02a..1f34594 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -476,7 +476,7 @@ static int add_usr_mount(void) {
                         return log_oom();
         }
 
-        if (!arg_usr_what || !arg_usr_options)
+        if (!arg_usr_what)
                 return 0;
 
         what = fstab_node_to_udev_node(arg_usr_what);
@@ -485,7 +485,13 @@ static int add_usr_mount(void) {
                 return -1;
         }
 
-        opts = arg_usr_options;
+        if (!arg_usr_options)
+                opts = arg_root_rw > 0 ? "rw" : "ro";
+        else if (!mount_test_option(arg_usr_options, "ro") &&
+                 !mount_test_option(arg_usr_options, "rw"))
+                opts = strappenda(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro");
+        else
+                opts = arg_usr_options;
 
         log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype));
         return add_mount(what,

commit 59cfa62f20f566b2c0279405b302e890812b3334
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Dec 9 02:22:44 2014 +0100

    fstab-generator: free all allocated strings

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index e8a21f7..568b02a 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -617,6 +617,12 @@ int main(int argc, char *argv[]) {
         }
 
         free(arg_root_what);
+        free(arg_root_fstype);
+        free(arg_root_options);
+
+        free(arg_usr_what);
+        free(arg_usr_fstype);
+        free(arg_usr_options);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }

commit 68ac53e62fadb87f1b33ccd9bff9c3f7f699c937
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Dec 9 02:12:11 2014 +0100

    units: make sure container-getty at .service stops restarting when the pts device it is bound to is gone
    
    We only want to restart the getty as long as the pts device is still
    around. As soon as it is gone, the service should be removed to.
    
    http://lists.freedesktop.org/archives/systemd-devel/2014-December/026048.html

diff --git a/units/container-getty at .service.m4.in b/units/container-getty at .service.m4.in
index 4f7794b..5120466 100644
--- a/units/container-getty at .service.m4.in
+++ b/units/container-getty at .service.m4.in
@@ -14,6 +14,7 @@ After=rc-local.service
 )m4_dnl
 Before=getty.target
 IgnoreOnIsolate=yes
+ConditionPathExists=/dev/pts/%I
 
 [Service]
 ExecStart=-/sbin/agetty --noclear --keep-baud pts/%I 115200,38400,9600 $TERM

commit 088c357d1337931104bbfdf9f8ead4a64dd6900d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Dec 9 02:05:19 2014 +0100

    update TODO

diff --git a/TODO b/TODO
index 37f375c..91b2ebb 100644
--- a/TODO
+++ b/TODO
@@ -4,8 +4,6 @@ Preparations for 218:
 
 * rhbz
 
-* fdobz
-
 * Backport: git notes
 
 Bugfixes: