make sure functions are defined, closes: #1063146

if setup-storage is not run in a FAI environment the functions must be defined by sourcing subroutines
faiproject · Feb 7, 2024 · cd33235 · cd33235
1 parent b418920
commit cd33235
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/debian/control b/debian/control
@@ -87,7 +87,7 @@ Description: Fully Automatic Installation nfsroot package
 Package: fai-setup-storage
 Architecture: all
 Depends: perl, e2fsprogs, libparse-recdescent-perl, liblinux-lvm-perl, parted, ${misc:Depends}
-Recommends: lvm2, mdadm
+Recommends: fai-client, lvm2, mdadm
 Suggests: dmsetup, cryptsetup, dosfstools, jfsutils, ntfs-3g, reiserfsprogs, xfsprogs
 Description: automatically prepare storage devices
  Using FAI disk_config files, setup-storage computes effective

diff --git a/lib/fai-disk-info b/lib/fai-disk-info
@@ -1,4 +1,13 @@
 #! /bin/bash
 
+if ! command -v set_bootstick >&/dev/null; then
+    if [ -f /usr/lib/fai/subroutines ]; then
+        . /usr/lib/fai/subroutines
+    else
+        echo "Cannot find /usr/lib/fai/subroutines"
+        echo "Please install package fai-client"
+    fi
+fi
+
 set_bootstick
 all_disks_and_size | checkdisk $FAI_BOOTSTICK | once_only