[PATCH] Don't care about crash args in bootloader (#1116323)

Martin Kolman mkolman at redhat.com
Fri Sep 5 08:59:44 UTC 2014


On Fri, 2014-09-05 at 10:04 +0200, Vratislav Podzimek wrote:
> The kdump-anaconda-addon now takes care about that stuff.
> 
> Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
> ---
>  pyanaconda/bootloader.py | 16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index f82d068..c31c0bf 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -927,25 +927,11 @@ class BootLoader(object):
>          except OSError as e:
>              log.error("failed to set config file permissions: %s", e)
>  
> -    def add_crash_args(self):
> -        buf = ""
> -        if os.access("%s%s" % (iutil.getSysroot(), "/usr/sbin/rhcrashkernel-param"), \
> -                     os.X_OK):
> -            (pread, pwrite) = os.pipe()
> -            os.close(pwrite)
> -            buf = iutil.execWithCapture("/usr/sbin/rhcrashkernel-param", [],
> -                                        stdin=pread,
> -                                        root=iutil.getSysroot())
> -            os.close(pread)
> -        self.boot_args.add(buf.replace('\n', ' '))
> -
>      def write_config(self):
>          """ Write the bootloader configuration. """
>          if not self.config_file:
>              raise BootLoaderError("no config file defined for this boot loader")
>  
> -        self.add_crash_args()
> -
>          config_path = os.path.normpath(iutil.getSysroot() + self.config_file)
>          if os.access(config_path, os.R_OK):
>              os.rename(config_path, config_path + ".anacbak")
> @@ -1545,8 +1531,6 @@ class GRUB2(GRUB):
>          os.chmod(users_file, 0o700)
>  
>      def write_config(self):
> -        self.add_crash_args()
> -
>          self.write_config_console(None)
>          # See if we have a password and if so update the boot args before we
>          # write out the defaults file.
Looks good, ACK!




More information about the anaconda-patches mailing list