add http server support for maru, small bug fixes

[automated-distro-installer] / fai / config / hooks / partition.DEFAULT

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 9914a458c952d514e9c7778d2719b65131607740..f241fd608f3c8c72524e6c1b3ab9097cd78b2e7b 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -65,22 +65,26 @@ add-part() { # add partition suffix to $dev
     echo $ret
 }
 
-# Functions here are commented because they are unused, but left
-# intentionally because they follow the pattern and could be useful in
-# the future.
-#bootdev() { add-part $@ $bootn; }
+bootdev() { add-part $@ $bootn; }
 rootdev() { add-part $@ $rootn; }
 swapdev() { add-part $@ $swapn; }
 grub_extdev() { add-part $@ $grub_extn; }
-#bios_grubdev() { add-part $@ $bios_grubn; }
+bios_grubdev() { add-part $@ $bios_grubn; }
 
 crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; }
 crypt-name() { echo crypt_dev_${1##*/}; }
 root-cryptdev() { crypt-dev $(rootdev $@); }
-#swap-cryptdev() { crypt-dev $(swapdev $@); }
-#root-cryptname() { crypt-name $(rootdev $@); }
-#swap-cryptname() { crypt-name $(swapdev $@); }
+swap-cryptdev() { crypt-dev $(swapdev $@); }
+root-cryptname() { crypt-name $(rootdev $@); }
+swap-cryptname() { crypt-name $(swapdev $@); }
+devbyid() {
+    local f
+    for f in $FAI/distro-install-common/devbyid \
+                 /a/bin/fai/fai/config/distro-install-common/devbyid; do
+        if [[ -e $f ]]; then $f "$@"; fi
+    done
 
+}
 
 ##### end function defs