diff options
| -rwxr-xr-x | morphlib/exts/rawdisk.write | 7 | ||||
| -rw-r--r-- | morphlib/writeexts.py | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write index 87edf7bf..1c2c5a84 100755 --- a/morphlib/exts/rawdisk.write +++ b/morphlib/exts/rawdisk.write @@ -85,11 +85,12 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): else: # we are upgrading and old system that does # not have an updated extlinux config file - if self.bootloader_is_wanted(): - self.install_extlinux(mp) + if self.bootloader_config_is_wanted(): + self.generate_bootloader_config(mp) + self.install_bootloader(mp) os.symlink(version_label, default_path) - if self.bootloader_is_wanted(): + if self.bootloader_config_is_wanted(): self.install_kernel(version_root, temp_root) self.unmount(mp) diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index 863a9351..c3605b1c 100644 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -444,7 +444,8 @@ class WriteExtension(cliapp.Application): 'rootfstype=btrfs ' # required when using initramfs, also boots # faster when specified without initramfs 'rootflags=subvol=systems/default/run ') # boot runtime subvol - kernel_args += 'root=%s ' % (self.get_root_device() if disk_uuid is None + kernel_args += 'root=%s ' % (self.get_root_device() + if disk_uuid is None else 'UUID=%s' % disk_uuid) kernel_args += self.get_extra_kernel_args() with open(config, 'w') as f: |