[gentoo-commits] gentoo-x86 commit in kde-base/kdm/files: kdm-4.3.1-set-grub-default.patch

[gentoo-commits] gentoo-x86 commit in kde-base/kdm/files: kdm-4.3.1-set-grub-default.patch

[Alexey Shvetsov (alexxy)]

alexxy      09/10/06 21:00:55

  Added:                kdm-4.3.1-set-grub-default.patch
  Log:
  [kde-base/kdm] Backport set
  (Portage version: 2.2_rc44/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kdm/files/kdm-4.3.1-set-grub-default.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/files/kdm-4.3.1-set-grub-default.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/files/kdm-4.3.1-set-grub-default.patch?rev=1.1&content-type=text/plain

Index: kdm-4.3.1-set-grub-default.patch
===================================================================
Index: kdm/backend/bootman.c
===================================================================
--- kdm/backend/bootman.c	(revision 1030992)
+++ kdm/backend/bootman.c	(revision 1030993)
@@ -80,7 +80,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,15 @@
 static void
 commitGrub( void )
 {
-	FILE *f;
-	int pid;
-	static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
+	char index[16];
+	const char *args[3] = { grub, index, 0 };
 
 	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( index, "%d", sdRec.osindex );
+	runAndWait( (char **)args, environ );
 }
 
 static char *lilo;