Attachment 476442 Details for Bug 742783

[patch] patch for /usr/share/YaST2/modules/Security.ycp

s (text/plain), 4.72 KB, created by Jiří Suchomel on 2012-02-16 09:11:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2012-02-16 09:11:32 UTC

Size: 4.72 KB

patch

obsolete

>Index: Security.ycp
>===================================================================
>--- Security.ycp	(revision 67458)
>+++ Security.ycp	(working copy)
>@@ -13,6 +13,7 @@
> textdomain "security";
> 
> import "FileUtils";
>+import "Package";
> import "Pam";
> import "PamSettings";
> import "Progress";
>@@ -34,6 +35,8 @@
> ];
> // All other services should be turned off
> 
>+// systemd target, defining ctrl-alt-del behavior
>+string ctrl_alt_del_file        =       "/etc/systemd/system/ctrl-alt-del.target";
> 
> // return list of missing mandatory services in a runlevel
> global list<list<string> > MissingMandatoryServices(integer runlevel)
>@@ -340,6 +343,53 @@
> }
> 
> /**
>+ * Read the information about ctrl+alt+del behavior
>+ * See bug 742783 for description
>+ */
>+global string ReadConsoleShutdown () {
>+
>+    string ret  = "ignore";
>+
>+    if (Package::Installed ("systemd"))
>+    {
>+        if (!FileUtils::Exists (ctrl_alt_del_file))
>+        {
>+            ret = "reboot";
>+        }
>+        else
>+        {
>+            string link = (string) SCR::Read (.target.symlink, ctrl_alt_del_file);
>+            if (link == "/lib/systemd/system/halt.target")
>+            {
>+                ret     = "halt";
>+            }
>+            else if (link == "/lib/systemd/system/reboot.target" ||
>+                     link == "/lib/systemd/system/ctrl-alt-del.target")
>+            {
>+                ret     = "reboot";
>+            }
>+        }
>+        return ret;
>+    }
>+    list inittab = SCR::Dir(.etc.inittab);
>+    if(contains(inittab, "ca")) {
>+	string ca = (string) SCR::Read(.etc.inittab.ca);
>+	if(issubstring(ca, "/bin/true") || issubstring(ca, "/bin/false"))
>+	    Settings["CONSOLE_SHUTDOWN"] = "ignore";
>+	else if(issubstring(ca, "reboot") || issubstring(ca, " -r"))
>+	    Settings["CONSOLE_SHUTDOWN"] = "reboot";
>+	else if(issubstring(ca, "halt") || issubstring(ca, " -h"))
>+	    Settings["CONSOLE_SHUTDOWN"] = "halt";
>+	else {
>+	    y2error("Unknown ca status: %1", ca);
>+	    Settings["CONSOLE_SHUTDOWN"] = "ignore";
>+	}
>+    }
>+    else
>+	Settings["CONSOLE_SHUTDOWN"] = "ignore";
>+}
>+
>+/**
>  * Read all security settings
>  * @return true on success
>  */
>@@ -371,22 +421,7 @@
>     });
>     y2debug("Settings=%1", Settings);
> 
>-    list inittab = SCR::Dir(.etc.inittab);
>-    if(contains(inittab, "ca")) {
>-	string ca = (string) SCR::Read(.etc.inittab.ca);
>-	if(issubstring(ca, "/bin/true") || issubstring(ca, "/bin/false"))
>-	    Settings["CONSOLE_SHUTDOWN"] = "ignore";
>-	else if(issubstring(ca, "reboot") || issubstring(ca, " -r"))
>-	    Settings["CONSOLE_SHUTDOWN"] = "reboot";
>-	else if(issubstring(ca, "halt") || issubstring(ca, " -h"))
>-	    Settings["CONSOLE_SHUTDOWN"] = "halt";
>-	else {
>-	    y2error("Unknown ca status: %1", ca);
>-	    Settings["CONSOLE_SHUTDOWN"] = "ignore";
>-	}
>-    }
>-    else
>-	Settings["CONSOLE_SHUTDOWN"] = "ignore";
>+    Settings["CONSOLE_SHUTDOWN"]        = ReadConsoleShutdown ();
> 
>     y2debug("Settings=%1", Settings);
> 
>@@ -493,6 +528,45 @@
> ];
> 
> /**
>+ * Write the value of ctrl-alt-delete behavior
>+ */
>+boolean WriteConsoleShutdown (string ca) {
>+
>+    if (Package::Installed ("systemd"))
>+    {
>+        if (ca == "reboot")
>+        {
>+            SCR::Execute (.target.remove, ctrl_alt_del_file);
>+        }
>+        else if (ca == "halt")
>+        {
>+            SCR::Execute (.target.bash,
>+                sformat ("ln -s -f /lib/systemd/system/halt.target %1",
>+                ctrl_alt_del_file));
>+        }
>+        else
>+        {
>+            SCR::Execute (.target.bash,
>+                sformat ("ln -s -f /dev/null %1", ctrl_alt_del_file));
>+        }
>+        return true;
>+    }
>+
>+    if(ca == "reboot")
>+	SCR::Write(.etc.inittab.ca, ":ctrlaltdel:/sbin/shutdown -r -t 4 now");
>+    else if(ca == "halt")
>+	SCR::Write(.etc.inittab.ca, ":ctrlaltdel:/sbin/shutdown -h -t 4 now");
>+    else
>+	SCR::Write(.etc.inittab.ca, ":ctrlaltdel:/bin/true");
>+    SCR::Write(.etc.inittab, nil);
>+
>+    // re-read the modified inittab (#83480)
>+    SCR::Execute (.target.bash, "/sbin/telinit q");
>+    return true;
>+}
>+
>+
>+/**
>  * Write all security settings
>  * @return true on success
>  */
>@@ -557,18 +631,8 @@
>     if(Abort()) return false;
>     Progress::NextStage();
> 
>-    string ca = Settings["CONSOLE_SHUTDOWN"]:"ignore";
>-    if(ca == "reboot")
>-	SCR::Write(.etc.inittab.ca, ":ctrlaltdel:/sbin/shutdown -r -t 4 now");
>-    else if(ca == "halt")
>-	SCR::Write(.etc.inittab.ca, ":ctrlaltdel:/sbin/shutdown -h -t 4 now");
>-    else
>-	SCR::Write(.etc.inittab.ca, ":ctrlaltdel:/bin/true");
>-    SCR::Write(.etc.inittab, nil);
>+    WriteConsoleShutdown (Settings["CONSOLE_SHUTDOWN"]:"ignore");
> 
>-    // re-read the modified inittab (#83480)
>-    SCR::Execute (.target.bash, "/sbin/telinit q");
>-
>     /* Write pam settings */
>     if(Abort()) return false;
>     Progress::NextStage();

Actions: View | Diff

Attachments on bug 742783: 476442 | 476641