File grub-customizer-to-grub2.patch of Package grub-customizer
diff -rub a/src/Model/Env.hpp b/src/Model/Env.hpp
--- a/src/Model/Env.hpp 2018-10-13 18:07:50.000000000 +0600
+++ b/src/Model/Env.hpp 2019-10-02 14:20:35.764159969 +0600
@@ -97,17 +97,17 @@
this->loadFromFile(grub_cfg, dir_prefix);
fclose(grub_cfg);
} else { // otherwise use the built-in config
- this->mkconfig_cmd = "grub-mkconfig";
- this->install_cmd = "grub-install";
- this->mkfont_cmd = "grub-mkfont";
- this->mkdevicemap_cmd = "grub-mkdevicemap --device-map=/dev/stdout";
+ this->mkconfig_cmd = "/usr/sbin/grub2-mkconfig";
+ this->install_cmd = "/usr/sbin/grub2-install";
+ this->mkfont_cmd = "/usr/sbin/grub2-mkfont";
+ this->mkdevicemap_cmd = "/usr/sbin/grub2-mkdevicemap --device-map=/dev/stdout";
this->cfg_dir = dir_prefix+"/etc/grub.d";
this->cfg_dir_noprefix = "/etc/grub.d";
- this->output_config_dir = dir_prefix+"/boot/grub";
- this->output_config_dir_noprefix = "/boot/grub";
- this->output_config_file = dir_prefix+"/boot/grub/grub.cfg";
+ this->output_config_dir = dir_prefix+"/boot/grub2";
+ this->output_config_dir_noprefix = "/boot/grub2";
+ this->output_config_file = dir_prefix+"/boot/grub2/grub.cfg";
this->settings_file = dir_prefix+"/etc/default/grub";
- this->devicemap_file = dir_prefix+"/boot/grub/device.map";
+ this->devicemap_file = dir_prefix+"/boot/grub2/device.map";
}
} break;
}
@@ -382,7 +382,7 @@
FileSystem fileSystem;
fileSystem.copy(this->cfg_dir, backupDir + "/etc_grub_d", true, ignoreList);
- fileSystem.copy(this->output_config_dir, backupDir + "/boot_grub", true, ignoreList);
+ fileSystem.copy(this->output_config_dir, backupDir + "/boot_grub2", true, ignoreList);
fileSystem.copy(this->settings_file, backupDir + "/default_grub", true, ignoreList);
FILE* restoreHowto = fopen((backupDir + "/RESTORE_INSTRUCTIONS").c_str(), "w");
@@ -390,7 +390,7 @@
fputs("--------------------------\n", restoreHowto);
fputs(" * make sure you have root permissions (`gksu nautilus` or `sudo -s` on command line) otherwise you won't be able to copy the files\n", restoreHowto);
fputs(" * to fix an unbootable configuration, just copy:\n", restoreHowto);
- fputs((" * '" + backupDir + "/boot_grub' to '" + this->output_config_dir + "'\n").c_str(), restoreHowto);
+ fputs((" * '" + backupDir + "/boot_grub2' to '" + this->output_config_dir + "'\n").c_str(), restoreHowto);
fputs(" * to reset the whole configuration (if it cannot be fixed by using grub customizer), also copy these files:\n", restoreHowto);
fputs((" * '" + backupDir + "/etc_grub_d' to '" + this->cfg_dir + "'\n").c_str(), restoreHowto);
fputs((" * '" + backupDir + "/default_grub' to '" + this->settings_file + "'\n").c_str(), restoreHowto);