Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2013-01-29 06:56:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2013-01-25 09:30:00.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-01-29 06:56:25.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Jan 25 18:09:03 UTC 2013 - ctri...@opensuse.org
+
+- changed kdm-cope-with-new-grub.diff
+ * kdm: don't even look for grub-set-default, we won't need it
+ (bnc#771545)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdm-cope-with-new-grub.diff ++++++
--- /var/tmp/diff_new_pack.9ygZUN/_old 2013-01-29 06:56:27.000000000 +0100
+++ /var/tmp/diff_new_pack.9ygZUN/_new 2013-01-29 06:56:27.000000000 +0100
@@ -2,15 +2,24 @@
===================================================================
--- kdm/backend/bootman.c.orig
+++ kdm/backend/bootman.c
-@@ -136,31 +136,10 @@ setGrub(const char *opt, SdRec *sdr)
+@@ -84,8 +84,7 @@ getGrub(char ***opts, int *def, int *cur
+ int len;
+ char line[1000];
+
+- if (!grubSetDefault && !grub &&
+- !(grubSetDefault = locate("grub-set-default")) &&
++ if (!grub &&
+ !(grub = locate("grub")))
+ return BO_NOMAN;
+
+@@ -136,31 +135,10 @@ setGrub(const char *opt, SdRec *sdr)
static void
commitGrub(void)
{
- if (sdRec.bmstamp != mTime(GRUB_MENU) &&
- setGrub(sdRec.osname, &sdRec) != BO_OK)
- return;
-+ char buffer[PATH_MAX];
-
+-
- if (grubSetDefault) {
- /* The grub-set-default command must be used, which is
- * not so good because there is no way of setting an
@@ -32,6 +41,8 @@
- pClose(f, &pid);
- }
- }
++ char buffer[PATH_MAX];
++
+ snprintf(buffer, PATH_MAX, "/usr/sbin/grubonce %d", sdRec.osindex);
+ system(buffer);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
