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
use up to date luks settings
[automated-distro-installer]
/
fai
/
config
/
hooks
/
partition.DEFAULT
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index 0dc4c7d144450870c63eb1931ad736ff95058d26..afbca5a6d30a825ebf88baabc650e01ec5bb1c26 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-65,16
+65,17
@@
fi
# RAID1: forces raid1 filesystem.
mkroot2=false
# RAID1: forces raid1 filesystem.
mkroot2=false
-case $1 in
- mkroot2)
- mkroot2=true
- ;;
- *)
- echo "$0: error: unsupported arg: $1" >&2
- exit 1
- ;;
-esac
-
+if [[ $1 ]]; then
+ case $1 in
+ mkroot2)
+ mkroot2=true
+ ;;
+ *)
+ echo "$0: error: unsupported arg: $1" >&2
+ exit 1
+ ;;
+ esac
+fi
if [[ $SPECIAL_DISK ]]; then
if [[ $SPECIAL_DISK ]]; then
@@
-185,8
+186,7
@@
luks-setup() {
# cryptsetup luksAddKey --pbkdf pbkdf2
# then remove the new format keys with cryptsetup luksRemoveKey
# then cryptsetup convert DEV --type luks1, then readd old keys and remove temp.
# cryptsetup luksAddKey --pbkdf pbkdf2
# then remove the new format keys with cryptsetup luksRemoveKey
# then cryptsetup convert DEV --type luks1, then readd old keys and remove temp.
- yes YES | cryptsetup luksFormat $luksdev $luks_file \
- --type luks1 -c aes-cbc-essiv:sha256 -s 256 || [[ $? == 141 ]]
+ yes YES | cryptsetup luksFormat $luksdev $luks_file || [[ $? == 141 ]]
yes "$lukspw" | \
cryptsetup luksAddKey --key-file $luks_file \
$luksdev || [[ $? == 141 ]]
yes "$lukspw" | \
cryptsetup luksAddKey --key-file $luks_file \
$luksdev || [[ $? == 141 ]]
@@
-361,8
+361,8
@@
if (( boot_space > 60000 )); then
# recovery needs and for doing pxe-kexec.
boot_mib=10000
root2_mib=200000
# recovery needs and for doing pxe-kexec.
boot_mib=10000
root2_mib=200000
- boot2_mib=
5
00
-elif (( boot_space > 30000 )); then
+ boot2_mib=
20
00
+elif (( boot_spa
_
ce > 30000 )); then
boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
root2_mib=100
boot2_mib=100
boot_mib=$(( 5000 + (boot_space - 30000) / 2 ))
root2_mib=100
boot2_mib=100
@@
-474,6
+474,9
@@
for dev in ${devs[@]}; do
done
shopt -s nullglob
done
shopt -s nullglob
+# We write to these files instead of just /etc/fstab, /etc/crypttab,
+# because these are filesystems created after our current root, and so
+# this allows us to update other root filesystems too.
rm -f /mnt/root/root2-{fs,crypt}tab
if $mkroot2; then
if $partition; then
rm -f /mnt/root/root2-{fs,crypt}tab
if $mkroot2; then
if $partition; then