Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2015-07-20 15:13:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2015-07-14 17:44:00.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2015-07-20 15:13:52.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 13 09:38:42 UTC 2015 - [email protected]
+
+- Add kdm-filter-out-btrfs-snapshots.patch: filter out btrfs snapshot
+ entries from the restart menu
+
+-------------------------------------------------------------------
New:
----
kdm-filter-out-btrfs-snapshots.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.NQSt6v/_old 2015-07-20 15:13:54.000000000 +0200
+++ /var/tmp/diff_new_pack.NQSt6v/_new 2015-07-20 15:13:54.000000000 +0200
@@ -106,6 +106,8 @@
Patch15: kdm_plymouth.patch
# PATCH-FIX-OPENSUSE kdm-fix-input-focus.patch [email protected] -- Fixes keyboard
input in kdm's dialogs (boo#772344, kde#338018)
Patch16: kdm-fix-input-focus.patch
+# PATCH-FIX-OPENSUSE kdm-filter-out-btrfs-snapshots.patch [email protected] --
filter out btrfs snapshot entries from the restart menu
+Patch17: kdm-filter-out-btrfs-snapshots.patch
## Workspace patches
# PATCH-FIX-OPENSUSE startkde.diff -- Injects branded startupconfigkeys to
users $KDEHOME, and adds %datadir/kde4/env
# to list of read enviroments
@@ -379,6 +381,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
## Workspace patches
%patch50
%patch51
++++++ kdm-filter-out-btrfs-snapshots.patch ++++++
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)) {
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) {
