gryf/boxpy
1
0
Fork 0
mirror of https://github.com/gryf/boxpy.git synced 2025-12-19 21:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Added other option for mkisofs

Browse Source
This commit is contained in:
gryf
2021-04-08 20:11:57 +02:00
parent 0dded78bd2
commit ecb9c71c5d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
box.py
View File

@@ -4,6 +4,7 @@ import argparse
import os import os
import subprocess import subprocess
import tempfile import tempfile
import shutil
import string import string
import sys import sys
import uuid import uuid
@@ -204,8 +205,10 @@ class VMCreate:
with open(os.path.join(self._tmp, 'user-data'), 'w') as fobj: with open(os.path.join(self._tmp, 'user-data'), 'w') as fobj:
fobj.write(USER_DATA_TPL.substitute({'ssh_key': ssh_pub_key})) fobj.write(USER_DATA_TPL.substitute({'ssh_key': ssh_pub_key}))
mkiso = 'mkisofs' if shutil.which('mkisofs') else 'genisoimage'
# create ISO image # create ISO image
if subprocess.call(['mkisofs', '-J', '-R', '-V', 'cidata', '-o', if subprocess.call([mkiso, '-J', '-R', '-V', 'cidata', '-o',
os.path.join(self._tmp, self.CLOUD_IMAGE), os.path.join(self._tmp, self.CLOUD_IMAGE),
os.path.join(self._tmp, 'user-data'), os.path.join(self._tmp, 'user-data'),
os.path.join(self._tmp, 'meta-data')]) != 0: os.path.join(self._tmp, 'meta-data')]) != 0:
@@ -309,9 +312,6 @@ def main():
default=os.path.expanduser("~/.ssh/id_rsa"), default=os.path.expanduser("~/.ssh/id_rsa"),
help="SSH key to be add to the config drive. Default " help="SSH key to be add to the config drive. Default "
"~/.ssh/id_rsa") "~/.ssh/id_rsa")
completion = subparsers.add_parser('completion')
completion.add_argument('shell', choices=['bash'],
help="pick shell to generate completions for")
args = parser.parse_args() args = parser.parse_args()