diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-efi.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 400e3a2df8..39ce9f375e 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -47,7 +47,6 @@ class BootimgEFIPlugin(SourcePlugin): | |||
47 | else: | 47 | else: |
48 | splashline = "" | 48 | splashline = "" |
49 | 49 | ||
50 | (rootdev, root_part_uuid) = cr._get_boot_config() | ||
51 | options = cr.ks.handler.bootloader.appendLine | 50 | options = cr.ks.handler.bootloader.appendLine |
52 | 51 | ||
53 | grubefi_conf = "" | 52 | grubefi_conf = "" |
@@ -62,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
62 | kernel = "/bzImage" | 61 | kernel = "/bzImage" |
63 | 62 | ||
64 | if cr.ptable_format in ('msdos', 'gpt'): | 63 | if cr.ptable_format in ('msdos', 'gpt'): |
65 | rootstr = rootdev | 64 | rootstr = cr.rootdev |
66 | else: | 65 | else: |
67 | raise ImageError("Unsupported partition table format found") | 66 | raise ImageError("Unsupported partition table format found") |
68 | 67 | ||
@@ -87,7 +86,6 @@ class BootimgEFIPlugin(SourcePlugin): | |||
87 | install_cmd = "install -d %s/loader/entries" % hdddir | 86 | install_cmd = "install -d %s/loader/entries" % hdddir |
88 | exec_cmd(install_cmd) | 87 | exec_cmd(install_cmd) |
89 | 88 | ||
90 | (rootdev, root_part_uuid) = cr._get_boot_config() | ||
91 | options = cr.ks.handler.bootloader.appendLine | 89 | options = cr.ks.handler.bootloader.appendLine |
92 | 90 | ||
93 | timeout = kickstart.get_timeout(cr.ks) | 91 | timeout = kickstart.get_timeout(cr.ks) |
@@ -107,7 +105,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
107 | kernel = "/bzImage" | 105 | kernel = "/bzImage" |
108 | 106 | ||
109 | if cr.ptable_format in ('msdos', 'gpt'): | 107 | if cr.ptable_format in ('msdos', 'gpt'): |
110 | rootstr = rootdev | 108 | rootstr = cr.rootdev |
111 | else: | 109 | else: |
112 | raise ImageError("Unsupported partition table format found") | 110 | raise ImageError("Unsupported partition table format found") |
113 | 111 | ||