iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add flidas support, fix typo
[automated-distro-installer]
/
fai
/
config
/
hooks
/
partition.DEFAULT
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index 8dffd82b89c18a4fec5fd6616a5c6aa722ef35ac..1db0197f46a7cae93709e4985a19790fa99cd74e 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-69,9
+69,7
@@
bootdev() { add-part $@ $bootn; }
rootdev() { add-part $@ $rootn; }
swapdev() { add-part $@ $swapn; }
grub_extdev() { add-part $@ $grub_extn; }
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; }
+bios_grubdev() { add-part $@ $bios_grubn; }
crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; }
crypt-name() { echo crypt_dev_${1##*/}; }
crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; }
crypt-name() { echo crypt_dev_${1##*/}; }
@@
-79,7
+77,14
@@
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
##### end function defs
@@
-115,8
+120,8
@@
fi
for dev in ${short_devs[@]}; do
if $partition; then break; fi
y=$(readlink -f $dev)
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
for (( i=1; i <= lastn; i++ )); do
[[ -e ${dev}$i ]] || partition=true
done
@@
-200,6
+205,8
@@
if [[ ! $DISTRO ]]; then
DISTRO=ubuntuxenial
elif ifclass VOL_BELENOS; then
DISTRO=trisquelbelenos
DISTRO=ubuntuxenial
elif ifclass VOL_BELENOS; then
DISTRO=trisquelbelenos
+ elif ifclass VOL_FLIDAS; then
+ DISTRO=trisquelflidas
else
echo "PARTITIONER ERROR: no distro class/var set" >&2
exit 1
else
echo "PARTITIONER ERROR: no distro class/var set" >&2
exit 1