Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wkazubski:KDE4
kdebase4-workspace
kdm-filter-out-btrfs-snapshots.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kdm-filter-out-btrfs-snapshots.patch of Package kdebase4-workspace
diff --git a/kdm/backend/bootman.c b/kdm/backend/bootman.c index 5aa35a3..8e48aa3 100644 --- a/kdm/backend/bootman.c +++ b/kdm/backend/bootman.c @@ -251,7 +251,7 @@ getGrub2OrBurg(char ***opts, int *def, int *cur, const char *grubRebootExec) for (; isspace(*(linp + len - 1)); len--); if ((ptr = match(linp, &len, "set", 3)) && !memcmp(ptr, "default=\"${saved_entry}\"", 24)) { ret = BO_OK; - } else if ((ptr = match(linp, &len, "menuentry", 9))) { + } else if ((ptr = match(linp, &len, "menuentry", 9)) && memcmp(ptr, "\"If OK, run", 11) && memcmp(ptr, "\"Help on bootable snapshot", 26)) { if (menuLvl <= GRUB2_MAX_MENU_LEVEL) { if (buildBootList(opts, ptr, menuLvl, menus) < 0) { ret = BO_IO; @@ -259,7 +259,7 @@ getGrub2OrBurg(char ***opts, int *def, int *cur, const char *grubRebootExec) } } inEntry = 1; - } else if ((ptr = match(linp, &len, "submenu", 7))) { + } else if ((ptr = match(linp, &len, "submenu", 7)) && memcmp(ptr, "\"Bootable snapshot", 18)) { if (menuLvl < GRUB2_MAX_MENU_LEVEL) { menus[menuLvl] = arrLen(*opts); if (buildBootList(opts, ptr, menuLvl, menus) < 0) { @@ -270,7 +270,7 @@ getGrub2OrBurg(char ***opts, int *def, int *cur, const char *grubRebootExec) logWarn("Only " stringify(GRUB2_MAX_MENU_LEVEL) " nesting levels are supported in Grub2 menus.\n"); } menuLvl++; - } else if (linp[len - 1] == '}') { + } else if (linp[len - 1] == '}' && !memrchr(linp, '{', len-1)) { if (inEntry) inEntry = 0; else if (menuLvl > 0)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor