Add partial support for NetBSD and OpenBSD

[snf-image] / snf-image-helper / common.sh

diff --git a/snf-image-helper/common.sh b/snf-image-helper/common.sh
index d9c94c3..e17ef2a 100644 (file)
--- a/snf-image-helper/common.sh
+++ b/snf-image-helper/common.sh
@@ -33,6 +33,7 @@ REGLOOKUP=reglookup
 CHNTPW=chntpw
 SGDISK=sgdisk
 GROWFS_UFS=growfs.ufs
+DUMPFS_UFS=dumpfs.ufs
 DATE="date -u" # Time in UTC
 EATMYDATA=eatmydata
 MOUNT="mount -n"
@@ -147,7 +148,6 @@ report_error() {
 log_error() {
     ERRORS+=("$*")
 
-    send_monitor_message_${HYPERVISOR} "ERROR: $@"
     send_result_${HYPERVISOR} "ERROR: $@"
 
     # Use return instead of exit. The set -x options will terminate the script
@@ -336,6 +336,9 @@ get_partition_to_resize() {
     dev="$1"
 
     table=$(get_partition_table "$dev")
+    if [ -z "$table" ]; then
+        return 0
+    fi
 
     if [ $(get_partition_count "$table") -eq 0 ]; then
         return 0
@@ -471,6 +474,26 @@ umount_all() {
     done
 }
 
+get_ufstype() {
+    local device ufs
+
+    device="$1"
+    ufs="$($DUMPFS_UFS "$device" | head -1 | awk '{ match ($3, /\((.+)\)/, ufs); print ufs[1] }')"
+
+    case "$ufs" in
+        UFS1)
+            echo 44bsd
+            ;;
+        UFS2)
+            echo ufs2
+            ;;
+        *)
+            log_error "Unsupported UFS type: \`$ufs' in device $device"
+            echo ""
+            ;;
+    esac
+}
+
 cleanup() {
     # if something fails here, it shouldn't call cleanup again...
     trap - EXIT
@@ -527,7 +550,6 @@ check_if_excluded() {
     return 0
 }
 
-
 return_success() {
     send_result_${HYPERVISOR} "SUCCESS"
 }