diff options
| author |   Ioannis Aslanidis <deathwing00@gentoo.org> | 2006-11-05 02:24:09 +0000 |
|---|---|---|
| committer | Ioannis Aslanidis <deathwing00@gentoo.org> | 2006-11-05 02:24:09 +0000 |
| commit | 644fe804ac6401c751c71158fe7362a46323c65c (patch) | |
| tree | 226488d609bbdec8ca833b25d44c9cce5331ba9c /kde-base/kdm/files | |
| parent | Version bump (diff) | |
| download | gentoo-2-644fe804ac6401c751c71158fe7362a46323c65c.tar.gz gentoo-2-644fe804ac6401c751c71158fe7362a46323c65c.tar.bz2 gentoo-2-644fe804ac6401c751c71158fe7362a46323c65c.zip | |
Regenerated and included a new grub-set-default patch as requested in bug #153544.
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'kde-base/kdm/files')
| -rw-r--r-- | kde-base/kdm/files/digest-kdm-3.5.5-r1 | 6 | ||||
| -rw-r--r-- | kde-base/kdm/files/kdm-3.5.5-grub-patch.diff | 35 |
2 files changed, 41 insertions, 0 deletions
diff --git a/kde-base/kdm/files/digest-kdm-3.5.5-r1 b/kde-base/kdm/files/digest-kdm-3.5.5-r1 new file mode 100644 index 000000000000..f51965cf1cbe --- /dev/null +++ b/kde-base/kdm/files/digest-kdm-3.5.5-r1 @@ -0,0 +1,6 @@ +MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409 +RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409 +SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409 +MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886 +RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886 +SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886 diff --git a/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff b/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff new file mode 100644 index 000000000000..3dace6dd0677 --- /dev/null +++ b/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff @@ -0,0 +1,35 @@ +diff -Naur kdm-3.5.5-orig/kdm/backend/bootman.c kdm-3.5.5/kdm/backend/bootman.c +--- kdm-3.5.5-orig/kdm/backend/bootman.c 2006-10-01 19:32:15.000000000 +0200 ++++ kdm-3.5.5/kdm/backend/bootman.c 2006-11-05 03:03:54.000000000 +0100 +@@ -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; +@@ -132,19 +132,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; |