Merge pull request #320 from SUSE/fix_update_bootloader_path

Fix update bootloader

Author: schaefi

helper/service.tree

@@ -1,8 +1,8 @@
 suse-migration-mount-system -> [
     suse-migration-ssh-keys,
     suse-migration-pre-checks,
-    suse-migration-post-mount-system.service -> suse-migration-setup-host-network -> suse-migration-prepare -> [
+    suse-migration-btrfs-snapshot-pre-migration -> suse-migration-post-mount-system -> suse-migration-setup-host-network -> suse-migration-prepare -> [
         suse-migration-console-log,
-        suse-migration-product-setup -> suse-migration -> suse-migration-apparmor-selinux -> suse-migration-grub-setup -> suse-migration-update-bootloader -> suse-migration-regenerate-initrd -> suse-migration-kernel-load -> suse-migration-reboot
+        suse-migration-product-setup -> suse-migration -> suse-migration-apparmor-selinux -> suse-migration-wicked-networkmanager -> suse-migration-btrfs-snapshot-post-migration -> suse-migration-grub-setup -> suse-migration-update-bootloader -> suse-migration-regenerate-initrd -> suse-migration-kernel-load -> suse-migration-reboot
     ]
 ]

suse_migration_services/units/update_bootloader.py

@@ -17,6 +17,7 @@
 #
 """systemd service to install the shim package and update the bootloader"""
 import logging
+import os.path
 
 # project
 from suse_migration_services.command import Command
@@ -38,10 +39,11 @@ def main():
 
     root_path = Defaults.get_system_root_path()
 
-    log.info('Installing the shim package')
-    install_shim_package(root_path)
-    log.info('Updating the shimbootloader')
-    install_secure_bootloader(root_path)
+    if os.path.exists('/sys/firmware/efi'):
+        log.info('Installing the shim package')
+        install_shim_package(root_path)
+        log.info('Updating the shimbootloader')
+        install_secure_bootloader(root_path)
     log.info('Updating the bootloader')
     update_bootloader_config(root_path)
 
@@ -110,13 +112,13 @@ def update_bootloader_config(root_path):
 
     try:
         log.info(
-            'Running chroot {0} update-bootloader --reinit'.format(root_path)
+            'Running chroot {0} /sbin/update-bootloader --reinit'.format(root_path)
         )
         Command.run(
             [
                 'chroot',
                 root_path,
-                'update-bootloader',
+                '/sbin/update-bootloader',
                 '--reinit'
             ]
         )

systemd/suse-migration-btrfs-snapshot-post-migration.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Snapper btrfs snapshot after migration
-After=suse-migration.service
+After=suse-migration.service suse-migration-apparmor-selinux.service suse-migration-wicked-networkmanager.service
 Requisite=suse-migration.service
 Before=suse-migration-grub-setup.service
 ConditionPathExists=/run/suse_migration_snapper_btrfs_pre_snapshot_number

systemd/suse-migration-reboot.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Reboot System
-After=suse-migration-kernel-load.service
+After=suse-migration-kernel-load.service suse-migration-update-bootloader.service
 ConditionKernelCommandLine=!migration.noreboot
 
 [Service]

test/unit/units/update_bootloader_test.py

@@ -114,7 +114,7 @@ def test_main(
                 [
                     'chroot',
                     '/system-root',
-                    'update-bootloader',
+                    '/sbin/update-bootloader',
                     '--reinit'
                 ]
             )