Merge pull request #31 from jsuchome/master

small fixes
openSUSE · Feb 4, 2013 · 99d6e4d · 99d6e4d
2 parents e335ab8 + 1b14478
commit 99d6e4d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/config_agent-country/lib/config_agent/keyboard.rb b/config_agent-country/lib/config_agent/keyboard.rb
@@ -20,9 +20,6 @@
 
 module ConfigAgent
   class Keyboard < ConfigAgent::Sysconfig
-    def initialize params={}
-      params[ :path] = "/etc/sysconfig/keyboard" 
-      super( params )
-    end
+    FILE_PATH = "/etc/sysconfig/keyboard"
   end
 end
diff --git a/config_agent-country/lib/config_agent/language.rb b/config_agent-country/lib/config_agent/language.rb
@@ -20,9 +20,6 @@
 
 module ConfigAgent
   class Language < ConfigAgent::Sysconfig
-    def initialize params={}
-      params[ :path] = "/etc/sysconfig/language" 
-      super( params )
-    end
+    FILE_PATH = "/etc/sysconfig/clock"
   end
 end
diff --git a/config_agent-firewall/lib/config_agent/susefirewall2.rb b/config_agent-firewall/lib/config_agent/susefirewall2.rb
@@ -21,11 +21,6 @@
 
 module ConfigAgent
   class Susefirewall2 < ConfigAgent::Sysconfig
-
-    FIREWALL_FILE = "/etc/sysconfig/SuSEfirewall2"
-    def initialize params = {}
-      super FIREWALL_FILE,params
-    end
-
+    FILE_PATH = "/etc/sysconfig/clock"
   end
 end
diff --git a/config_agent-runlevel/lib/config_agent/runlevel.rb b/config_agent-runlevel/lib/config_agent/runlevel.rb
@@ -65,7 +65,7 @@ def write(params)
       }
 
       runlevel  = params["runlevel"]
-      if runlevel.nil? || ! runlevel.is_a? Integer
+      if runlevel.nil? || (! runlevel.is_a? Integer)
         log.error "wrong argument for runlevel"
         ret["success"]  = false
         return ret
@@ -83,7 +83,7 @@ def write(params)
       # TODO special handling for runlevel 4 (see RunlevelEd::Write)
     end
 
-  private:
+  private
 
     def systemd_used?
       return File.directory? SYSTEMD_MOUNT_DIR

diff --git a/config_agent-windowmanager/lib/config_agent/windowmanager.rb b/config_agent-windowmanager/lib/config_agent/windowmanager.rb
@@ -21,8 +21,6 @@
 
 module ConfigAgent
   class Windowmanager < ConfigAgent::Sysconfig
-    def initialize params={}
-      super "/etc/sysconfig/windowmanager",params
-    end
+    FILE_PATH = "/etc/sysconfig/windowmanager"
   end
 end