Merge pull request #1498 from mwhudson/better-logs
improve a few log messages and file paths
This commit is contained in:
commit
6bb8baee59
|
@ -222,6 +222,11 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
|
|||
if self._system.storage_encryption.support == \
|
||||
StorageEncryptionSupport.DEFECTIVE:
|
||||
self._core_boot_classic_error = system_defective_encryption_text
|
||||
if self._system.storage_encryption.support == \
|
||||
StorageEncryptionSupport.UNAVAILABLE:
|
||||
log.debug(
|
||||
"storage encryption unavailable: %r",
|
||||
self._system.storage_encryption.unavailable_reason)
|
||||
|
||||
@with_context()
|
||||
async def apply_autoinstall_config(self, context=None):
|
||||
|
|
|
@ -266,7 +266,7 @@ class InstallController(SubiquityController):
|
|||
self.acquire_filesystem_config,
|
||||
mode=ActionRenderMode.DEVICES),
|
||||
cls=CurtinPartitioningStep,
|
||||
device_map_path=logs_dir / "device-map.json",
|
||||
device_map_path=logs_dir / "device-map-partition.json",
|
||||
).run,
|
||||
)
|
||||
if fs_controller.use_tpm:
|
||||
|
@ -278,7 +278,7 @@ class InstallController(SubiquityController):
|
|||
self.acquire_filesystem_config,
|
||||
mode=ActionRenderMode.FORMAT_MOUNT),
|
||||
cls=CurtinPartitioningStep,
|
||||
device_map_path=logs_dir / "device-map.json",
|
||||
device_map_path=logs_dir / "device-map-format.json",
|
||||
).run,
|
||||
make_curtin_step(
|
||||
name="extract", stages=["extract"],
|
||||
|
|
|
@ -149,7 +149,7 @@ class RefreshController(SubiquityController):
|
|||
expected_channel = 'stable/ubuntu-' + info['release']
|
||||
if source == SnapChannelSource.DISK_INFO_FILE \
|
||||
and snap.channel != expected_channel:
|
||||
log.debug(f"snap tracking {expected_channel}, not resetting based "
|
||||
log.debug(f"snap tracking {snap.channel}, not resetting based "
|
||||
"on .disk/info")
|
||||
return
|
||||
desc = "switching {} to {}".format(self.snap_name, channel)
|
||||
|
|
Loading…
Reference in New Issue