public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in kde-misc/kcm-grub2/files: kcm-grub2-use-gentoo-grub-commands.patch
@ 2011-08-27 12:48 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-08-27 12:48 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/08/27 12:48:09

  Added:                kcm-grub2-use-gentoo-grub-commands.patch
  Log:
  Add grub2 kcm module for in-kde configuration.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kcm-grub2/files/kcm-grub2-use-gentoo-grub-commands.patch?rev=1.1&content-type=text/plain

Index: kcm-grub2-use-gentoo-grub-commands.patch
===================================================================
diff -urN kcm-grub2-0.5.0/src/helper/helper.cpp kcm-grub2-0.5.0.new/src/helper/helper.cpp
--- kcm-grub2-0.5.0/src/helper/helper.cpp	2011-05-09 16:17:59.000000000 +0200
+++ kcm-grub2-0.5.0.new/src/helper/helper.cpp	2011-06-29 11:23:14.321387301 +0200
@@ -67,7 +67,7 @@
     }
 
     KProcess grub_install;
-    grub_install.setShellCommand(QString("grub-install --root-directory=%1 %2").arg(KShell::quoteArg(mountPoint), KShell::quoteArg(partition.remove(QRegExp("\\d+")))));
+    grub_install.setShellCommand(QString("grub2-install --root-directory=%1 %2").arg(KShell::quoteArg(mountPoint), KShell::quoteArg(partition.remove(QRegExp("\\d+")))));
     grub_install.setOutputChannelMode(KProcess::MergedChannels);
     if (grub_install.execute() != 0) {
         reply = ActionReply::HelperErrorReply;
@@ -103,7 +103,7 @@
     QStringList grubPartitions;
     HelperSupport::progressStep(0);
     for (int i = 0; i < mountPoints.size(); i++) {
-        grub_probe.setShellCommand(QString("grub-probe -t drive %1").arg(KShell::quoteArg(mountPoints.at(i))));
+        grub_probe.setShellCommand(QString("grub2-probe -t drive %1").arg(KShell::quoteArg(mountPoints.at(i))));
         grub_probe.setOutputChannelMode(KProcess::MergedChannels);
         if (grub_probe.execute() != 0) {
             reply = ActionReply::HelperErrorReply;
@@ -175,7 +175,7 @@
     }
 
     KProcess grub_mkconfig;
-    grub_mkconfig.setShellCommand(QString("grub-mkconfig -o %1").arg(KShell::quoteArg(menuFileName)));
+    grub_mkconfig.setShellCommand(QString("grub2-mkconfig -o %1").arg(KShell::quoteArg(menuFileName)));
     grub_mkconfig.setOutputChannelMode(KProcess::MergedChannels);
     if (grub_mkconfig.execute() != 0) {
         reply = ActionReply::HelperErrorReply;
@@ -184,7 +184,7 @@
     }
 
     KProcess grub_set_default;
-    grub_set_default.setShellCommand(QString("grub-set-default %1").arg(defaultEntry));
+    grub_set_default.setShellCommand(QString("grub2-set-default %1").arg(defaultEntry));
     grub_set_default.setOutputChannelMode(KProcess::MergedChannels);
     if (grub_set_default.execute() != 0) {
         reply = ActionReply::HelperErrorReply;






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-misc/kcm-grub2/files: kcm-grub2-use-gentoo-grub-commands.patch
@ 2012-06-18 16:19 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-06-18 16:19 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/06/18 16:19:08

  Removed:              kcm-grub2-use-gentoo-grub-commands.patch
  Log:
  Version bump to latest.
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-06-18 16:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18 16:19 [gentoo-commits] gentoo-x86 commit in kde-misc/kcm-grub2/files: kcm-grub2-use-gentoo-grub-commands.patch Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2011-08-27 12:48 Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox