Improved ppc support for koan

[James Laska]

The following small patches make koan --replace-self work on my IBM Power5 systems.  While
in there, I've added similar options to allow the s390* bootloader (aka zipl) to
function properly.

Comments welcome.

Thanks,
James

[PATCH] Drop requirement on syslinux, and remove ExcludeArch: ppc

[James Laska]

From: James Laska <jlaska(a)dell-t5400.test.redhat.com&gt;

---
 koan.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/koan.spec b/koan.spec
index 4fef3b7..3f7b1ab 100644
--- a/koan.spec
+++ b/koan.spec
@@ -8,7 +8,6 @@ Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
 Requires: mkinitrd
-Requires: syslinux
 Requires: python >= 2.2
 BuildRequires: python-devel
 %if 0%{?fedora} >= 8
@@ -18,7 +17,6 @@ BuildRequires: python-setuptools
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-ExcludeArch: ppc
 ExcludeArch: ppc64
 Url: http://cobbler.et.redhat.com/
 
-- 
1.6.0.3

[PATCH] Drop requirement on syslinux, and remove ExcludeArch: ppc

[Michael DeHaan]

James Laska wrote:
>  From: James Laska <jlaska(a)dell-t5400.test.redhat.com&gt;
>
>  ---
>   koan.spec |    2 --
>   1 files changed, 0 insertions(+), 2 deletions(-)
>
>  diff --git a/koan.spec b/koan.spec
>  index 4fef3b7..3f7b1ab 100644
>  --- a/koan.spec
>  +++ b/koan.spec
>  @@ -8,7 +8,6 @@ Source0: %{name}-%{version}.tar.gz
>   License: GPLv2+
>   Group: Applications/System
>   Requires: mkinitrd
>  -Requires: syslinux
>   Requires: python >= 2.2
>   BuildRequires: python-devel
>   %if 0%{?fedora} >= 8
>  @@ -18,7 +17,6 @@ BuildRequires: python-setuptools
>   %endif
>   BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
>   BuildArch: noarch
>  -ExcludeArch: ppc
>   ExcludeArch: ppc64
>   Url: http://cobbler.et.redhat.com/
>   
>     
Applied to devel, do you think with the other patch applied ppc64 is 
also functional? Is so we can remove that as well.

Thanks!

--Michael

[PATCH] Improved support for ppc* and s390* systems. Use --yaboot or --zipl grubby args when appropriate. Call /sbin/zipl or /sbin/ybin when appropriate.

[James Laska]

From: James Laska <jlaska(a)dell-t5400.test.redhat.com&gt;

---
 koan/app.py |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/koan/app.py b/koan/app.py
index f5f982f..bdd8a22 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -695,19 +695,38 @@ class Koan:
                cmd.append("--boot-filesystem=/dev/sda1")
                cmd.append("--config-file=/tmp/boot/boot/grub/grub.conf")
                #
utils.subprocess_call(["/sbin/grubby","--remove-kernel","/boot/vmlinuz"])
-            utils.subprocess_call(cmd)
 
+            # Are we running on ppc?
+            arch_cmd = sub_process.Popen("/bin/uname -m",
stdout=sub_process.PIPE, shell=True)
+            uname_str = arch_cmd.communicate()[0]
+            if uname_str.startswith("ppc"):
+               cmd.append("--yaboot")
+            elif uname_str.startswith("s390"):
+               cmd.append("--zipl")
+
+            utils.subprocess_call(cmd)
 
-            # if grubby --bootloader-probe returns lilo,
-            #    apply lilo changes
-            cmd = [ "/sbin/grubby", "--bootloader-probe" ]
-            probe_process = sub_process.Popen(cmd, stdout=sub_process.PIPE)
-            which_loader = probe_process.communicate()[0]
-            if probe_process.returncode == 0 and \
-                   which_loader.find("lilo") != -1:
-                print "- applying lilo changes"
-                cmd = [ "/sbin/lilo" ]
+            # Any post-grubby processing required (e.g. ybin, zipl, lilo)?
+            if uname_str.startswith("ppc"):
+                # FIXME - CHRP hardware uses a 'PPC PReP Boot' partition and
doesn't require running ybin
+                print "- applying ybin changes"
+                cmd = [ "/sbin/ybin" ]
                 sub_process.Popen(cmd, stdout=sub_process.PIPE).communicate()[0]
+            elif uname_str.startswith("s390"):
+                print "- applying zipl changes"
+                cmd = [ "/sbin/zipl" ]
+                sub_process.Popen(cmd, stdout=sub_process.PIPE).communicate()[0]
+            else:
+                # if grubby --bootloader-probe returns lilo,
+                #    apply lilo changes
+                cmd = [ "/sbin/grubby", "--bootloader-probe" ]
+                probe_process = sub_process.Popen(cmd, stdout=sub_process.PIPE)
+                which_loader = probe_process.communicate()[0]
+                if probe_process.returncode == 0 and \
+                       which_loader.find("lilo") != -1:
+                    print "- applying lilo changes"
+                    cmd = [ "/sbin/lilo" ]
+                    sub_process.Popen(cmd, stdout=sub_process.PIPE).communicate()[0]
 
             if not self.add_reinstall_entry:
                 print "- reboot to apply changes"
-- 
1.6.0.3

[PATCH] Improved support for ppc* and s390* systems. Use --yaboot or --zipl grubby args when appropriate. Call /sbin/zipl or /sbin/ybin when appropriate.

[Michael DeHaan]

James Laska wrote:
>  From: James Laska <jlaska(a)dell-t5400.test.redhat.com&gt;
>
>  ---
>   koan/app.py |   39 +++++++++++++++++++++++++++++----------
>   1 files changed, 29 insertions(+), 10 deletions(-)
>
>  diff --git a/koan/app.py b/koan/app.py
>  index f5f982f..bdd8a22 100755
>  --- a/koan/app.py
>  +++ b/koan/app.py
>  @@ -695,19 +695,38 @@ class Koan:
>                  cmd.append("--boot-filesystem=/dev/sda1")
>                  cmd.append("--config-file=/tmp/boot/boot/grub/grub.conf")
>                  #
> utils.subprocess_call(["/sbin/grubby","--remove-kernel","/boot/vmlinuz"])
>  -            utils.subprocess_call(cmd)
>   
>  +            # Are we running on ppc?
>  +            arch_cmd = sub_process.Popen("/bin/uname -m",
> stdout=sub_process.PIPE, shell=True)
>  +            uname_str = arch_cmd.communicate()[0]
>  +            if uname_str.startswith("ppc"):
>  +               cmd.append("--yaboot")
>  +            elif uname_str.startswith("s390"):
>  +               cmd.append("--zipl")
>  +
>  +            utils.subprocess_call(cmd)
>   
>  -            # if grubby --bootloader-probe returns lilo,
>  -            #    apply lilo changes
>  -            cmd = [ "/sbin/grubby", "--bootloader-probe" ]
>  -            probe_process = sub_process.Popen(cmd, stdout=sub_process.PIPE)
>  -            which_loader = probe_process.communicate()[0]
>  -            if probe_process.returncode == 0 and \
>  -                   which_loader.find("lilo") != -1:
>  -                print "- applying lilo changes"
>  -                cmd = [ "/sbin/lilo" ]
>  +            # Any post-grubby processing required (e.g. ybin, zipl, lilo)?
>  +            if uname_str.startswith("ppc"):
>  +                # FIXME - CHRP hardware uses a 'PPC PReP Boot' partition and
> doesn't require running ybin
>  +                print "- applying ybin changes"
>  +                cmd = [ "/sbin/ybin" ]
>                   sub_process.Popen(cmd, stdout=sub_process.PIPE).communicate()[0]
>  +            elif uname_str.startswith("s390"):
>  +                print "- applying zipl changes"
>  +                cmd = [ "/sbin/zipl" ]
>  +                sub_process.Popen(cmd, stdout=sub_process.PIPE).communicate()[0]
>  +            else:
>  +                # if grubby --bootloader-probe returns lilo,
>  +                #    apply lilo changes
>  +                cmd = [ "/sbin/grubby", "--bootloader-probe" ]
>  +                probe_process = sub_process.Popen(cmd, stdout=sub_process.PIPE)
>  +                which_loader = probe_process.communicate()[0]
>  +                if probe_process.returncode == 0 and \
>  +                       which_loader.find("lilo") != -1:
>  +                    print "- applying lilo changes"
>  +                    cmd = [ "/sbin/lilo" ]
>  +                    sub_process.Popen(cmd, stdout=sub_process.PIPE).communicate()[0]
>   
>               if not self.add_reinstall_entry:
>                   print "- reboot to apply changes"
>     
Outstanding, thanks very much!

This has been applied to devel.

(If folks have s390 and ppc hardware and would like to test this, please 
do... import doesn't do ppc just yet though James has a patch incoming.)

--Michael