StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve a few log messages and file paths

This commit is contained in:
Michael Hudson-Doyle 2022-11-29 15:04:28 +13:00
parent fa0aa32117
commit b90419af41
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subiquity/server/controllers/filesystem.py
View File

@ -208,6 +208,11 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
if self._system.storage_encryption.support == \ if self._system.storage_encryption.support == \
StorageEncryptionSupport.DEFECTIVE: StorageEncryptionSupport.DEFECTIVE:
self._core_boot_classic_error = system_defective_encryption_text 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() @with_context()
async def apply_autoinstall_config(self, context=None): async def apply_autoinstall_config(self, context=None):

4
subiquity/server/controllers/install.py
View File

@ -266,7 +266,7 @@ class InstallController(SubiquityController):
self.acquire_filesystem_config, self.acquire_filesystem_config,
mode=ActionRenderMode.DEVICES), mode=ActionRenderMode.DEVICES),
cls=CurtinPartitioningStep, cls=CurtinPartitioningStep,
device_map_path=logs_dir / "device-map.json", device_map_path=logs_dir / "device-map-partition.json",
).run, ).run,
) )
if fs_controller.use_tpm: if fs_controller.use_tpm:
@ -278,7 +278,7 @@ class InstallController(SubiquityController):
self.acquire_filesystem_config, self.acquire_filesystem_config,
mode=ActionRenderMode.FORMAT_MOUNT), mode=ActionRenderMode.FORMAT_MOUNT),
cls=CurtinPartitioningStep, cls=CurtinPartitioningStep,
device_map_path=logs_dir / "device-map.json", device_map_path=logs_dir / "device-map-format.json",
).run, ).run,
make_curtin_step( make_curtin_step(
name="extract", stages=["extract"], name="extract", stages=["extract"],

2
subiquity/server/controllers/refresh.py
View File

@ -149,7 +149,7 @@ class RefreshController(SubiquityController):
expected_channel = 'stable/ubuntu-' + info['release'] expected_channel = 'stable/ubuntu-' + info['release']
if source == SnapChannelSource.DISK_INFO_FILE \ if source == SnapChannelSource.DISK_INFO_FILE \
and snap.channel != expected_channel: 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") "on .disk/info")
return return
desc = "switching {} to {}".format(self.snap_name, channel) desc = "switching {} to {}".format(self.snap_name, channel)