improve code style

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

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index c4f26ea811bc21e1dbcf00f6907a026f67f67e41..9914a458c952d514e9c7778d2719b65131607740 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -65,20 +65,21 @@ add-part() { # add partition suffix to $dev
     echo $ret
 }
 
-bootdev() { add-part $@ $bootn; }
+# 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; }
 rootdev() { add-part $@ $rootn; }
 swapdev() { add-part $@ $swapn; }
 grub_extdev() { add-part $@ $grub_extn; }
-# Commented because it's not used, but left because it
-# finishes the pattern and if we ever do need to use it, it's here.
 #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 $@); }
 
 
 ##### end function defs
@@ -115,8 +116,8 @@ fi
 for dev in ${short_devs[@]}; do
     if $partition; then break; fi
     y=$(readlink -f $dev)
-    x=($y[0-9])
-    [[ ${#x[@]}  == "${lastn}" ]] || partition=true
+    arr=($y[0-9])
+    [[ ${#arr[@]}  == "${lastn}" ]] || partition=true
     for (( i=1; i <= lastn; i++ )); do
         [[ -e ${dev}$i ]] || partition=true
     done
@@ -190,15 +191,15 @@ fi
 
 
 if [[ ! $DISTRO ]]; then
-    if ifclass STABLE_BOOTSTRAP; then
+    if ifclass VOL_STABLE_BOOTSTRAP; then
         DISTRO=debianstable_bootstrap
-    elif ifclass STRETCH64; then
+    elif ifclass VOL_STRETCH; then
         DISTRO=debiantesting
-    elif ifclass STABLE; then
+    elif ifclass VOL_STABLE; then
         DISTRO=debianstable
-    elif ifclass XENIAL64; then
+    elif ifclass VOL_XENIAL; then
         DISTRO=ubuntuxenial
-    elif ifclass BELENOS64; then
+    elif ifclass VOL_BELENOS; then
         DISTRO=trisquelbelenos
     else
         echo "PARTITIONER ERROR: no distro class/var set" >&2