grub-mkconfig stops again ¿?

gozames · May 2, 2015 · 7ad4f87 · 7ad4f87
1 parent 4341bde
commit 7ad4f87
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,4 @@
+[2015-05-02 10:07:55 +0200]  Allow format without label                                                 karasu      {4341bde}
 [2015-05-02 01:35:36 -0500]  fixes #318 - needs testing                                             Dustin Falgout  {1a174e1}
 [2015-05-01 22:59:46 -0500]  working on #318 again                                                  Dustin Falgout  {bcbefbb}
 [2015-05-01 22:57:41 -0500]  working on #318 again                                                  Dustin Falgout  {d8c4d15}

diff --git a/cnchi/info.py b/cnchi/info.py
@@ -24,7 +24,7 @@
 
 """ Set some Cnchi global constants """
 
-CNCHI_VERSION = "0.8.96"
+CNCHI_VERSION = "0.8.97"
 CNCHI_WEBSITE = "http://www.antergos.com"
 
 if __name__ == '__main__':

diff --git a/cnchi/installation/advanced.py b/cnchi/installation/advanced.py
@@ -1690,13 +1690,11 @@ def check_mount_points(self):
             (is_new, lbl, mnt, fsystem, fmt) = self.stage_opts[part_path]
 
             if mnt == "/" and fsystem not in ["fat", "ntfs", "swap"]:
-                # Root partition
                 has_part["/"] = True
                 part_label["/"].show()
                 part_label["/"].set_state(True)
 
             if mnt == "swap":
-                # Swap partition
                 has_part["swap"] = True
                 part_label["swap"].show()
                 part_label["swap"].set_state(True)
@@ -1737,6 +1735,7 @@ def check_mount_points(self):
                 check_ok = check_ok and has_part["/boot"]
 
         self.forward_button.set_sensitive(check_ok)
+
         if check_ok:
             self.forward_button.set_name('fwd_btn_install_now')
             txt = _("Install now!")

diff --git a/cnchi/installation/bootloader.py b/cnchi/installation/bootloader.py
@@ -234,10 +234,13 @@ def install_grub2_bios(self):
         # We call mount_special_dirs here just to be sure
         chroot.mount_special_dirs(self.dest_dir)
 
-        grub_install = ['grub-install', '--directory=/usr/lib/grub/i386-pc', '--target=i386-pc',
-                        '--boot-directory=/boot', '--recheck']
+        grub_install = ['grub-install',
+                        '--directory=/usr/lib/grub/i386-pc',
+                        '--target=i386-pc',
+                        '--boot-directory=/boot',
+                        '--recheck']
 
-        if len(grub_location) > len("/dev/sdX"):  # ex: /dev/sdXY > 8
+        if len(grub_location) > len("/dev/sdX"):  # Use --force when installing in /dev/sdXY
             grub_install.append("--force")
 
         grub_install.append(grub_location)
@@ -259,6 +262,7 @@ def install_grub2_bios(self):
         self.apply_osprober_patch()
 
         # Run grub-mkconfig last
+        logging.debug(_("Running grub-mkconfig..."))
         locale = self.settings.get("locale")
         try:
             cmd = ['sh', '-c', 'LANG={0} grub-mkconfig -o /boot/grub/grub.cfg'.format(locale)]
@@ -364,6 +368,7 @@ def install_grub2_efi(self):
         # Add -l option to os-prober's umount call so that it does not hang
         self.apply_osprober_patch()
 
+        logging.debug(_("Running grub-mkconfig..."))
         locale = self.settings.get("locale")
         try:
             cmd = ['sh', '-c', 'LANG={0} grub-mkconfig -o /boot/grub/grub.cfg'.format(locale)]
@@ -538,7 +543,7 @@ def install_gummiboot(self):
                     entry_file.write(line)
 
         # Install bootloader
-
+        logging.debug(_("Installing gummiboot bootloader..."))
         try:
             chroot.mount_special_dirs(self.dest_dir)
             cmd = ['gummiboot', '--path=/boot', 'install']