diff --git a/docs/lorax.rst b/docs/lorax.rst index f517f7fe..3432ee7c 100644 --- a/docs/lorax.rst +++ b/docs/lorax.rst @@ -92,7 +92,6 @@ installation. A number of template commands are used here: * :func:`append ` to add text to a file. * :func:`chmod ` changes the file's mode. -* :func:`gconfset ` runs gconfset. * :func:`install ` to install a file into the installroot. * :func:`mkdir ` makes a new directory. * :func:`move ` to move a file into the installroot diff --git a/share/templates.d/99-generic/runtime-postinstall.tmpl b/share/templates.d/99-generic/runtime-postinstall.tmpl index 53e99cb7..535e5b18 100644 --- a/share/templates.d/99-generic/runtime-postinstall.tmpl +++ b/share/templates.d/99-generic/runtime-postinstall.tmpl @@ -89,9 +89,6 @@ append etc/shadow "install::14438:0:99999:7:::" ## remove root password replace "root:\*:" "root::" etc/shadow -## gconf settings -gconfset /desktop/gnome/interface/accessibility bool true - ## gsettings settings install ${configdir}/org.gtk.Settings.Debug.gschema.override usr/share/glib-2.0/schemas runcmd chroot ${root} glib-compile-schemas /usr/share/glib-2.0/schemas diff --git a/src/pylorax/ltmpl.py b/src/pylorax/ltmpl.py index 2a607b64..016f4b2e 100644 --- a/src/pylorax/ltmpl.py +++ b/src/pylorax/ltmpl.py @@ -129,7 +129,7 @@ class LoraxTemplateRunner(object): * Parsing and execution are *separate* passes - so you can't use the result of a command in an %if statement (or any other control statements)! - * Commands that run external programs (systemctl, gconfset) currently use + * Commands that run external programs (e.g. systemctl) currently use the *host*'s copy of that program, which may cause problems if there's a big enough difference between the host and the image you're modifying. @@ -459,22 +459,6 @@ class LoraxTemplateRunner(object): for f in rglob(self._out(fileglob), fatal=True): os.chmod(f, int(mode,8)) - # TODO: do we need a new command for gsettings? - def gconfset(self, path, keytype, value, outfile=None): - ''' - gconfset PATH KEYTYPE VALUE [OUTFILE] - Set the given gconf PATH, with type KEYTYPE, to the given value. - OUTFILE defaults to /etc/gconf/gconf.xml.defaults if not given. - Example: - gconfset /apps/metacity/general/num_workspaces int 1 - ''' - if outfile is None: - outfile = self._out("etc/gconf/gconf.xml.defaults") - cmd = ["gconftool-2", "--direct", - "--config-source=xml:readwrite:%s" % outfile, - "--set", "--type", keytype, path, value] - runcmd(cmd) - def log(self, msg): ''' log MESSAGE