/[packages]/updates/6/grub2/current/SOURCES/grub2-2.02-unity-mkrescue-use-grub2-dir.patch
ViewVC logotype

Contents of /updates/6/grub2/current/SOURCES/grub2-2.02-unity-mkrescue-use-grub2-dir.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1243329 - (show annotations) (download)
Thu Jul 12 23:53:42 2018 UTC (4 months ago) by barjac
File size: 6748 byte(s)
- Updates to current Cauldron patch status before 6.1 release:
- patch to fix Mga#23268
- (mageia 6: cant boot installation medium (neither usb nor dvd) on direkt-tek DTLAPY116-2)
- Patched to fix Mga#22918
- (grub2-mkrescue still searches /boot/grub for config)
- Enable translation of labels in the theme configuration file.
- Copy grub.mo rather than link
- Fixes Mga#22182 (grub.mo dangling link)
1 diff -Naur grub/util/grub-install.c grub_new/util/grub-install.c
2 --- grub/util/grub-install.c 2018-04-18 16:54:49.311544732 -0700
3 +++ grub_new/util/grub-install.c 2018-04-18 16:51:27.856350416 -0700
4 @@ -1611,7 +1611,7 @@
5 case GRUB_INSTALL_PLATFORM_I386_IEEE1275:
6 case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275:
7 {
8 - char *dst = grub_util_path_concat (2, grubdir, "grub");
9 + char *dst = grub_util_path_concat (2, grubdir, "grub2");
10 grub_install_copy_file (imgfile, dst, 1);
11 free (dst);
12 }
13 @@ -1806,7 +1806,7 @@
14 }
15 break;
16 case GRUB_INSTALL_PLATFORM_MIPS_ARC:
17 - grub_install_sgi_setup (install_device, imgfile, "grub");
18 + grub_install_sgi_setup (install_device, imgfile, "grub2");
19 break;
20
21 case GRUB_INSTALL_PLATFORM_I386_EFI:
22 diff -Naur grub/util/grub-mkrescue.c grub_new/util/grub-mkrescue.c
23 --- grub/util/grub-mkrescue.c 2018-04-18 16:54:49.312544708 -0700
24 +++ grub_new/util/grub-mkrescue.c 2018-04-18 16:43:33.981654629 -0700
25 @@ -261,14 +261,14 @@
26
27 load_cfg_f = grub_util_fopen (load_cfg, "wb");
28 fprintf (load_cfg_f, "search --fs-uuid --set=root %s\n", iso_uuid);
29 - fprintf (load_cfg_f, "set prefix=(${root})/boot/grub\n");
30 + fprintf (load_cfg_f, "set prefix=(${root})/boot/grub2\n");
31
32 write_part (load_cfg_f, source_dirs[plat]);
33 fclose (load_cfg_f);
34
35 grub_install_push_module ("search");
36 grub_install_push_module ("iso9660");
37 - grub_install_make_image_wrap (source_dirs[plat], "/boot/grub", output,
38 + grub_install_make_image_wrap (source_dirs[plat], "/boot/grub2", output,
39 0, load_cfg,
40 mkimage_target, 0);
41 grub_install_pop_module ();
42 @@ -307,7 +307,7 @@
43 fclose (load_cfg_f);
44
45 grub_install_push_module ("iso9660");
46 - grub_install_make_image_wrap (source_dirs[plat], "()/boot/grub", output,
47 + grub_install_make_image_wrap (source_dirs[plat], "()/boot/grub2", output,
48 0, load_cfg, mkimage_target, 0);
49 grub_install_pop_module ();
50 grub_util_unlink (load_cfg);
51 @@ -497,7 +497,7 @@
52
53 iso9660_dir = grub_util_make_temporary_dir ();
54 grub_util_info ("temporary iso9660 dir is `%s'", iso9660_dir);
55 - boot_grub = grub_util_path_concat (3, iso9660_dir, "boot", "grub");
56 + boot_grub = grub_util_path_concat (3, iso9660_dir, "boot", "grub2");
57 grub_install_mkdir_p (boot_grub);
58 romdir = grub_util_path_concat (2, boot_grub, "roms");
59 grub_util_mkdir (romdir);
60 @@ -591,12 +591,12 @@
61 grub_install_push_module ("biosdisk");
62 grub_install_push_module ("iso9660");
63 grub_install_make_image_wrap (source_dirs[GRUB_INSTALL_PLATFORM_I386_PC],
64 - "/boot/grub", output,
65 + "/boot/grub2", output,
66 0, load_cfg,
67 "i386-pc-eltorito", 0);
68
69 xorriso_push ("-b");
70 - xorriso_push ("boot/grub/i386-pc/eltorito.img");
71 + xorriso_push ("boot/grub2/i386-pc/eltorito.img");
72 xorriso_push ("-no-emul-boot");
73 xorriso_push ("-boot-load-size");
74 xorriso_push ("4");
75 @@ -635,7 +635,7 @@
76 fwrite (buf, 1, 512, sa);
77
78 grub_install_make_image_wrap_file (source_dirs[GRUB_INSTALL_PLATFORM_I386_PC],
79 - "/boot/grub", sa, sysarea_img,
80 + "/boot/grub2", sa, sysarea_img,
81 0, load_cfg,
82 "i386-pc", 0);
83 sz = ftello (sa);
84 @@ -831,8 +831,8 @@
85 grub_install_copy_file (grub_chrp, bootx, 1);
86 grub_install_mkdir_p (ppc_chrp);
87 grub_install_copy_file (bisrc, bitgt, 1);
88 - xorriso_link ("/System/Library/CoreServices/grub.elf", "/boot/grub/powerpc-ieee1275/core.elf");
89 - xorriso_link ("/boot/grub/powerpc.elf", "/boot/grub/powerpc-ieee1275/core.elf");
90 + xorriso_link ("/System/Library/CoreServices/grub.elf", "/boot/grub2/powerpc-ieee1275/core.elf");
91 + xorriso_link ("/boot/grub2/powerpc.elf", "/boot/grub2/powerpc-ieee1275/core.elf");
92 /* FIXME: add PreP */
93 if (system_area == SYS_AREA_COMMON)
94 {
95 @@ -881,25 +881,25 @@
96 xorriso_push ("-B");
97 xorriso_push (",");
98 xorriso_push ("--grub2-sparc-core");
99 - xorriso_push ("/boot/grub/sparc64-ieee1275/core.img");
100 + xorriso_push ("/boot/grub2/sparc64-ieee1275/core.img");
101 }
102
103 make_image_fwdisk (GRUB_INSTALL_PLATFORM_MIPS_ARC, "mips-arc", "mips-arc/core.img");
104
105 if (source_dirs[GRUB_INSTALL_PLATFORM_MIPS_ARC])
106 {
107 - xorriso_link ("/boot/grub/mips-arc/grub", "/boot/grub/mips-arc/core.img");
108 - xorriso_link ("/boot/grub/mips-arc/sashARCS", "/boot/grub/mips-arc/core.img");
109 - xorriso_link ("/boot/grub/mips-arc/sash", "/boot/grub/mips-arc/core.img");
110 + xorriso_link ("/boot/grub2/mips-arc/grub", "/boot/grub2/mips-arc/core.img");
111 + xorriso_link ("/boot/grub2/mips-arc/sashARCS", "/boot/grub2/mips-arc/core.img");
112 + xorriso_link ("/boot/grub2/mips-arc/sash", "/boot/grub2/mips-arc/core.img");
113 }
114 if (source_dirs[GRUB_INSTALL_PLATFORM_MIPS_ARC] && system_area == SYS_AREA_ARCS)
115 {
116 xorriso_push ("-mips-boot");
117 - xorriso_push ("/boot/grub/mips-arc/sashARCS");
118 + xorriso_push ("/boot/grub2/mips-arc/sashARCS");
119 xorriso_push ("-mips-boot");
120 - xorriso_push ("/boot/grub/mips-arc/sash");
121 + xorriso_push ("/boot/grub2/mips-arc/sash");
122 xorriso_push ("-mips-boot");
123 - xorriso_push ("/boot/grub/mips-arc/grub");
124 + xorriso_push ("/boot/grub2/mips-arc/grub");
125 }
126
127 make_image_fwdisk (GRUB_INSTALL_PLATFORM_MIPSEL_ARC, "mipsel-arc", "arc.exe");
128 diff -Naur grub/util/grub-mkstandalone.c grub_new/util/grub-mkstandalone.c
129 --- grub/util/grub-mkstandalone.c 2018-04-18 16:54:49.312544708 -0700
130 +++ grub_new/util/grub-mkstandalone.c 2018-04-18 16:52:19.223125069 -0700
131 @@ -112,7 +112,7 @@
132
133 struct argp argp = {
134 options, argp_parser, N_("[OPTION] SOURCE..."),
135 - N_("Generate a standalone image (containing all modules) in the selected format")"\v"N_("Graft point syntax (E.g. /boot/grub/grub.cfg=./grub.cfg) is accepted"),
136 + N_("Generate a standalone image (containing all modules) in the selected format")"\v"N_("Graft point syntax (E.g. /boot/grub2/grub.cfg=./grub.cfg) is accepted"),
137 NULL, help_filter, NULL
138 };
139
140 @@ -314,7 +314,7 @@
141 enum grub_install_plat plat = grub_install_get_target (grub_install_source_directory);
142
143 char *memdisk_dir = grub_util_make_temporary_dir ();
144 - char *boot_grub = grub_util_path_concat (3, memdisk_dir, "boot", "grub");
145 + char *boot_grub = grub_util_path_concat (3, memdisk_dir, "boot", "grub2");
146 grub_install_copy_files (grub_install_source_directory,
147 boot_grub, plat);
148
149 @@ -352,7 +352,7 @@
150 grub_install_push_module ("tar");
151
152 grub_install_make_image_wrap (grub_install_source_directory,
153 - "(memdisk)/boot/grub", output_image,
154 + "(memdisk)/boot/grub2", output_image,
155 memdisk_img, NULL,
156 grub_util_get_target_name (format), 0);
157

  ViewVC Help
Powered by ViewVC 1.1.26