[Uludag-commits] r17609 - branches/yali4/yali4

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Tue Apr  8 16:39:03 2008
New Revision: 17609

Modified:
   branches/yali4/yali4/bootloader.py
   branches/yali4/yali4/postinstall.py
Log:
 * Fix for new xorg configuration ..

Modified: branches/yali4/yali4/bootloader.py
=================================================================
--- branches/yali4/yali4/bootloader.py	(original)
+++ branches/yali4/yali4/bootloader.py	Tue Apr  8 16:39:03 2008
@@ -207,7 +207,7 @@
         grub_install_root = str(filter(lambda u: not u.isdigit(),
                                        grub_install_root))
 
-        cmd = "%s --root-directory=%s %s" % (yali4.sysutils.find_executable("grub-install"),
+        cmd = "%s --root-directory=%s %s --no-floppy" % (yali4.sysutils.find_executable("grub-install"),
                                              consts.target_dir,
                                              grub_install_root)
         if os.system(cmd) != 0:

Modified: branches/yali4/yali4/postinstall.py
=================================================================
--- branches/yali4/yali4/postinstall.py	(original)
+++ branches/yali4/yali4/postinstall.py	Tue Apr  8 16:39:03 2008
@@ -66,13 +66,19 @@
     return True
 
 def migrate_xorg():
+    def joy(a):
+        return os.path.join(consts.target_dir,a[1:])
+
     # copy confs
     files = ["/etc/X11/xorg.conf",
              "/etc/hal/fdi/policy/10-keymap.fdi",
              "/var/lib/zorg/config.xml"]
 
     for conf in files:
-        if not os.path.exists(os.path.dirname(conf)):
-            os.makedirs(os.path.dirname(conf))
-        shutil.copyfile(conf, os.path.join(consts.target_dir, conf))
+        if not os.path.exists(joy(os.path.dirname(conf))):
+            os.makedirs(joy(os.path.dirname(conf)))
+
+        if os.path.exists(conf):
+            ctx.debugger.log("Copying from '%s' to '%s'" % (conf, joy(conf)))
+            shutil.copyfile(conf, joy(conf))