diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/__init__.py | 1 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 3 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/__init__.py b/scripts/lib/wic/kickstart/custom_commands/__init__.py index f84c6d9e00..b4e613de4c 100644 --- a/scripts/lib/wic/kickstart/custom_commands/__init__.py +++ b/scripts/lib/wic/kickstart/custom_commands/__init__.py | |||
@@ -1,6 +1,7 @@ | |||
1 | from micpartition import Mic_Partition | 1 | from micpartition import Mic_Partition |
2 | from micpartition import Mic_PartData | 2 | from micpartition import Mic_PartData |
3 | from partition import Wic_Partition | 3 | from partition import Wic_Partition |
4 | from partition import Wic_PartData | ||
4 | 5 | ||
5 | __all__ = ( | 6 | __all__ = ( |
6 | "Mic_Partition", | 7 | "Mic_Partition", |
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index d6c11ed428..883378ee84 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -27,6 +27,7 @@ | |||
27 | import os | 27 | import os |
28 | import shutil | 28 | import shutil |
29 | 29 | ||
30 | from wic.utils.errors import ImageError | ||
30 | from wic import kickstart, msger | 31 | from wic import kickstart, msger |
31 | from wic.utils import misc, fs_related, errors, runner, cmdln | 32 | from wic.utils import misc, fs_related, errors, runner, cmdln |
32 | from wic.conf import configmgr | 33 | from wic.conf import configmgr |
@@ -72,8 +73,6 @@ class BootimgEFIPlugin(SourcePlugin): | |||
72 | grubefi_conf += "linux %s root=%s rootwait %s\n" \ | 73 | grubefi_conf += "linux %s root=%s rootwait %s\n" \ |
73 | % (kernel, rootstr, options) | 74 | % (kernel, rootstr, options) |
74 | grubefi_conf += "}\n" | 75 | grubefi_conf += "}\n" |
75 | if splashline: | ||
76 | syslinux_conf += "%s\n" % splashline | ||
77 | 76 | ||
78 | msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ | 77 | msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ |
79 | % cr_workdir) | 78 | % cr_workdir) |
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index abb32ebc10..2280867308 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | import os | 27 | import os |
28 | 28 | ||
29 | from wic.utils.errors import ImageError | ||
29 | from wic import kickstart, msger | 30 | from wic import kickstart, msger |
30 | from wic.utils import misc, fs_related, errors, runner, cmdln | 31 | from wic.utils import misc, fs_related, errors, runner, cmdln |
31 | from wic.conf import configmgr | 32 | from wic.conf import configmgr |