Re: [master] Rectify /etc/default/grub with what's in the package.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, May 10, 2012 at 09:48:43AM -0400, Peter Jones wrote:
> This is step one of two - step two is removing the file from the
> package.
> ---
>  pyanaconda/bootloader.py |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 9dd6602..5246a80 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -1737,7 +1737,7 @@ class GRUB2(GRUB):
>          defaults_file = "%s%s" % (ROOT_PATH, self.defaults_file)
>          defaults = open(defaults_file, "w+")
>          defaults.write("GRUB_TIMEOUT=%d\n" % self.timeout)
> -        defaults.write("GRUB_DISTRIBUTOR=\"%s\"\n" % productName)
> +        defaults.write("GRUB_DISTRIBUTOR=\"$(sed 's, release .*$,,g' /etc/system-release)\""))
>          defaults.write("GRUB_DEFAULT=saved\n")
>          if self.console and self.console.startswith("ttyS"):
>              defaults.write("GRUB_TERMINAL=\"serial console\"\n")
> @@ -1748,6 +1748,7 @@ class GRUB2(GRUB):
>          # boot arguments
>          log.info("bootloader.py: used boot args: %s " % self.boot_args)
>          defaults.write("GRUB_CMDLINE_LINUX=\"%s\"\n" % self.boot_args)
> +        defaults.write("GRUB_DISABLE_RECOVERY=\"true\"")
>          defaults.write("GRUB_THEME=\"/boot/grub2/themes/system/theme.txt\"")
>          defaults.close()
>  
> -- 
> 1.7.10.1

Ack

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)

Attachment: pgpMVjSrsYtBa.pgp
Description: PGP signature

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux