From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MIL9o-0007Lw-77 for mharc-grub-devel@gnu.org; Sun, 21 Jun 2009 07:24:20 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MIL9m-0007JZ-8w for grub-devel@gnu.org; Sun, 21 Jun 2009 07:24:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MIL9h-0007HF-O0 for grub-devel@gnu.org; Sun, 21 Jun 2009 07:24:17 -0400 Received: from [199.232.76.173] (port=37000 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MIL9h-0007HC-Ir for grub-devel@gnu.org; Sun, 21 Jun 2009 07:24:13 -0400 Received: from aybabtu.com ([69.60.117.155]:45283) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MIL9h-0000wD-6O for grub-devel@gnu.org; Sun, 21 Jun 2009 07:24:13 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MIK6o-00034b-3D for grub-devel@gnu.org; Sun, 21 Jun 2009 12:17:10 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MIL9e-0007HS-CO for grub-devel@gnu.org; Sun, 21 Jun 2009 13:24:10 +0200 Date: Sun, 21 Jun 2009 13:24:10 +0200 From: Robert Millan To: The development of GRUB 2 Message-ID: <20090621112410.GE27710@thorin> References: <20090617112323.GZ7367@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090617112323.GZ7367@riva.ucam.org> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1) Subject: Re: [PATCH] Support GRUB_DISABLE_LINUX_RECOVERY X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2009 11:24:18 -0000 Committed, as this is small enough not to be copyright-significant. Btw, Colin please use inline attachments in the future. It makes it easier to manage. On Wed, Jun 17, 2009 at 12:23:23PM +0100, Colin Watson wrote: > This patch fixes > https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/190207. > > Index: ChangeLog > =================================================================== > --- ChangeLog (revision 2335) > +++ ChangeLog (working copy) > @@ -1,5 +1,10 @@ > +2009-06-17 Colin Watson > + > + * util/grub-mkconfig.in (GRUB_DISABLE_LINUX_RECOVERY): Export > + variable. > + * util/grub.d/10_linux.in: If GRUB_DISABLE_LINUX_RECOVERY is true, > + don't write a menu entry for recovery mode. > + > 2009-06-17 Colin Watson > > * util/elf/grub-mkimage.c (usage): Prefix each option line with two > Index: util/grub-mkconfig.in > =================================================================== > --- util/grub-mkconfig.in (revision 2335) > +++ util/grub-mkconfig.in (working copy) > @@ -173,7 +173,7 @@ > export GRUB_DEVICE GRUB_DEVICE_UUID GRUB_DEVICE_BOOT GRUB_DEVICE_BOOT_UUID GRUB_FS GRUB_FONT_PATH GRUB_PRELOAD_MODULES > > # These are optional, user-defined variables. > -export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_GFXMODE > +export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_DISABLE_LINUX_RECOVERY GRUB_GFXMODE > > if test "x${grub_cfg}" != "x"; then > rm -f ${grub_cfg}.new > Index: util/grub.d/10_linux.in > =================================================================== > --- util/grub.d/10_linux.in (revision 2335) > +++ util/grub.d/10_linux.in (working copy) > @@ -143,8 +143,10 @@ > > linux_entry "${OS}, Linux ${version}" \ > "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" > - linux_entry "${OS}, Linux ${version} (recovery mode)" \ > - "single ${GRUB_CMDLINE_LINUX}" > + if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then > + linux_entry "${OS}, Linux ${version} (recovery mode)" \ > + "single ${GRUB_CMDLINE_LINUX}" > + fi > > list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` > done > > Thanks, > > -- > Colin Watson [cjwatson@ubuntu.com] > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/grub-devel > -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."