aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pygrub
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-08-21 17:11:40 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-08-21 17:11:40 +0100
commit8fac45ee6eefb88c2e829d011c2528d9e0cf7d5c (patch)
tree6ed60e2a25e1142e5fa744f04ce8afaf1b8563f7 /tools/pygrub
parenta8f634b0a32223ab864169b5dbf81f6c71a49e07 (diff)
downloadxen-8fac45ee6eefb88c2e829d011c2528d9e0cf7d5c.tar.gz
xen-8fac45ee6eefb88c2e829d011c2528d9e0cf7d5c.tar.bz2
xen-8fac45ee6eefb88c2e829d011c2528d9e0cf7d5c.zip
pygrub: Fix elilo handling after password patch.
Signed-off-by: Michal Novotny <minovotn@redhat.com>
Diffstat (limited to 'tools/pygrub')
-rw-r--r--tools/pygrub/src/GrubConf.py2
-rw-r--r--tools/pygrub/src/LiloConf.py6
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py
index 55da6f6055..7d7652f945 100644
--- a/tools/pygrub/src/GrubConf.py
+++ b/tools/pygrub/src/GrubConf.py
@@ -219,7 +219,7 @@ class GrubConfigFile(object):
try:
getattr(self, self.commands['password'])
return True
- except KeyError, e:
+ except:
return False
def checkPassword(self, password):
diff --git a/tools/pygrub/src/LiloConf.py b/tools/pygrub/src/LiloConf.py
index 9d69a9446b..8f029571cf 100644
--- a/tools/pygrub/src/LiloConf.py
+++ b/tools/pygrub/src/LiloConf.py
@@ -138,6 +138,12 @@ class LiloConfigFile(object):
if len(img) > 0:
self.add_image(LiloImage(img, path))
+ def hasPassword(self):
+ return False
+
+ def hasPasswordAccess(self):
+ return True
+
def add_image(self, image):
self.images.append(image)