[master] Make the kernel 'sshd' parameter work as expected (#572493)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Without the patch you can't just say 'sshd' you have to say 'sshd=anything',
even 'sshd=0' would work.

Together with 2d39422b083cb546e69f713752360915e0f55dd3 this fixes 572493 and
thus will be merged for rhel6.
---
 flags.py |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/flags.py b/flags.py
index c5aa6d8..e5e08aa 100644
--- a/flags.py
+++ b/flags.py
@@ -64,6 +64,12 @@ class Flags:
             cmdlineDict[key] = val
 
         return cmdlineDict
+
+    def decideCmdlineFlag(self, flag):
+        if self.__dict__['flags']['cmdline'].has_key(flag) \
+                and not self.__dict__['flags']['cmdline'].has_key("no" + flag) \
+                and self.__dict__['flags']['cmdline'][flag] != "0":
+            self.__dict__['flags'][flag] = 1
 	
     def __init__(self):
 	self.__dict__['flags'] = {}
@@ -92,13 +98,15 @@ class Flags:
         # device is
         self.__dict__['flags']['virtpconsole'] = None
 
-        for x in ['selinux','sshd']:
+        for x in ['selinux']:
             if self.__dict__['flags']['cmdline'].has_key(x):
                 if self.__dict__['flags']['cmdline'][x]:
                     self.__dict__['flags'][x] = 1
                 else:
                     self.__dict__['flags'][x] = 0
 
+        self.decideCmdlineFlag('sshd')
+
         if self.__dict__['flags']['cmdline'].has_key("debug"):
             self.__dict__['flags']['debug'] = self.__dict__['flags']['cmdline']['debug']
 
-- 
1.6.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux