| 1 |
|
2012-03-03 Niels Rogalla <niro@magellan-linux.de> |
| 2 |
|
|
| 3 |
|
* [r1771] VERSION: |
| 4 |
|
-version 8.9 |
| 5 |
|
* [r1770] new-kernel-pkg: |
| 6 |
|
Add support to new-kernel-pkg to recognize ARCH == armv5tel |
| 7 |
|
needed for |
| 8 |
|
Kirkwood based systems. |
| 9 |
|
|
| 10 |
|
2012-02-18 Niels Rogalla <niro@magellan-linux.de> |
| 11 |
|
|
| 12 |
|
* [r1757] new-kernel-pkg: |
| 13 |
|
-let the menuentries match our grub-cosmetic patch |
| 14 |
|
* [r1756] new-kernel-pkg: |
| 15 |
|
-fix a infinite loop caused by dropping the path prefix of |
| 16 |
|
mkinitrd |
| 17 |
|
* [r1754] ChangeLog: |
| 18 |
|
updated ChangeLog |
| 19 |
|
* [r1753] VERSION: |
| 20 |
|
-version 8.8_20120218 |
| 21 |
|
* [r1752] new-kernel-pkg: |
| 22 |
|
new-kernel-pkg fails to find U-Boot. |
| 23 |
|
|
| 24 |
|
new-kernel-pkg fails to find U-Boot if the boot directory is not |
| 25 |
|
on a |
| 26 |
|
separate partition. |
| 27 |
|
|
| 28 |
|
This only affects the U-Boot image creation section of the |
| 29 |
|
new-kernel-pkg |
| 30 |
|
script, for ARM based systems. My initial changes were only |
| 31 |
|
tested on |
| 32 |
|
specific ARM-OMAP systems that required a specific U-Boot |
| 33 |
|
partition. |
| 34 |
|
Testing |
| 35 |
|
on additional systems (ARM-Tegra) revealed this incorrect |
| 36 |
|
assumption. |
| 37 |
|
|
| 38 |
|
The attached patch includes the following: |
| 39 |
|
|
| 40 |
|
- Cosmetic: Correction - change uBoot to U-Boot in comments. |
| 41 |
|
- Additions: |
| 42 |
|
-- Recognize ARCH == armv7hl |
| 43 |
|
-- Make U-Boot load/execute address variable (based on machine) |
| 44 |
|
-- Bug: Correct invalid assumption that the U-Boot directory |
| 45 |
|
would |
| 46 |
|
always |
| 47 |
|
be on a separate partition. |
| 48 |
|
* [r1751] grubby.c: |
| 49 |
|
Try to display title when printing information with '--info' |
| 50 |
|
|
| 51 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 52 |
|
* [r1750] grubby.c: |
| 53 |
|
Fix endswith() to correctly test its input for validity. |
| 54 |
|
* [r1749] installkernel, new-kernel-pkg: |
| 55 |
|
Fix hard coded paths so kernel's "make install" will DTRT. |
| 56 |
|
* [r1748] grubby.c: |
| 57 |
|
Implement support for "default saved" for grub2 |
| 58 |
|
|
| 59 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 60 |
|
* [r1747] grubby.c: |
| 61 |
|
Include prefix when printing kernel information |
| 62 |
|
|
| 63 |
|
When running grubby with '--info=', the initrd is displayed with |
| 64 |
|
the |
| 65 |
|
boot prefix, so, for correctness, also include it in the kernel |
| 66 |
|
line. |
| 67 |
|
|
| 68 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 69 |
|
* [r1746] grubby.c: |
| 70 |
|
Refactor grub2 title extraction, making it a function |
| 71 |
|
|
| 72 |
|
'--default-title' now uses that functions, but others such as |
| 73 |
|
'--info' |
| 74 |
|
could, IMHO, also display the title and thus, use the refactored |
| 75 |
|
function. |
| 76 |
|
|
| 77 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 78 |
|
* [r1745] grubby.c: |
| 79 |
|
Include a / when one is missing in paths (#769641) |
| 80 |
|
* [r1743] ChangeLog: |
| 81 |
|
updated ChangeLog |
| 82 |
|
* [r1742] VERSION: |
| 83 |
|
-version 8.8 |
| 84 |
|
* [r1741] test.sh: |
| 85 |
|
Fix new test case to not care if /boot is a mountpoint... |
| 86 |
|
* [r1739] ChangeLog: |
| 87 |
|
updated ChangeLog |
| 88 |
|
* [r1738] VERSION: |
| 89 |
|
-version 8.7 |
| 90 |
|
* [r1737] test.sh, test/results/debug[ADD], |
| 91 |
|
test/results/debug/g2.1[ADD], test/results/debug/g2.1.2[ADD]: |
| 92 |
|
Add a test case for --debug. |
| 93 |
|
|
| 94 |
|
Make sure --debug works as expected in both successful and failed |
| 95 |
|
attempts. |
| 96 |
|
* [r1736] grubby.8, grubby.c: |
| 97 |
|
grubby: Add --debug option to annotate "suitable template" |
| 98 |
|
failures |
| 99 |
|
|
| 100 |
|
Today, when grubby fails with "no suitable template found" the |
| 101 |
|
user |
| 102 |
|
has no idea why that might be. These can fail for several |
| 103 |
|
reasons. |
| 104 |
|
So add a --debug option to print out the line in grubby.c where |
| 105 |
|
it |
| 106 |
|
failed, a text message describing the failure, and a copy of the |
| 107 |
|
bootloader entry that failed, to aid investigation. |
| 108 |
|
|
| 109 |
|
Signed-off-by: Eric Sandeen <sandeen@redhat.com> |
| 110 |
|
* [r1734] ChangeLog: |
| 111 |
|
updated ChangeLog |
| 112 |
|
* [r1733] VERSION: |
| 113 |
|
-version 8.6 |
| 114 |
|
* [r1732] test/results/remove/g2-1.4: |
| 115 |
|
Fix another test broken by 4bb88f93e6c7cf432e354a164fce8743794a |
| 116 |
|
* [r1730] ChangeLog: |
| 117 |
|
updated ChangeLog |
| 118 |
|
* [r1729] VERSION: |
| 119 |
|
-version 8.5 |
| 120 |
|
* [r1728] new-kernel-pkg: |
| 121 |
|
Don't hardcode dracut path. (#768645) |
| 122 |
|
|
| 123 |
|
dracut moved from /sbin to /usr/bin, so fix that, but also it's |
| 124 |
|
pointless to hardcode what's in PATH. |
| 125 |
|
* [r1727] grubby.c, test.sh, test/results/remove/g2-1.4[ADD]: |
| 126 |
|
Use dummy entries for text following kernel entries so it is |
| 127 |
|
preserved |
| 128 |
|
(#744717) |
| 129 |
|
|
| 130 |
|
Signed-off-by: Adam Williamson <awilliam@redhat.com> |
| 131 |
|
* [r1726] test/results/defaulttitle/g2.1: |
| 132 |
|
Fix up one test result for changes from |
| 133 |
|
4bb88f93e6c7cf432e354a164fce8743794a84a5 |
| 134 |
|
* [r1724] ChangeLog: |
| 135 |
|
updated ChangeLog |
| 136 |
|
* [r1723] VERSION: |
| 137 |
|
-version 8.4 |
| 138 |
|
* [r1722] grubby.c, test/grub2.1, test/results/add/g2-1.1, |
| 139 |
|
test/results/add/g2-1.2, test/results/add/g2-1.3: |
| 140 |
|
Update "echo 'Loading..." messages to the new kernel version |
| 141 |
|
|
| 142 |
|
grub2-mkconfig will create lines like: |
| 143 |
|
echo 'Loading Linux 3.1.0-0.rc6.git0.0.fc16.x86_64 |
| 144 |
|
...' |
| 145 |
|
- depending on the content of /etc/default/grub. |
| 146 |
|
|
| 147 |
|
grubby would recognize these lines and replace them with lines |
| 148 |
|
with the |
| 149 |
|
right |
| 150 |
|
version number such as: |
| 151 |
|
echo 'Loading Fedora (3.1.0-0.rc6.git0.0.fc16.x86_64)' |
| 152 |
|
|
| 153 |
|
these lines were however not recognized by grubby and would not |
| 154 |
|
be |
| 155 |
|
updated on |
| 156 |
|
next kernel update when this entry would be used as template. |
| 157 |
|
|
| 158 |
|
With this patch grubby will no longer look for a specific title |
| 159 |
|
but |
| 160 |
|
patch any |
| 161 |
|
"echo 'Loading" line immediately before the kernel line. |
| 162 |
|
|
| 163 |
|
Signed-off-by: Adam Williamson <awilliam@redhat.com> |
| 164 |
|
* [r1721] grubby.8, grubby.c, test.sh, |
| 165 |
|
test/results/defaulttitle[ADD], |
| 166 |
|
test/results/defaulttitle/g.1[ADD], |
| 167 |
|
test/results/defaulttitle/g.10[ADD], |
| 168 |
|
test/results/defaulttitle/g.11[ADD], |
| 169 |
|
test/results/defaulttitle/g.2[ADD], |
| 170 |
|
test/results/defaulttitle/g.3[ADD], |
| 171 |
|
test/results/defaulttitle/g.4[ADD], |
| 172 |
|
test/results/defaulttitle/g.5[ADD], |
| 173 |
|
test/results/defaulttitle/g.6[ADD], |
| 174 |
|
test/results/defaulttitle/g.7[ADD], |
| 175 |
|
test/results/defaulttitle/g.8[ADD], |
| 176 |
|
test/results/defaulttitle/g.9[ADD], |
| 177 |
|
test/results/defaulttitle/g2.1[ADD], |
| 178 |
|
test/results/defaulttitle/g2.2[ADD]: |
| 179 |
|
Add new '--default-title' feature. |
| 180 |
|
|
| 181 |
|
This displays the title of the default entry directly from the |
| 182 |
|
parsed configuration file. |
| 183 |
|
|
| 184 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 185 |
|
* [r1720] grubby.8, grubby.c, test.sh, |
| 186 |
|
test/results/defaultindex[ADD], test/results/defaultindex/0[ADD], |
| 187 |
|
test/results/defaultindex/2[ADD]: |
| 188 |
|
Add new '--default-index' feature. |
| 189 |
|
|
| 190 |
|
This displays the (numeric) index of the default entry directly |
| 191 |
|
from the parsed configuration file. |
| 192 |
|
|
| 193 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 194 |
|
* [r1719] test.sh: |
| 195 |
|
test.sh: add feature for testing the output of a grubby command |
| 196 |
|
|
| 197 |
|
Instead of comparing the configuration file that gets generated |
| 198 |
|
by |
| 199 |
|
a grubby command |
| 200 |
|
|
| 201 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 202 |
|
* [r1718] grubby.c: |
| 203 |
|
GRUB: Fix detection by increasing offset when comparing stage1 to |
| 204 |
|
MBR |
| 205 |
|
|
| 206 |
|
A couple of instructions of grub's stage1 get modified when |
| 207 |
|
copied to |
| 208 |
|
the |
| 209 |
|
MBR (replaced by NOOPs). Check for this condition, and skip these |
| 210 |
|
bytes |
| 211 |
|
while compare stage1 and MBR. |
| 212 |
|
|
| 213 |
|
Signed-off-by: Cleber Rosa <crosa@redhat.com> |
| 214 |
|
* [r1717] grubby.c: |
| 215 |
|
Don't crash if grubConfig not found. |
| 216 |
|
|
| 217 |
|
I trigger this crash on my system. It has syslinux and no grub. |
| 218 |
|
|
| 219 |
|
Signed-off-by: Christopher Li <kernel@chrisli.org> |
| 220 |
|
* [r1716] new-kernel-pkg: |
| 221 |
|
Adding extlinux support for new-kernel-pkg |
| 222 |
|
|
| 223 |
|
Signed-off-by: Christopher Li <kernel@chrisli.org> |
| 224 |
|
* [r1715] grubby.c: |
| 225 |
|
Look for other possible grub config files |
| 226 |
|
|
| 227 |
|
Since debian and Ubuntu don't symlink /boot/grub/menu.lst |
| 228 |
|
to /etc/grub.conf, make it possible to look them over on |
| 229 |
|
this original location as well. |
| 230 |
|
|
| 231 |
|
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> |
| 232 |
|
* [r1714] grubby.c: |
| 233 |
|
Make grubby to recognize Ubuntu's spin of Grub2 |
| 234 |
|
|
| 235 |
|
We are looking to use grubby as a bootloader entries |
| 236 |
|
manager for the autotest project: |
| 237 |
|
|
| 238 |
|
http://autotest.kernel.org/ |
| 239 |
|
|
| 240 |
|
The project aims to cover more distros than just |
| 241 |
|
red hat based ones, so this small patch fixes the |
| 242 |
|
tool under Ubuntu. They have chosen to name grub2 |
| 243 |
|
grub, in all directory references. Also, they don't |
| 244 |
|
make symlinks of grub config files on /etc. So, |
| 245 |
|
adapt the code to take into consideration this |
| 246 |
|
behavior. |
| 247 |
|
|
| 248 |
|
Changes from v1: |
| 249 |
|
* Removed nested set of {} |
| 250 |
|
* Made the return in case /etc/grub.d is found |
| 251 |
|
indented |
| 252 |
|
* Moved the dbgPrint("not found\n") statement |
| 253 |
|
before the last return. Also, put a new |
| 254 |
|
dbgPrint("found\n") if we've found a suitable |
| 255 |
|
grub2 config file ubuntu/debian style. |
| 256 |
|
|
| 257 |
|
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> |
| 258 |
|
* [r1712] ChangeLog: |
| 259 |
|
updated ChangeLog |
| 260 |
|
* [r1711] VERSION: |
| 261 |
|
-version 8.3 |
| 262 |
|
* [r1710] new-kernel-pkg: |
| 263 |
|
Fix new-kernel-pkg invocation of grubby for grub (bz 725185) |
| 264 |
|
|
| 265 |
|
new-kernel-pkg did not specify --grub when it called grubby to |
| 266 |
|
update the |
| 267 |
|
kernel entry with an initrd. Grubby would then try to probe what |
| 268 |
|
to |
| 269 |
|
do and |
| 270 |
|
would give preference to grub2 and thus leave an incomplete grub |
| 271 |
|
entry. |
| 272 |
|
|
| 273 |
|
new-kernel-pkg did also not specify the grub config file |
| 274 |
|
explicitly |
| 275 |
|
to |
| 276 |
|
grubby as it do for the grub2 config file. That could perhaps in |
| 277 |
|
some |
| 278 |
|
situations cause grubby to do something else than new-kernel-pkg |
| 279 |
|
expected. |
| 280 |
|
|
| 281 |
|
Now --grub -c $grubConfig is specified explicitly in all cases. |
| 282 |
|
* [r1708] ChangeLog: |
| 283 |
|
updated ChangeLog |
| 284 |
|
* [r1707] VERSION: |
| 285 |
|
-version 8.2 |
| 286 |
|
* [r1706] new-kernel-pkg: |
| 287 |
|
Read HYPERVISOR and HYPERVISOR_ARGS from /etc/conf.d/grubby and |
| 288 |
|
set |
| 289 |
|
mbkernel and mbargs Signed-off-by: W. Michael Petullo |
| 290 |
|
<mike@flyn.org> |
| 291 |
|
* [r1704] ChangeLog: |
| 292 |
|
updated ChangeLog |
| 293 |
|
* [r1703] VERSION: |
| 294 |
|
-version 8.1 |
| 295 |
|
* [r1702] new-kernel-pkg: |
| 296 |
|
Fix a miss-spelled variable name. |
| 297 |
|
|
| 298 |
|
"grub2Config", not "grub2Cfg". |
| 299 |
|
* [r1700] ChangeLog: |
| 300 |
|
updated ChangeLog |
| 301 |
|
* [r1699] VERSION: |
| 302 |
|
-version 8.0 |
| 303 |
|
* [r1698] test.sh, test/grub2.1[ADD], test/grub2.2[ADD], |
| 304 |
|
test/results/add/g2-1.1[ADD], test/results/add/g2-1.2[ADD], |
| 305 |
|
test/results/add/g2-1.3[ADD], test/results/add/g2-1.4[ADD]: |
| 306 |
|
Add some limited test cases for grub2. |
| 307 |
|
* [r1697] new-kernel-pkg: |
| 308 |
|
Update grub2 support to new-kernel-pkg |
| 309 |
|
|
| 310 |
|
This uses grubby for grub2 on efi and non-efi machines. |
| 311 |
|
|
| 312 |
|
2012-02-17 Niels Rogalla <niro@magellan-linux.de> |
| 313 |
|
|
| 314 |
|
* [r1696] grubby.c: |
| 315 |
|
Add grub2.cfg support to grubby. |
| 316 |
|
* [r1695] Makefile: |
| 317 |
|
Add -ggdb |
| 318 |
|
* [r1694] Makefile, grubby.c: |
| 319 |
|
Tweak some make options. |
| 320 |
|
|
| 321 |
|
Some functions are only used in dbgPrintf() arguments. As such, |
| 322 |
|
errors/warnings on unused functions need to be disabled. |
| 323 |
|
|
| 324 |
|
Also, use -std=gnu99. |
| 325 |
|
|
| 326 |
|
Also, add a debug target. |
| 327 |
|
* [r1693] grubby.c: |
| 328 |
|
Rename entrySeparator to entryStart. |
| 329 |
|
|
| 330 |
|
Since we're actually using it to detect the start of an entry |
| 331 |
|
(and |
| 332 |
|
specifically not the end), name this slightly better. |
| 333 |
|
* [r1692] grubby.c: |
| 334 |
|
Convert configFileInfo structs to C99-style initializers. |
| 335 |
|
|
| 336 |
|
Get rid of the old initializers where struct names were commends, |
| 337 |
|
in |
| 338 |
|
favor of C99-style assignment, so new fields can be put at |
| 339 |
|
logical |
| 340 |
|
places without having to change the whole file. |
| 341 |
|
* [r1691] new-kernel-pkg, uboot[ADD]: |
| 342 |
|
Add uboot support for ARM (#712199) |
| 343 |
|
|
| 344 |
2011-07-19 Niels Rogalla <niro@magellan-linux.de> |
2011-07-19 Niels Rogalla <niro@magellan-linux.de> |
| 345 |
|
|
| 346 |
|
* [r1433] ChangeLog[ADD]: |
| 347 |
|
-added ChangeLog |
| 348 |
* [r1432] VERSION: |
* [r1432] VERSION: |
| 349 |
-version 7.0.18 - upstream fixed grub2 errors in new-kernel-pkg, |
-version 7.0.18 - upstream fixed grub2 errors in new-kernel-pkg, |
| 350 |
which we already done in our port of 7.0.17. ver up to be in sync |
which we already done in our port of 7.0.17. ver up to be in sync |
Parent Directory
| 
Revision Log
| 
Patch