Attachment 528198 Details for Bug 807507

[patch] patch

0001-Don-t-use-Info-function-to-check-enable-state-bnc-807.diff (text/plain), 2.29 KB, created by Ludwig Nussel on 2013-03-05 14:12:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludwig Nussel

Created: 2013-03-05 14:12:09 UTC

Size: 2.29 KB

patch

obsolete

>From 669aeda4e5b711437be73f9dfb7dce4316b07049 Mon Sep 17 00:00:00 2001
>From: Ludwig Nussel <ludwig.nussel@suse.de>
>Date: Tue, 5 Mar 2013 14:40:31 +0100
>Subject: [PATCH] Don't use Info function to check enable state (bnc#807507)
>
>---
> library/runlevel/src/Service.ycp | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
>diff --git a/library/runlevel/src/Service.ycp b/library/runlevel/src/Service.ycp
>index accc922..b1e339c 100644
>--- a/library/runlevel/src/Service.ycp
>+++ b/library/runlevel/src/Service.ycp
>@@ -136,11 +136,26 @@ define boolean checkExists (string name) {
> }
> 
> /**
>+ * Check if service is enabled (in any runlevel)
>+ *
>+ * Forwards to chkconfig -l which decides between init and systemd
>+ *
>+ * @param name service name
>+ * @return true if service is set to run in any runlevel
>+ */
>+global define boolean Enabled (string name) {
>+    if(!checkExists (name)) return false;
>+
>+    return (SCR::Execute (.target.bash, sformat ("%1 is-enabled %2.service", invoker, name)) == 0);
>+}
>+
>+/**
>  * Get service info without peeking if service runs.
>  * @param name name of the service
>  * @return Service information or empty map ($[])
>  */
> global define map Info (string name) {
>+    y2error("### Calling Service::Info is broken with systemd! ###");
>     if(!checkExists (name)) return $[];
>     map read = (map) SCR::Read (.init.scripts.runlevel, name);
>     map detail = read[name]:$[];
>@@ -219,8 +234,7 @@ global define boolean Adjust (string name, string action) {
> 	return false;
>     }
> 
>-    map service = Info (name);
>-    boolean is_enabled = size (service["start"]:[]) != 0;
>+    boolean is_enabled = Enabled(name);
> 
>     if (action == "disable") {
> 	if (is_enabled)
>@@ -283,20 +297,6 @@ global define boolean Finetune (string name, list rl) {
> }
> 
> /**
>- * Check if service is enabled (in any runlevel)
>- *
>- * Forwards to chkconfig -l which decides between init and systemd
>- *
>- * @param name service name
>- * @return true if service is set to run in any runlevel
>- */
>-global define boolean Enabled (string name) {
>-    if(!checkExists (name)) return false;
>-
>-    return (SCR::Execute (.target.bash, sformat ("%1 is-enabled %2.service", invoker, name)) == 0);
>-}
>-
>-/**
>  * Run init script.
>  * @param name init service name
>  * @param param init script argument
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 807507: 528198