{"push_id":1093604303,"size":22,"distinct_size":22,"ref":"refs/heads/bz1238941_RHEL71_ZSTREAM","head":"b8ffedf2c416a07d9212c47049c3e56c76476037","before":"7fc042693cb594a5a87296beeb3f43572d026e1e","commits":[{"sha":"d23d64dd5287d0aae9c984ba57a69738a6c50eca","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Always choose \"linux\"/\"initrd\" on efi-only platforms.\n\nWhich basically just means Aarch64.\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 9a052b4e71487037a1299b767a8fa77e65033ca3)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/d23d64dd5287d0aae9c984ba57a69738a6c50eca"},{"sha":"0cba069056da713d2044dd9b635a63a9c860336e","author":{"email":"c9b9bbc6e9b0bc7e9cec5af1551c7b98adb9530c@v3.sk","name":"Lubomir Rintel"},"message":"extlinux: Understand \"default\" properly\n\nThe configuration looks like the following:\n\n  default Fedora (3.11.6-301.fc20.i686+PAE) 20 (Heisenbug)\n\n  title Fedora (3.11.6-301.fc20.i686+PAE) 20 (Heisenbug)\n  ...\n\nGrubby skips over the default clause as it has more than one element. And even\nif it did not, it would not match it against the title, since it handles titles\nspecially, concatenating the title, but not the default clause.\n\nThis commit adds special handling for extlinux, which causes it to parse\ndefault and title in the same way.\n\nSigned-off-by: Lubomir Rintel <lkundrak@v3.sk>\n(cherry picked from commit 12c09c4f205f600bb0fb2ace15c494c52aebcc97)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/0cba069056da713d2044dd9b635a63a9c860336e"},{"sha":"3fe669f4d8818f8b83e55314e76817d0e85a2076","author":{"email":"c9b9bbc6e9b0bc7e9cec5af1551c7b98adb9530c@v3.sk","name":"Lubomir Rintel"},"message":"extlinux: Add test suite\n\nStrongly inspired aby GRUB test suite. Note that this does not pass currently,\nsince the extlinux default line gets eaten (rhbz#964178). A fix will follow.\n\nSigned-off-by: Lubomir Rintel <lkundrak@v3.sk>\n(cherry picked from commit 56f82c352b7479b13e27a4beefcaf1ec06fbc39c)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/3fe669f4d8818f8b83e55314e76817d0e85a2076"},{"sha":"d76cc264cdd26c2d123b87848181a22d0864be7c","author":{"email":"c9b9bbc6e9b0bc7e9cec5af1551c7b98adb9530c@v3.sk","name":"Lubomir Rintel"},"message":"grub: Remove a redundant test\n\nSigned-off-by: Lubomir Rintel <lkundrak@v3.sk>\n(cherry picked from commit 9291d10ed8a828f27f796323d7a8d287e07fe762)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/d76cc264cdd26c2d123b87848181a22d0864be7c"},{"sha":"a02b4a31101769b6cb56a06de7b48d95277892fd","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Strip the LT_END line from a new stanza before adding \"missing\" parts.\n\nWhen we get --copy-default on a --add-kernel with a --initrd option, and\nthe default stanza lacks an initrd, we wind up in the fallback path\nwhere we add the default after the fact.  When we do this, we later add\nan LT_END line /if/ it doesn't exist.  But we've already got one, and\nwhen we add the initrd it's after it.\n\nSo strip it out and re-mark it as needed so it'll be added at the end.\n\nResolves: rhbz#1099627\nRelated: rhbz#1096358\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 80be177f4ec3ad74d7e82fcc9b7cf8828ba58a32)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/a02b4a31101769b6cb56a06de7b48d95277892fd"},{"sha":"923764ffe611f3bb2edea058f872a36be1dbcc7c","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Fix a wrong test case (lacked --boot-filesystem=)\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 435940c88aa162a8a4fd34a04ef6b72e75558aa0)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/923764ffe611f3bb2edea058f872a36be1dbcc7c"},{"sha":"35d6ecf811da3e45b788664d7a700069016ee21c","author":{"email":"dd3fb353b512fe99f95471024daee0959a22905d@fb.com","name":"Yannick Brosseau"},"message":"Don't go past the last element of indexVars in findEntryByPath\n\nWe add a chance of creating an infinite loop, because we\nwere reading memory past the last element of indexVars set to -1.\n\nThis issue was only apparent with -O2, probably because the way the\nmemory was initialized.\n\nSigned-off-by: Yannick Brosseau <scientist@fb.com>\n(cherry picked from commit e4a506d5a6aababd33571cc328fdd24dbdb894d1)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/35d6ecf811da3e45b788664d7a700069016ee21c"},{"sha":"7bf5107e764d4343c6361a2d22da8bbd5e30fc44","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Always error check getLineByType()\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 6238985630433a6fea14ea759c0a132470887868)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/7bf5107e764d4343c6361a2d22da8bbd5e30fc44"},{"sha":"54de3242df991b3ef653e506c823fc4518e4e77a","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Get the error checking on getLineByType() return /right/.\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit f12b55498be967d0c9c3875c2cc453e577ab181d)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/54de3242df991b3ef653e506c823fc4518e4e77a"},{"sha":"9b963bc3f4531c170faf7be08526576742a8d0f6","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Split the test case for rescue images into tests with and without linux16.\n\nRight now the test is only a linux16 variety and it isn't only run on\nx86; that'll fail.  Split it into two tests, one which has no linux16,\nand one that has it and only runs on x86.\n\nResolves: rhbz#1202876\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 78c30a8ae1193c11f8b810e73a9a548213971094)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/9b963bc3f4531c170faf7be08526576742a8d0f6"},{"sha":"898f0aaadcbd377aaf5f1ddc2d300211d571e5f6","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Actually get the test from a7800d8f right.\n\nWoops.\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 47c1921521f9d382b1895a55f5ab557166dbcd7e)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/898f0aaadcbd377aaf5f1ddc2d300211d571e5f6"},{"sha":"b435af8fd42a3555e9906c9f593fad505c6475fa","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Make the cases for 0cb78dab /actually work/, not just not crash.\n\nResolves: rhbz#1204353\nResolves: rhbz#1204888\nResolves: rhbz#1206943\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 10002fe4f06a9eeab50a7fc67b083fafafa2b015)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/b435af8fd42a3555e9906c9f593fad505c6475fa"},{"sha":"96ff1aa266d44b58fbf9137f35f493c4f3410024","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"grub2ExtractTitle and extractTitle don't do the same thing.\n\nSo don't try to use grub2ExtractTitle in extractTitle, which actually\nalready knows how to do that thing right.\n\nResolves: rhbz#1211887\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 7c07582d5831f638074620d3ffdbb44f98c2c9bf)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/96ff1aa266d44b58fbf9137f35f493c4f3410024"},{"sha":"6f40ade05b6b6a3f25788c2f9057c501df0cae9e","author":{"email":"39d87f372cdb24e9205dfc9abf0a2f04aa5aa073@redhat.com","name":"Brian C. Lane"},"message":"Set envFile from --env when bootloader is not specified\n\n(cherry picked from commit c22aa849c7e4cd5f8d21dee7d0d53da3769b8aa3)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/6f40ade05b6b6a3f25788c2f9057c501df0cae9e"},{"sha":"476a1647bcfd9f4468c3461fcfcde17a71dbd981","author":{"email":"32d5d7104760c6969dbcc939b04e64f225673f91@linux.vnet.ibm.com","name":"Nishanth Aravamudan"},"message":"grubby: properly handle mixed ' and \" and nested quotes\n\nThe SLES12 grub2.cfg file on ppc64le by default contains a line like:\n\n  submenu \"Bootable snapshot #$snapshot_num\" {\n    menuentry \"If OK, run 'snapper rollback $snapshot_num' reboot.\" { true; }\n  }\n\nOn any grubby (tested with 8.40) invocation that updates the config\nfile, the combination of nested quotes and mixed quotes leads to a\ngenerated file content like:\n\n  submenu \"Bootable snapshot #$snapshot_num\" {\n    menuentry 'If OK, run snapper rollback $snapshot_num' rollback $snapshot_num' and reboot.\" { true; }\n  }\n\nwhich includes both a change from \" to ', but also improperly quoted\nstrings and trailing characters relative to the string. This actually\nleads to a failure to boot from the disk by default when using grubby\n(e.g., Autotest) on SLES12 ppc64le. Whether SLES12 should be adding an\nentry like this by default or not is probably open to debate, but grubby\nshould be able to hand this input file.\n\nTo fix the issue, three changes were necessary:\n\n1) grub2ExtractTitle needs to check that if the second element starts\nwith a quote, that the matching element found ends with the same\nquote-type (' vs. \")\n\n2) lineWrite needs to output the right kind of quote based upon if the\nstring to be outputted itself contains quotes. This is not currently\npossible in the code, because quotes are stripped out normally by\nreadConfig, but with the change in 3), that only happens now for the\nquotes that actually delineate a string.\n\n3) readConfig needs to check that when it is extracting titles and\ndetermining extras, it uses matching quotes.\n\nWith these changes, a simple grubby --set-default=SLES12 (for example),\nnow produces:\n\n   submenu \"Bootable snapshot #$snapshot_num\" {\n     menuentry \"If OK, run 'snapper rollback $snapshot_num' and reboot.\" { true; }\n   }\n\nas expected.\n\nSigned-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>\n(cherry picked from commit 727551a8fc1e4ece7508870e7f6e7af8e25f6864)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/476a1647bcfd9f4468c3461fcfcde17a71dbd981"},{"sha":"af0a3da6c34576fc1a257cfaf5822648baa855bc","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Add a bunch of tests for various --default-{kernel,title,index}.\n\n... and fix some failures where we see them.\n\nRelated: rhbz#1184014\n\n(though I can't actually replicate his failure.)\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 015c727547b21244eb39c587fd13002ac43efe37)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/af0a3da6c34576fc1a257cfaf5822648baa855bc"},{"sha":"f0bdad642030419c532f36b38cab566a263c7bd8","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Make the grub1 \"defaultkernel\" test more reliable.\n\nBasically just do it twice with various incarnations of\n--boot-filesystem={/,/boot}\n\nRelated: rhbz#1184014\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit aac339f36ce9b7dad5188b3c4269bd1a47b443bf)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/f0bdad642030419c532f36b38cab566a263c7bd8"},{"sha":"bc9c1bba61773ab59bcd7c59a603917468d1be78","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Don't leak from one extractTitle() call.\n\nFound by coverity.\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 13e8431d99a83fb5fca31724521cb2d40d8bdbce)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/bc9c1bba61773ab59bcd7c59a603917468d1be78"},{"sha":"6ba6e9c5475aec718d9af198fa8538486de5afd0","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Reformat to make this easier to work on.\n\nSigned-off-by: Peter Jones <noone@example.com>\n(cherry picked from commit 7e82c755e771b17c001896aef14bd136f7d161bd)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/6ba6e9c5475aec718d9af198fa8538486de5afd0"},{"sha":"76ac151dbc5d1b580bae72c7555f05e0371e2a1d","author":{"email":"2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com","name":"Peter Jones"},"message":"Make SET_VARIABLE get handled individually in GetNextLine()\n\nResolves: rhbz#1152550\n\nSigned-off-by: Peter Jones <pjones@redhat.com>\n(cherry picked from commit 577198f485368d50cef8d69cd4f9e7941e417246)\n\nResolves: rhbz#1238941","distinct":true,"url":"https://api.github.com/repos/kellinm/grubby/commits/76ac151dbc5d1b580bae72c7555f05e0371e2a1d"}]}