diff --git a/share/config_files/anaconda.rules b/share/config_files/anaconda.rules deleted file mode 100644 index e6e41ece..00000000 --- a/share/config_files/anaconda.rules +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - metacity/general/button_layout - /schemas/apps/metacity/general/button_layout - - : - - - - metacity/general/action_right_click_titlebar - /schemas/apps/metacity/general/action_right_click_titlebar - - none - - - - metacity/window_keybindings/close - /schemas/apps/metacity/window_keybindings/close - - disabled - - - - metacity/global_keybindings/run_command_window_screenshot - /metacity/global_keybindings/run_command_window_screenshot - - disabled - - - - metacity/global_keybindings/run_command_screenshot - /metacity/global_keybindings/run_command_screenshot - - disabled - - - - - diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 3c223ab3..06e6cefd 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -1073,19 +1073,29 @@ class LoraxInstallTree(BaseLoraxClass): touch(joinpaths(self.root, "etc", "resolv.conf")) def get_config_files(self, src_dir): - # get gconf anaconda.rules - src = joinpaths(src_dir, "anaconda.rules") - dst = joinpaths(self.root, "etc", "gconf", "gconf.xml.defaults", - "anaconda.rules") - dstdir = os.path.dirname(dst) - shutil.copy2(src, dst) + # anaconda needs to change a couple of the default gconf entries + gconf = joinpaths(self.root, "etc", "gconf", "gconf.xml.defaults") - cmd = [self.lcmds.GCONFTOOL, "--direct", - '--config-source=xml:readwrite:{0}'.format(dstdir), - "--load", dst] + # 0 - path, 1 - entry type, 2 - value + gconf_settings = \ + [("/apps/metacity/general/button_layout", "string", ":"), + ("/apps/metacity/general/action_right_click_titlebar", + "string", "none"), + ("/apps/metacity/window_keybindings/close", "string", "disabled"), + ("/apps/metacity/global_keybindings/run_command_window_screenshot", + "string", "disabled"), + ("/apps/metacity/global_keybindings/run_command_screenshot", + "string", "disabled"), + ("/desktop/gnome/interface/accessibility", "bool", "true"), + ("/desktop/gnome/interface/at-spi-corba", "bool", "false")] - p = subprocess.Popen(cmd, stdout=subprocess.PIPE) - p.wait() + for path, entry_type, value in gconf_settings: + cmd = [self.lcmds.GCONFTOOL, "--direct", + "--config-source=xml:readwrite:{0}".format(gconf), + "-s", "-t", entry_type, path, value] + + p = subprocess.Popen(cmd, stdout=subprocess.PIPE) + p.wait() # get rsyslog config src = joinpaths(src_dir, "rsyslog.conf")