From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Novotny Subject: Re: [PATCH] Add password support to pygrub for GRUB bootloader Date: Fri, 21 Aug 2009 15:44:53 +0200 Message-ID: <4A8EA4D5.8080208@redhat.com> References: <4A8D658D.1070406@redhat.com> <4A8E7483.1050001@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080206020505070209050403" Return-path: In-Reply-To: <4A8E7483.1050001@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------080206020505070209050403 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, this patch (applied as http://xenbits.xensource.com/xen-unstable.hg?rev/8f783adc0ee3 , c/s 20099) introduced a problem for Itanium systems using LiloConf. This patch is the fix for elilo. Since I am unable to find information whether eLilo supports password protection or not, this patch makes the entry and command-line editing on IA64 systems as if no patch with c/s 20099 was applied. Also, this version changes the exception trapping from KeyError to every exception because of pyGrub would return no result and tools would complain about that having exception instead of providing data... Michal Signed-off-by: Michal Novotny > Michal Novotny wrote: >> Hi, >> this is the patch to add password support to pygrub for GRUB >> bootloader. It basically checks for the presence of password line in >> grub.conf of the guest image and if this line is present, it supports >> both clear text and md5 versions of the password. Editing the grub >> entries and command-line are disabled when some password is set in >> domain's grub.conf file but the password was not entered yet. Also, >> new option to press 'p' in interactive pygrub has been added to allow >> entering the grub password. It's been tested on x86_64 with PV guests >> and was working fine. Also, the countdown has been stopped after key >> was pressed, ie. the user is probably editing the boot configuration. >> >> Michal >> >> Signed-off-by: Michal Novotny >> ------------------------------------------------------------------------ >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xensource.com >> http://lists.xensource.com/xen-devel > > ------------------------------------------------------------------------ > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel --------------080206020505070209050403 Content-Type: text/x-patch; name="xen-pygrub-password-support-lilo-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xen-pygrub-password-support-lilo-fix.patch" diff -r 7dad2e23bf89 tools/pygrub/src/GrubConf.py --- a/tools/pygrub/src/GrubConf.py Thu Aug 20 22:26:16 2009 +0100 +++ b/tools/pygrub/src/GrubConf.py Fri Aug 21 15:41:27 2009 +0200 @@ -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 -r 7dad2e23bf89 tools/pygrub/src/LiloConf.py --- a/tools/pygrub/src/LiloConf.py Thu Aug 20 22:26:16 2009 +0100 +++ b/tools/pygrub/src/LiloConf.py Fri Aug 21 15:41:27 2009 +0200 @@ -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) --------------080206020505070209050403 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------080206020505070209050403--