From 2b11765c6ebea4ddfc0b69a868bc9f2474809ef8 Mon Sep 17 00:00:00 2001 From: Seth Grover Date: Thu, 21 Mar 2024 08:58:08 -0600 Subject: [PATCH] testing idaholab/Malcolm#266, Malcolm ISO should format bigger drives for index and artifact storage --- scripts/install.py | 4 ++-- shared/bin/os-disk-config.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install.py b/scripts/install.py index 180138cd0..969367cd6 100755 --- a/scripts/install.py +++ b/scripts/install.py @@ -862,12 +862,12 @@ def tweak_malcolm_runtime(self, malcolm_install_path): # directories for data volume mounts (PCAP storage, Zeek log storage, OpenSearch indexes, etc.) - # if the file .os_disk_config_defaults was created by the environment (os-disk-config.py) + # if the file .os-disk-config-defaults was created by the environment (os-disk-config.py) # we'll use those as defaults, otherwise base things underneath the malcolm_install_path diskFormatInfo = {} try: diskFormatInfoFile = os.path.join( - os.path.realpath(os.path.join(ScriptPath, "..")), ".os_disk_config_defaults" + os.path.realpath(os.path.join(ScriptPath, "..")), ".os-disk-config-defaults" ) if os.path.isfile(diskFormatInfoFile): with open(diskFormatInfoFile) as f: diff --git a/shared/bin/os-disk-config.py b/shared/bin/os-disk-config.py index 6a9c714cf..de3eac097 100644 --- a/shared/bin/os-disk-config.py +++ b/shared/bin/os-disk-config.py @@ -727,8 +727,8 @@ def main(): print(line) elif (osMode == OS_MODE_MALCOLM) and os.path.isdir(os.path.join(ownerHome, 'Malcolm')): - # write .os_disk_config_defaults for to be picked up by install.py - configFilePath = os.path.join(os.path.join(ownerHome, 'Malcolm'), '.os_disk_config_defaults') + # write .os-disk-config-defaults for to be picked up by install.py + configFilePath = os.path.join(os.path.join(ownerHome, 'Malcolm'), '.os-disk-config-defaults') createdUserDirsFull = None if os.path.isfile(configFilePath): with open(configFilePath, 'r') as f: