summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/__init__.py1
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py3
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py1
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 @@
1from micpartition import Mic_Partition 1from micpartition import Mic_Partition
2from micpartition import Mic_PartData 2from micpartition import Mic_PartData
3from partition import Wic_Partition 3from partition import Wic_Partition
4from 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 @@
27import os 27import os
28import shutil 28import shutil
29 29
30from wic.utils.errors import ImageError
30from wic import kickstart, msger 31from wic import kickstart, msger
31from wic.utils import misc, fs_related, errors, runner, cmdln 32from wic.utils import misc, fs_related, errors, runner, cmdln
32from wic.conf import configmgr 33from 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
27import os 27import os
28 28
29from wic.utils.errors import ImageError
29from wic import kickstart, msger 30from wic import kickstart, msger
30from wic.utils import misc, fs_related, errors, runner, cmdln 31from wic.utils import misc, fs_related, errors, runner, cmdln
31from wic.conf import configmgr 32from wic.conf import configmgr