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
start of etiona (trisquel 9) support
[automated-distro-installer]
/
fai
/
config
/
hooks
/
partition.DEFAULT
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index 9ab73b22cceb9a2f91f2932b1c2c864f948484b0..c637a9bcf6e1c71b00bd4c3fa91a3b7dced02afd 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-48,6
+48,7
@@
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
#
# RAID0: forces raid0 filesystem. Normally with 4+ devices, we use
# raid10.
#
# RAID0: forces raid0 filesystem. Normally with 4+ devices, we use
# raid10.
+# RAID1: forces raid1 filesystem.
if [[ $SPECIAL_DISK ]]; then
export CLASS_REPARTITION=true
if [[ $SPECIAL_DISK ]]; then
export CLASS_REPARTITION=true
@@
-235,8
+236,10
@@
for dev in ${devs[@]}; do
fi
done
fi
done
-if ifclass RAID0 || (( ${#boot_devs[@]}
< 4
)); then
+if ifclass RAID0 || (( ${#boot_devs[@]}
== 1
)); then
raid_level=0
raid_level=0
+elif ifclass RAID1 || (( ${#boot_devs[@]} <= 3 )); then
+ raid_level=1
else
raid_level=10
# need double the space if we are raid 10, and then
else
raid_level=10
# need double the space if we are raid 10, and then
@@
-259,6
+262,8
@@
if [[ ! $DISTRO ]]; then
DISTRO=trisquelbelenos
elif ifclass VOL_FLIDAS; then
DISTRO=trisquelflidas
DISTRO=trisquelbelenos
elif ifclass VOL_FLIDAS; then
DISTRO=trisquelflidas
+ elif ifclass VOL_ETIONA; then
+ DISTRO=trisqueletiona
else
echo "PARTITIONER ERROR: no distro class/var set" >&2
exit 1
else
echo "PARTITIONER ERROR: no distro class/var set" >&2
exit 1
@@
-270,6
+275,7
@@
first_boot_dev=${boot_devs[0]}
bpart() { # btrfs a partition
case $raid_level in
0) mkfs.btrfs -f $@ ;;
bpart() { # btrfs a partition
case $raid_level in
0) mkfs.btrfs -f $@ ;;
+ 1) mkfs.btrfs -f -m raid1 -d raid1 $@ ;;
10) mkfs.btrfs -f -m raid10 -d raid10 $@ ;;
esac
}
10) mkfs.btrfs -f -m raid10 -d raid10 $@ ;;
esac
}
@@
-290,6
+296,9
@@
lukspw=$(cat $luks_dir/iank)
if ifclass tpnew; then
lukspw=$(cat $luks_dir/traci)
fi
if ifclass tpnew; then
lukspw=$(cat $luks_dir/traci)
fi
+if ifclass ziva; then
+ lukspw=$(cat $luks_dir/ziva)
+fi
if ifclass demohost; then
lukspw=x
fi
if ifclass demohost; then
lukspw=x
fi