ouroboros-gorup/obos-fi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace cryptotab with crypttab

Browse source
This commit is contained in:
MatMoul 2015-12-18 23:47:56 +01:00
parent f5aab867f3
commit 632f956fc4
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
archfi
View file

@ -727,13 +727,13 @@ archmenu(){
options+=("$txtsetrootpassword" "") options+=("$txtsetrootpassword" "")
options+=("${txtgenerate//%1/fstab}" "") options+=("${txtgenerate//%1/fstab}" "")
if [ "$luksdrive" = "1" ]; then if [ "$luksdrive" = "1" ]; then
options+=("${txtgenerate//%1/cryptotab}" "") options+=("${txtgenerate//%1/crypttab}" "")
fi fi
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
options+=("${txtgenerate//%1/mkinitcpio.conf}" "(encrypt hooks)") options+=("${txtgenerate//%1/mkinitcpio.conf}" "(encrypt hooks)")
fi fi
options+=("${txtedit//%1/fstab}" "($txtoptional)") options+=("${txtedit//%1/fstab}" "($txtoptional)")
options+=("${txtedit//%1/cryptotab}" "($txtoptional)") options+=("${txtedit//%1/crypttab}" "($txtoptional)")
options+=("${txtedit//%1/mkinitcpio.conf}" "($txtoptional)") options+=("${txtedit//%1/mkinitcpio.conf}" "($txtoptional)")
options+=("${txtedit//%1/mirrorlist}" "($txtoptional)") options+=("${txtedit//%1/mirrorlist}" "($txtoptional)")
options+=("${txtinstall//%1/grub}" "pacstrap grub (efibootmgr), grub-mkconfig") options+=("${txtinstall//%1/grub}" "pacstrap grub (efibootmgr), grub-mkconfig")
@ -769,7 +769,7 @@ archmenu(){
"${txtgenerate//%1/fstab}") "${txtgenerate//%1/fstab}")
archgenfstab archgenfstab
if [ "$luksdrive" = "1" ]; then if [ "$luksdrive" = "1" ]; then
nextitem="${txtgenerate//%1/cryptotab}" nextitem="${txtgenerate//%1/crypttab}"
else else
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
nextitem="${txtgenerate//%1/mkinitcpio.conf}" nextitem="${txtgenerate//%1/mkinitcpio.conf}"
@ -778,8 +778,8 @@ archmenu(){
fi fi
fi fi
;; ;;
"${txtgenerate//%1/cryptotab}") "${txtgenerate//%1/crypttab}")
archgencryptotab archgencrypttab
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
nextitem="${txtgenerate//%1/mkinitcpio.conf}" nextitem="${txtgenerate//%1/mkinitcpio.conf}"
else else
@ -794,9 +794,9 @@ archmenu(){
$EDITOR /mnt/etc/fstab $EDITOR /mnt/etc/fstab
nextitem="${txtedit//%1/fstab}" nextitem="${txtedit//%1/fstab}"
;; ;;
"${txtedit//%1/cryptotab}") "${txtedit//%1/crypttab}")
$EDITOR /mnt/etc/cryptotab $EDITOR /mnt/etc/crypttab
nextitem="${txtedit//%1/cryptotab}" nextitem="${txtedit//%1/crypttab}"
;; ;;
"${txtedit//%1/mkinitcpio.conf}") "${txtedit//%1/mkinitcpio.conf}")
archeditmkinitcpio archeditmkinitcpio
@ -979,7 +979,7 @@ archgenfstab(){
pressanykey pressanykey
} }
archgencryptotab(){ archgencrypttab(){
clear clear
echo "echo -e \"$crypttab\" >> /mnt/etc/crypttab" echo "echo -e \"$crypttab\" >> /mnt/etc/crypttab"
echo -e "$crypttab" >> /mnt/etc/crypttab echo -e "$crypttab" >> /mnt/etc/crypttab