Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
batsim
batsim
Commits
85ae988a
Commit
85ae988a
authored
Jun 16, 2017
by
Michael Mercier
Committed by
Millian Poquet
Jun 21, 2017
Browse files
Fix ci environment bootloader issue
(cherry picked from commit
3bbed531
)
parent
37350b67
Changes
1
Hide whitespace changes
Inline
Side-by-side
environments/default/steps/data/helpers/create_appliance.py
View file @
85ae988a
...
...
@@ -214,13 +214,19 @@ def create_disk(input_, output_filename, fmt, size, filesystem, verbose):
if
proc
.
returncode
:
raise
subprocess
.
CalledProcessError
(
proc
.
returncode
,
' '
.
join
(
cmd
))
mkfs_options
=
""
# Fix syslinux 6.03 compat for ext4 64bit, see:
# http://www.syslinux.org/wiki/index.php?title=Filesystem#ext
if
"ext4"
in
filesystem
:
mkfs_options
=
"features:^64bit"
# parition disk and create the filesystem
script
=
"""
echo "[guestfish] Create new MBR partition table on /dev/sda"
part-disk /dev/sda mbr
echo "[guestfish] Create %s filesystem on /dev/sda1"
mkfs %s /dev/sda1
"""
%
(
filesystem
,
filesystem
)
echo "[guestfish] Create {filesystem} filesystem on /dev/sda1"
mkfs {filesystem} /dev/sda1 {mkfs_options}
"""
.
format
(
filesystem
=
filesystem
,
mkfs_options
=
mkfs_options
)
run_guestfish_script
(
output_filename
,
script
,
mount
=
False
)
# Fill disk with our data
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment