Restore xdriver= functionality (#577312)
Ack.
On 04/01/2010 10:53 AM, Martin Sivak wrote:
We used to write /etc/X11/xorg.conf during the initialization of anaconda and
then another one to /mnt/sysimage/etc/X11/xorg.conf during the configuration of
the installed system.
We changed it and the file is now being written to
/mnt/sysimage/etc/X11/xorg.conf on both calls which is obviously wrong.
So this fix restores the od behaviour and should make xdriver=vesa work again.
---
anaconda | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/anaconda b/anaconda
index 9ab9f32..008255f 100755
--- a/anaconda
+++ b/anaconda
@@ -633,14 +633,16 @@ class Anaconda(object):
self._intf = InstallInterface()
return self._intf
- def writeXdriver(self):
+ def writeXdriver(self, root = None):
# this should go away at some point, but until it does, we
# need to keep it around.
if self.xdriver is None:
return
- if not os.path.isdir("%s/etc/X11" %(self.rootPath,)):
- os.makedirs("%s/etc/X11" %(self.rootPath,), mode=0755)
- f = open("%s/etc/X11/xorg.conf" %(self.rootPath,), 'w')
+ if root is None:
+ root = self.rootPath
+ if not os.path.isdir("%s/etc/X11" %(root,)):
+ os.makedirs("%s/etc/X11" %(root,), mode=0755)
+ f = open("%s/etc/X11/xorg.conf" %(root,), 'w')
f.write('Section "Device"
Identifier "Videocard0"
Driver "%s"
EndSection
' % self.xdriver)
f.close()
@@ -950,7 +952,7 @@ if __name__ == "__main__":
if opts.xdriver:
anaconda.xdriver = opts.xdriver
- anaconda.writeXdriver()
+ anaconda.writeXdriver(root="/")
if not flags.livecdInstall:
isys.auditDaemon()
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
|