diff options
author | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
commit | 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch) | |
tree | 2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/core/tdebase/kdm-cope-with-new-grub.diff | |
parent | 8667643bff14a60d8571c599efd3e48bed3e3b12 (diff) | |
download | tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip |
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/core/tdebase/kdm-cope-with-new-grub.diff')
-rw-r--r-- | opensuse/core/tdebase/kdm-cope-with-new-grub.diff | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/opensuse/core/tdebase/kdm-cope-with-new-grub.diff b/opensuse/core/tdebase/kdm-cope-with-new-grub.diff new file mode 100644 index 000000000..cf28cf9be --- /dev/null +++ b/opensuse/core/tdebase/kdm-cope-with-new-grub.diff @@ -0,0 +1,27 @@ +Index: kdm/backend/bootman.c +=================================================================== +--- kdm/backend/bootman.c.orig ++++ kdm/backend/bootman.c +@@ -132,19 +132,14 @@ setGrub( const char *opt, SdRec *sdr ) + static void + commitGrub( void ) + { +- FILE *f; +- int pid; +- static const char *args[] = { 0, "--batch", "--no-floppy", 0 }; ++ char buffer[PATH_MAX]; + + 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 ); +- } ++ snprintf(buffer, PATH_MAX, "/usr/sbin/grubonce %d", sdRec.osindex); ++ system(buffer); + } + + static char *lilo; |