First Last Prev Next    No search results available      Search page      Enter new bug
Bug#: 153544
Alias:
Product:
Component:
Status: RESOLVED
Resolution: FIXED
Assigned To: Gentoo KDE team <kde@gentoo.org>
Hardware:
OS:
Version:
Priority:
Severity:
Reporter: Łukasz Mierzwa <l.mierzwa@gmail.com>
Add CC:
CC:
Remove selected CCs
URL:
Summary:
Status Whiteboard:
Keywords:

Filename Description Type Creator Created Size Actions
kdm-grub-patch.diff Upstream patch, applies cleanly patch Frederic Van Assche 2006-11-01 01:55 0000 864 bytes Details | Diff
Create a New Attachment (proposed patch, testcase, etc.) View All

Bug 153544 depends on: Show dependency tree
Show dependency graph
Bug 153544 blocks:
Votes: 0    Show votes for this bug    Vote for this bug

Additional Comments: (this is where you put emerge --info)


Not eligible to see or edit group visibility for this bug.






View Bug Activity   |   Format For Printing   |   XML   |   Clone This Bug


Description:   Opened: 2006-10-31 04:57 0000
When emergeing kdm-3.5.5 there should be kdm-3.5.4-grub-patch.diff patch
applied, it is not and the possibility to set default grub entry for next boot
is lost.
EDIT:The patch need to be fixed for 3.5.5 as the one for 3.5.4 does not apply.

------- Comment #1 From Ioannis Aslanidis 2006-10-31 14:36:34 0000 -------
The patch obviously does not apply: the code has changed.

------- Comment #2 From Frederic Van Assche 2006-11-01 01:48:55 0000 -------
(In reply to comment #1)
> The patch obviously does not apply: the code has changed.
> 

Try this patch:

--- kdm-3.5.3.orig/kdm/backend/bootman.c        2005-09-10 10:26:12.000000000
+0200
+++ kdm-3.5.3/kdm/backend/bootman.c     2006-07-07 22:09:08.000000000 +0200
@@ -82,7 +82,7 @@
        int len;
        char line[1000];

-       if (!grub && !(grub = locate( "grub" )))
+       if (!grub && !(grub = locate( "grub-set-default" )))
                return BO_NOMAN;

        *def = 0;
@@ -130,19 +130,14 @@
 static void
 commitGrub( void )
 {
-       FILE *f;
-       int pid;
-       static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
-
+       char command[256];
+
        if (sdRec.bmstamp != mTime( GRUB_MENU ) &&
            setGrub( sdRec.osname, &sdRec ) != BO_OK)
                return;

-       args[0] = grub;
-       if ((f = pOpen( (char **)args, 'w', &pid ))) {
-               fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex
);
-               pClose( f, pid );
-       }
+       sprintf(command, "%s %d", grub, sdRec.osindex);
+       system(command);
 }

 static char *lilo;

------- Comment #3 From Frederic Van Assche 2006-11-01 01:53:18 0000 -------
Hmmm, some lines got wrapped. I'll add it as an attachment.

------- Comment #4 From Frederic Van Assche 2006-11-01 01:55:31 0000 -------
Created an attachment (id=100952) [edit]
Upstream patch, applies cleanly

------- Comment #5 From Łukasz Mierzwa 2006-11-01 06:21:45 0000 -------
This patch is also missing in kdm-3.5.4-r2 ( it was introduced in
kdm-3.5.4-r1).

------- Comment #6 From Ioannis Aslanidis 2006-11-01 07:49:38 0000 -------
(In reply to comment #5)
> This patch is also missing in kdm-3.5.4-r2 ( it was introduced in
> kdm-3.5.4-r1).

No. It's not missing. It was moved to the patchset.

------- Comment #7 From Ioannis Aslanidis 2006-11-04 18:24:13 0000 -------
Erm...you added a patch for version 3.5.3... the lines do not match. I ended
regenerating the patch myself. Fixed in CVS. Please, test and reopen if
necessary.

First Last Prev Next    No search results available      Search page      Enter new bug