working on idaholab#266, Malcolm ISO should format bigger drives for …

…index and artifact storage, NOT DONE YET
mmguero-dev · Mar 20, 2024 · dd9b376 · dd9b376
1 parent ba30292
commit dd9b376
Show file tree

Hide file tree

Showing 3 changed files with 160 additions and 90 deletions.
diff --git a/hedgehog-iso/config/hooks/normal/0900-setup-rc-local.hook.chroot b/hedgehog-iso/config/hooks/normal/0900-setup-rc-local.hook.chroot
@@ -16,8 +16,8 @@ else
 fi
 if [ -f "$CAPTURE_STORAGE_FORMAT_FILE" ]; then
   logger "Initializing disk(s) to store captured artifacts"
-  date >>/var/log/sensor-capture-disk-config.log 2>&1
-  python3 /usr/local/bin/sensor-capture-disk-config.py -u $CAPTURE_STORAGE_FORMAT_FLAG >>/var/log/sensor-capture-disk-config.log 2>&1
+  date >>/var/log/os-disk-config.log 2>&1
+  python3 /usr/local/bin/os-disk-config.py -m hedgehog -u $CAPTURE_STORAGE_FORMAT_FLAG >>/var/log/os-disk-config.log 2>&1
   rm -f "$CAPTURE_STORAGE_FORMAT_FILE"
 fi
 

diff --git a/shared/bin/capture-format-wait.sh b/shared/bin/capture-format-wait.sh
@@ -14,10 +14,10 @@ else
   CAPTURE_STORAGE_FORMAT_FILE="/etc/capture_storage_format"
 fi
 
-if [[ -f "$CAPTURE_STORAGE_FORMAT_FILE" ]] || pgrep -f "sensor-capture-disk-config.py" >/dev/null 2>&1; then
+if [[ -f "$CAPTURE_STORAGE_FORMAT_FILE" ]] || pgrep -f "os-disk-config.py" >/dev/null 2>&1; then
   trap finish EXIT
-  yes | zenity --progress --pulsate --no-cancel --auto-close --text "Capture storage media are being prepared..." --title "Preparing Storage" &
-  while [[ -f "$CAPTURE_STORAGE_FORMAT_FILE" ]] || pgrep -f "sensor-capture-disk-config.py" >/dev/null 2>&1; do
+  yes | zenity --progress --pulsate --no-cancel --auto-close --text "Large storage media are being prepared..." --title "Preparing Storage" &
+  while [[ -f "$CAPTURE_STORAGE_FORMAT_FILE" ]] || pgrep -f "os-disk-config.py" >/dev/null 2>&1; do
     sleep 2
   done
 fi