[rhel7] We can't trust rhcrashkernel-param to give us newline-free text.

[Peter Jones]

Related: rhbz#814813

Signed-off-by: Peter Jones 
---
 pyanaconda/bootloader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 24837ae..02ef667 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -943,7 +943,7 @@ class BootLoader(object):
                                         stdin=pread,
                                         root=ROOT_PATH)
             os.close(pread)
-        self.boot_args.add(buf)
+        self.boot_args.add(buf.replace('\n', ' ')

def write_config(self):
         """ Write the bootloader configuration. """

[Martin Kolman]

On Tue, 2014-02-25 at 10:34 -0500, Peter Jones wrote:
> Related: rhbz#814813
> Signed-off-by: Peter Jones
>
> pyanaconda/bootloader.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 24837ae..02ef667 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -943,7 +943,7 @@ class BootLoader(object):
>                                          stdin=pread,
>                                          root=ROOT_PATH)
>              os.close(pread)
>    self.boot_args.add(buf)
>    self.boot_args.add(buf.replace('\n', ' ')
>
> def write_config(self):
>        """ Write the bootloader configuration. """

Looks fine, ack.