[Uludag-commits] r17569 - in branches/yali4/yali4: . gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Thu Apr  3 16:07:40 2008
New Revision: 17569

Modified:
   branches/yali4/yali4/bootloader.py
   branches/yali4/yali4/gui/ScrBootloader.py
Log:
 * another last commit ..

Modified: branches/yali4/yali4/bootloader.py
=================================================================
--- branches/yali4/yali4/bootloader.py	(original)
+++ branches/yali4/yali4/bootloader.py	Thu Apr  3 16:07:40 2008
@@ -96,8 +96,6 @@
         if not install_dev.startswith("/dev/"):
             install_dev = "/dev/%s" % install_dev
 
-        _grb = self._find_grub_dev(install_root_path)
-
         # some paths has own directories like (/dev/cciss/c0d0p1)
         # it removes /dev/ and gets the device.
         install_root = install_root_path[5:]
@@ -112,6 +110,8 @@
         cmd = "/sbin/grub --batch --no-floppy --device-map=%s < %s" % (self.device_map, self.grub_conf)
         os.system(cmd)
 
+        _grb = self._find_grub_dev(install_root_path)
+
         # grub_root is the device on which we install.
         minor = str(int(filter(lambda u: u.isdigit(), install_root)) -1)
         grub_root = ",".join([_grb, minor])

Modified: branches/yali4/yali4/gui/ScrBootloader.py
=================================================================
--- branches/yali4/yali4/gui/ScrBootloader.py	(original)
+++ branches/yali4/yali4/gui/ScrBootloader.py	Thu Apr  3 16:07:40 2008
@@ -169,11 +169,8 @@
         if ctx.installData.autoPartDev:
             # show confirmation dialog
             w.warning.setText(_('''<b>
-<p>This action will use your entire disk for Pardus installation and
+<p>This action will use your entire disk for Pardus installation and <br>
 all your present data on the selected disk will be lost.</p>
-
-<p>After being sure you had your backup this is generally a safe
-and easy way to install Pardus.</p>
 </b>
 '''))
         self.dialog = WarningDialog(w, self)