[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcmgrub2] /: Leave GRUB_TERMINAL unset instead of setting it to gfxterm
From:       Alberto Mattea <alberto () mattea ! info>
Date:       2012-03-20 21:12:52
Message-ID: 20120320211252.61BB5A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 4b36dbd4ed30117ae85ee0a3034d8611df5e6d19 by Alberto Mattea.
Committed on 20/03/2012 at 22:11.
Pushed by mattea into branch 'master'.

Leave GRUB_TERMINAL unset instead of setting it to gfxterm
More compatible, prevents warnings

M  +2    -2    kcmgrub2.py

http://commits.kde.org/kcmgrub2/4b36dbd4ed30117ae85ee0a3034d8611df5e6d19

diff --git a/kcmgrub2.py b/kcmgrub2.py
index 8e83355..9760487 100755
--- a/kcmgrub2.py
+++ b/kcmgrub2.py
@@ -75,7 +75,7 @@ class PyKcm(KCModule):
     self.setButtons(KCModule.Buttons(KCModule.Apply|KCModule.Default))
     self.connectUiElements()
     self.setNeedsAuthorization(True)
-    self.defFileOptions={"GRUB_DEFAULT": "0", "GRUB_SAVEDEFAULT": "false", \
"GRUB_HIDDEN_TIMEOUT": "0", "GRUB_TIMEOUT": "3", "GRUB_HIDDEN_TIMEOUT_QUIET": "true", \
"GRUB_DISTRIBUTOR": "`lsb_release -i -s 2> /dev/null || echo Debian`", \
"GRUB_CMDLINE_LINUX_DEFAULT": "\"quiet splash\"", "GRUB_TERMINAL": "gfxterm", \
"GRUB_GFXMODE": "640x480", "GRUB_DISABLE_LINUX_UUID": "false", \
"GRUB_DISABLE_LINUX_RECOVERY": "\"false\"", "GRUB_BACKGROUND": "", \
"GRUB_DISABLE_OS_PROBER": "false", "GRUB_INIT_TUNE": ""} +    \
self.defFileOptions={"GRUB_DEFAULT": "0", "GRUB_SAVEDEFAULT": "false", \
"GRUB_HIDDEN_TIMEOUT": "0", "GRUB_TIMEOUT": "3", "GRUB_HIDDEN_TIMEOUT_QUIET": "true", \
"GRUB_DISTRIBUTOR": "`lsb_release -i -s 2> /dev/null || echo Debian`", \
"GRUB_CMDLINE_LINUX_DEFAULT": "\"quiet splash\"", "GRUB_TERMINAL": "", \
"GRUB_GFXMODE": "640x480", "GRUB_DISABLE_LINUX_UUID": "false", \
"GRUB_DISABLE_LINUX_RECOVERY": "\"false\"", "GRUB_BACKGROUND": "", \
                "GRUB_DISABLE_OS_PROBER": "false", "GRUB_INIT_TUNE": ""}
     self.defOtherOptions={"memtest": "true", "memtestpath": "/etc/grub.d/" + \
                self.findMemtest() if self.findMemtest() != None else "none"}
     self.defCurrentColors={"normal": ["white", "black"], "highlight": ["black", \
"light-gray"]}  self.errTable=(i18n("unknown"), i18n("cannot open /etc/default/grub \
for writing"), i18n("cannot chdir to /etc/grub.d"), i18n("cannot open files in \
/etc/grub.d for writing"), i18n("cannot change the execution bit for memtest"), \
i18n("calling update-grub failed"), i18n("cannot set permissions on grub.cfg"), \
i18n("calling grub-install failed"), i18n("cannot change the execution bit for the \
colors script")) @@ -491,7 +491,7 @@ class PyKcm(KCModule):
     else:
       self.ui.label_3.setEnabled(True)
       self.ui.gfxMode.setEnabled(True)
-    self.fileOptions["GRUB_TERMINAL"]="console" if state else "gfxterm"
+    self.fileOptions["GRUB_TERMINAL"]="console" if state else ""
     self.changed()
   
   def updateDisableLinuxUUID(self, state):


[prev in list] [next in list] [prev in thread] [next in thread]