|
 |
1070a0 |
diff '--exclude=CVS' '--exclude=.svn' -ur a/koan/app.py b/koan/app.py
|
|
|
1070a0 |
--- a/koan/app.py 2019-03-21 11:35:58.000000000 +0100
|
|
|
1070a0 |
+++ b/koan/app.py 2019-04-15 15:21:12.954548508 +0200
|
|
|
1070a0 |
@@ -786,12 +786,6 @@
|
|
|
1070a0 |
|
|
|
1070a0 |
#---------------------------------------------------
|
|
|
1070a0 |
|
|
|
1070a0 |
- def get_boot_loader_info(self):
|
|
|
1070a0 |
- cmd = [ "/sbin/grubby", "--bootloader-probe" ]
|
|
|
1070a0 |
- probe_process = sub_process.Popen(cmd, stdout=sub_process.PIPE)
|
|
|
1070a0 |
- which_loader = probe_process.communicate()[0].decode()
|
|
|
1070a0 |
- return probe_process.returncode, which_loader
|
|
|
1070a0 |
-
|
|
|
1070a0 |
def replace(self):
|
|
|
1070a0 |
"""
|
|
|
1070a0 |
Handle morphing an existing system through downloading new
|
|
|
1070a0 |
@@ -862,10 +856,6 @@
|
|
|
1070a0 |
if self.grubby_copy_default:
|
|
|
1070a0 |
cmd.append("--copy-default")
|
|
|
1070a0 |
|
|
|
1070a0 |
- boot_probe_ret_code, probe_output = self.get_boot_loader_info()
|
|
|
1070a0 |
- if boot_probe_ret_code == 0 and probe_output.find("lilo") >= 0:
|
|
|
1070a0 |
- cmd.append("--lilo")
|
|
|
1070a0 |
-
|
|
|
1070a0 |
if self.add_reinstall_entry:
|
|
|
1070a0 |
cmd.append("--title=Reinstall")
|
|
|
1070a0 |
else:
|
|
|
1070a0 |
@@ -879,10 +869,7 @@
|
|
|
1070a0 |
|
|
|
1070a0 |
# Are we running on ppc?
|
|
|
1070a0 |
if arch.startswith("ppc"):
|
|
|
1070a0 |
- if "grub2" in probe_output:
|
|
|
1070a0 |
- cmd.append("--grub2")
|
|
|
1070a0 |
- else:
|
|
|
1070a0 |
- cmd.append("--yaboot")
|
|
|
1070a0 |
+ cmd.append("--grub2")
|
|
|
1070a0 |
elif arch.startswith("s390"):
|
|
|
1070a0 |
cmd.append("--zipl")
|
|
|
1070a0 |
|
|
|
1070a0 |
@@ -900,22 +887,10 @@
|
|
|
1070a0 |
utils.subprocess_call(cmd)
|
|
|
1070a0 |
|
|
|
1070a0 |
# Any post-grubby processing required (e.g. ybin, zipl, lilo)?
|
|
|
1070a0 |
- if arch.startswith("ppc") and "grub2" not in probe_output:
|
|
|
1070a0 |
- # FIXME - CHRP hardware uses a 'PPC PReP Boot' partition and doesn't require running ybin
|
|
|
1070a0 |
- print("- applying ybin changes")
|
|
|
1070a0 |
- cmd = [ "/sbin/ybin" ]
|
|
|
1070a0 |
- utils.subprocess_call(cmd)
|
|
|
1070a0 |
- elif arch.startswith("s390"):
|
|
|
1070a0 |
+ if arch.startswith("s390"):
|
|
|
1070a0 |
print("- applying zipl changes")
|
|
|
1070a0 |
cmd = [ "/sbin/zipl" ]
|
|
|
1070a0 |
utils.subprocess_call(cmd)
|
|
|
1070a0 |
- else:
|
|
|
1070a0 |
- # if grubby --bootloader-probe returns lilo,
|
|
|
1070a0 |
- # apply lilo changes
|
|
|
1070a0 |
- if boot_probe_ret_code == 0 and probe_output.find("lilo") != -1:
|
|
|
1070a0 |
- print("- applying lilo changes")
|
|
|
1070a0 |
- cmd = [ "/sbin/lilo" ]
|
|
|
1070a0 |
- utils.subprocess_call(cmd)
|
|
|
1070a0 |
|
|
|
1070a0 |
if not self.add_reinstall_entry:
|
|
|
1070a0 |
print("- reboot to apply changes")
|