minor files

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

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 7a1967b2268b002bb3f76d8a734df652db99d6f8..63537c2594d334ae9b76c79da8de35b693a5d9bd 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -145,7 +145,10 @@ $(cat $disk/queue/rotational)"; exit 1 ;;
     esac
 done
 
-# install all ssds, or if there are none, all hdds
+# install all ssds, or if there are none, all hdds.
+# Note, usb flash disks are seen as rotational, which is
+# very odd, but convenient for ignoring them here.
+# TODO: find a reliable way to ignore them.
 if ! ifclass ROTATIONAL && (( ${#ssds[@]} > 0 )); then
     short_devs=( ${ssds[@]} )
 else
@@ -270,10 +273,11 @@ if [[ ! -e $luks_dir/host-$HOSTNAME ]]; then
 fi
 
 lukspw=$(cat $luks_dir/iank)
-# # ian: disabled while I use the tp host.
-# if ifclass tp; then
-#     lukspw=$(cat $luks_dir/traci)
-# fi
+# # ian: disabled by chaning to tpnew while I use the tp host.
+# # note, corresponding changes in /b/ds/keyscript-{on,off}
+if ifclass tpnew; then
+    lukspw=$(cat $luks_dir/traci)
+fi
 if ifclass demohost; then
     lukspw=x
 fi