Merge pull request #1101 from yast/systemctl_options

yast · Sep 23, 2020 · f013a5f · f013a5f
2 parents 62c1976 + 42c913b
commit f013a5f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/library/systemd/src/lib/yast2/systemctl.rb b/library/systemd/src/lib/yast2/systemctl.rb
@@ -23,7 +23,10 @@ def initialize(details)
     include Yast::Logger
 
     CONTROL         = "/usr/bin/systemctl".freeze
-    COMMAND_OPTIONS = " --no-legend --no-pager --no-ask-password ".freeze
+    # The combination "--full --no-legend --no-pager --plain" is appropriate for
+    # automated processing of systemctl output.
+    # https://github.com/systemd/systemd/commit/1cabd2d0c56b7de73e4a4fb645f3bbed4a528d2c
+    COMMAND_OPTIONS = " --plain --full --no-legend --no-pager --no-ask-password ".freeze
     ENV_VARS        = " LANG=C TERM=dumb COLUMNS=1024 ".freeze
     SYSTEMCTL       = ENV_VARS + CONTROL + COMMAND_OPTIONS
     TIMEOUT         = 40 # seconds

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Sep 23 13:21:38 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
+
+- Added "--plain" and "--full" options for the "systemctl"
+  calls, these are recommended when processing the output
+  by scripts (bsc#1176714)
+- 4.3.29
+
 -------------------------------------------------------------------
 Mon Sep 21 11:28:33 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.3.28
+Version:        4.3.29
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only