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
various fixes
[automated-distro-installer]
/
fai
/
config
/
hooks
/
partition.DEFAULT
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index c4f26ea811bc21e1dbcf00f6907a026f67f67e41..2db69b348b33f8f8e2c99c66112056f443f54b89 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##*/}; }
@@
-115,8
+113,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
@@
-190,15
+188,15
@@
fi
if [[ ! $DISTRO ]]; then
if [[ ! $DISTRO ]]; then
- if ifclass STABLE_BOOTSTRAP; then
+ if ifclass
VOL_
STABLE_BOOTSTRAP; then
DISTRO=debianstable_bootstrap
DISTRO=debianstable_bootstrap
- elif ifclass
STRETCH64
; then
+ elif ifclass
VOL_STRETCH
; then
DISTRO=debiantesting
DISTRO=debiantesting
- elif ifclass STABLE; then
+ elif ifclass
VOL_
STABLE; then
DISTRO=debianstable
DISTRO=debianstable
- elif ifclass
XENIAL64
; then
+ elif ifclass
VOL_XENIAL
; then
DISTRO=ubuntuxenial
DISTRO=ubuntuxenial
- elif ifclass
BELENOS64
; then
+ elif ifclass
VOL_BELENOS
; then
DISTRO=trisquelbelenos
else
echo "PARTITIONER ERROR: no distro class/var set" >&2
DISTRO=trisquelbelenos
else
echo "PARTITIONER ERROR: no distro class/var set" >&2