Unbreak console-conf in UC20 images

This commit is contained in:
Dimitri John Ledkov 2019-12-14 03:00:17 +00:00
parent 2ad6f0b2ee
commit d19e405666
2 changed files with 4 additions and 1 deletions

View File

@ -38,6 +38,9 @@ def parse_options(argv):
parser.add_argument('--serial', action='store_true', parser.add_argument('--serial', action='store_true',
dest='run_on_serial', dest='run_on_serial',
help='Run the installer over serial console.') help='Run the installer over serial console.')
parser.add_argument('--ascii', action='store_true',
dest='ascii',
help='Run the installer in ascii mode.')
parser.add_argument('--machine-config', metavar='CONFIG', parser.add_argument('--machine-config', metavar='CONFIG',
dest='machine_config', dest='machine_config',
help="Don't Probe. Use probe data file") help="Don't Probe. Use probe data file")

View File

@ -20,7 +20,6 @@ from probert.network import (
StoredDataObserver, StoredDataObserver,
UdevObserver, UdevObserver,
) )
from probert.storage import Storage
log = logging.getLogger('subiquitycore.prober') log = logging.getLogger('subiquitycore.prober')
@ -49,4 +48,5 @@ class Prober():
if k not in probe_types: if k not in probe_types:
r[k] = {} r[k] = {}
return r return r
from probert.storage import Storage
return Storage().probe(probe_types=probe_types) return Storage().probe(probe_types=probe_types)