[systemd-commits] 4 commits - man/kernel-command-line.xml shell-completion/bash shell-completion/zsh src/core

[Zbigniew Jędrzejewski-Szmek]

 man/kernel-command-line.xml        |    2 +-
 shell-completion/bash/systemctl.in |    2 +-
 shell-completion/zsh/_systemctl.in |    5 +++++
 src/core/automount.c               |    3 ++-
 src/core/load-fragment.c           |    2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit a40e26f392239322492623187d1e9a97908fcf83
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Apr 8 08:50:35 2015 -0400

    Indentation

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index e61418d..b901d0d 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -570,7 +570,7 @@ int config_parse_exec(
                                         }
                                 }
                         } else if (strneq(word, ";", MAX(l, 1U)))
-                                        goto found;
+                                goto found;
 
                         k++;
                 }

commit d6a12e7ca3a17ce0224fd6c95d827e4f97fe2c9a
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Apr 3 08:28:21 2015 -0400

    man: remove 'fs' from 'rootfsflags'
    
    rootfsflags does not appear anywhere else.

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 919bd13..eb73727 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -295,7 +295,7 @@
       <varlistentry>
         <term><varname>root=</varname></term>
         <term><varname>rootfstype=</varname></term>
-        <term><varname>rootfsflags=</varname></term>
+        <term><varname>rootflags=</varname></term>
         <term><varname>ro</varname></term>
         <term><varname>rw</varname></term>
 

commit 50b03c8ea1248f2d35a9042a3fa959adc0ceb819
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Apr 2 22:58:39 2015 -0400

    core/automount: beef up error message
    
    This should not happen... but when it does more information is nice.

diff --git a/src/core/automount.c b/src/core/automount.c
index 33a16e1..f6a6ad5 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -729,7 +729,8 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
         assert(fd == a->pipe_fd);
 
         if (events != EPOLLIN) {
-                log_unit_error(UNIT(a)->id, "Got invalid poll event on pipe.");
+                log_unit_error(UNIT(a)->id, "%s: got invalid poll event %"PRIu32" on pipe (fd=%d)",
+                               UNIT(a)->id, events, fd);
                 goto fail;
         }
 

commit 7b742b3130941b5c8d5e178b6694428fb3b61086
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Apr 2 22:54:35 2015 -0400

    shell-completion: systemctl switch-root verb
    
    The completion is rudimentary (all files). I think this is OK since
    this is used so rarely. But not having it proposed at all is annoying.

diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
index 773a59d..34c9444 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -160,7 +160,7 @@ _systemctl () {
                              reboot rescue show-environment suspend get-default
                              is-system-running'
                      [NAME]='snapshot'
-                     [FILE]='link'
+                     [FILE]='link switch-root'
                   [TARGETS]='set-default'
         )
 
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
index 3bbfb6f..cce9dea 100644
--- a/shell-completion/zsh/_systemctl.in
+++ b/shell-completion/zsh/_systemctl.in
@@ -59,6 +59,7 @@
     "reboot:Shut down and reboot the system"
     "kexec:Shut down and reboot the system with kexec"
     "exit:Ask for user instance termination"
+    "switch-root:Change root directory"
   )
 
   if (( CURRENT == 1 )); then
@@ -297,6 +298,10 @@ done
    _sd_unit_files
 }
 
+(( $+functions[_systemctl_switch-root] )) || _systemctl_switch-root() {
+   _files
+}
+
 # no systemctl completion for:
 #    [STANDALONE]='daemon-reexec daemon-reload default
 #                  emergency exit halt kexec list-jobs list-units