NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

virtinst: Use isoinfo to extract files from ISOs and block devices

Browse Source
This commit is contained in:
Andrew Wong 2017-11-24 00:11:14 -05:00 committed by Cole Robinson
parent 23c9dd3ee7
commit a7aa02ffa9
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
virtinst/urlfetcher.py
View File

@ -25,7 +25,6 @@ import io
import logging import logging
import os import os
import re import re
import stat
import subprocess import subprocess
import tempfile import tempfile
import urllib2 import urllib2
@ -302,14 +301,7 @@ class _MountedURLFetcher(_LocalURLFetcher):
mountcmd = "/bin/mount" mountcmd = "/bin/mount"
logging.debug("Preparing mount at " + self._srcdir) logging.debug("Preparing mount at " + self._srcdir)
if self.location.startswith("nfs:"): cmd = [mountcmd, "-o", "ro", self.location[4:], self._srcdir]
cmd = [mountcmd, "-o", "ro", self.location[4:], self._srcdir]
else:
if stat.S_ISBLK(os.stat(self.location)[stat.ST_MODE]):
mountopt = "ro"
else:
mountopt = "ro,loop"
cmd = [mountcmd, "-o", mountopt, self.location, self._srcdir]
logging.debug("mount cmd: %s", cmd) logging.debug("mount cmd: %s", cmd)
if not self._in_test_suite: if not self._in_test_suite:
@ -338,6 +330,38 @@ class _MountedURLFetcher(_LocalURLFetcher):
self._mounted = False self._mounted = False
class _ISOURLFetcher(_URLFetcher):
_cache_file_list = None
def _make_full_url(self, filename):
return "/" + filename
def _grabber(self, url):
"""
Use isoinfo to grab the file
"""
cmd = ["isoinfo", "-J", "-i", self.location, "-x", url]
logging.debug("Running isoinfo: %s", cmd)
output = subprocess.check_output(cmd)
return io.BytesIO(output), len(output)
def _hasFile(self, url):
"""
Use isoinfo to list and search for the file
"""
if not self._cache_file_list:
cmd = ["isoinfo", "-J", "-i", self.location, "-f"]
logging.debug("Running isoinfo: %s", cmd)
output = subprocess.check_output(cmd)
self._cache_file_list = output.splitlines(False)
return url in self._cache_file_list
def fetcherForURI(uri, *args, **kwargs): def fetcherForURI(uri, *args, **kwargs):
if uri.startswith("http://") or uri.startswith("https://"): if uri.startswith("http://") or uri.startswith("https://"):
fclass = _HTTPURLFetcher fclass = _HTTPURLFetcher
@ -349,8 +373,8 @@ def fetcherForURI(uri, *args, **kwargs):
# Pointing to a local tree # Pointing to a local tree
fclass = _LocalURLFetcher fclass = _LocalURLFetcher
else: else:
# Pointing to a path, like an .iso to mount # Pointing to a path (e.g. iso), or a block device (e.g. /dev/cdrom)
fclass = _MountedURLFetcher fclass = _ISOURLFetcher
return fclass(uri, *args, **kwargs) return fclass(uri, *args, **kwargs)