mirror of
https://gitlab.com/JKANetwork/JKArch.git
synced 2026-02-17 10:41:32 +01:00
dev changes
This commit is contained in:
@@ -240,14 +240,10 @@ if [[ ! $optpa -eq 3 ]];then
|
||||
if [[ $particionhome ]];then
|
||||
optfh=`dialog --stdout --nocancel --menu "Formato para la particion home (/home)" 0 0 4 1 "EXT4 (Recomendado)" 2 "BTRFS" 3 "XFS" 4 "No formatear (Si ya esta formateada)"`
|
||||
case $optfh in
|
||||
1)
|
||||
formatohome="mkfs.ext4 -F";;
|
||||
2)
|
||||
formatohome="mkfs.btrfs -f";;
|
||||
3)
|
||||
formatohome="mkfs.xfs -f";;
|
||||
4)
|
||||
formatohome="echo No formatear ";;
|
||||
1) formatohome="mkfs.ext4 -F";;
|
||||
2) formatohome="mkfs.btrfs -f";;
|
||||
3) formatohome="mkfs.xfs -f";;
|
||||
4) formatohome="echo No formatear ";;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
@@ -260,7 +256,7 @@ if [[ ! $optpa -eq 3 ]];then
|
||||
optswap=`dialog --stdout --nocancel --menu "¿Quieres crear un archivo swap (Memoria virtual)?" 0 0 4 1 "Si (Con valores por defecto, recomendado)" 2 "Si (Valores a mano)" 3 "Si, pero con una particion que ya cree" 4 "No"`
|
||||
case $optswap in
|
||||
1)
|
||||
##This count the ammount of swap to create dependent of computer RAM
|
||||
# This count the ammount of swap to create dependent of computer RAM
|
||||
if [[ $ram -le 7500 ]];then
|
||||
swaptype=1
|
||||
swapamount=$(expr $ram / 3)
|
||||
@@ -305,10 +301,10 @@ if [[ ! $optpa -eq 3 ]];then
|
||||
fi
|
||||
|
||||
fi
|
||||
#fin del if de pedir los datos si no esta en automatico
|
||||
# Fin del if de pedir los datos si no esta en automatico
|
||||
}
|
||||
|
||||
### Install and configure all of the system, this function is NOT interactive, it works alone ###
|
||||
##Install and configure all of the system, this function is NOT interactive, it works alone
|
||||
function installconf {
|
||||
clear
|
||||
tput setaf 2 ; echo "$(T "Installing system, this can take about 20 minutes, wait")" ; tput setaf 9
|
||||
@@ -367,15 +363,14 @@ if [[ $isoffline = 0 ]];then
|
||||
cp -r /etc/netctl/* /mnt/etc/netctl/
|
||||
cp -f /etc/resolv.conf /mnt/etc/resolv.conf
|
||||
fi
|
||||
mount --bind /sys /mnt/sys
|
||||
mount --bind /proc /mnt/proc
|
||||
mount --bind /dev /mnt/dev
|
||||
mount --bind /run /mnt/run
|
||||
|
||||
# CD bind if is offline
|
||||
if [[ $isoffline = 1 ]];then
|
||||
mount --bind /run/archiso/bootmnt/ /mnt/run/archiso/bootmnt/
|
||||
fi
|
||||
mount --bind /sys /mnt/sys
|
||||
mount --bind /proc /mnt/proc
|
||||
mount --bind /dev /mnt/dev
|
||||
mount --bind /run /mnt/run
|
||||
#
|
||||
|
||||
# Var allpackages have in this moment all the packages selected by user, and will be the install packages list for pacman #
|
||||
@@ -386,7 +381,7 @@ allpackages=$allpackages" "$pak
|
||||
pak="ntpd"
|
||||
allpackages=$allpackages" "$pak
|
||||
|
||||
##GUI and apps selected in "entorno{}"
|
||||
# GUI and apps selected in "entorno{}"
|
||||
|
||||
|
||||
# Before install, configure mirrorlist if its online
|
||||
@@ -421,7 +416,7 @@ fi
|
||||
# User skel move
|
||||
if [[ $isoffline = 1 ]];then # Is an offline installation?
|
||||
tar xJf mods/skel.tar.xz -C /mnt/
|
||||
else #online
|
||||
else # Online
|
||||
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.xz -O- | tar xJf - -C /mnt/
|
||||
fi
|
||||
|
||||
@@ -458,7 +453,6 @@ echo "${nameuser}:${passuser}" | execl chroot chpasswd
|
||||
# Root password
|
||||
echo "root:${passroot}" | execl chroot chpasswd
|
||||
# Fix for some strange login bugs
|
||||
echo "Cambio de permisos por si se quedaron mal en algún momento"
|
||||
execl chroot chmod 755 /
|
||||
execl chroot chmod 755 /bin
|
||||
|
||||
@@ -529,13 +523,10 @@ echo "JKArch" > /mnt/etc/hostname
|
||||
# Linux kernel
|
||||
execl chroot mkinitcpio -p linux #Hacemos el mkinitcpio después de tener instalados los gráficos
|
||||
|
||||
|
||||
|
||||
# Clean pacman
|
||||
echo "$(T "Cleaning")"
|
||||
execl chroot pacman -Sc --noconfirm
|
||||
|
||||
}
|
||||
} # Fin installconf
|
||||
|
||||
|
||||
|
||||
@@ -794,7 +785,6 @@ pak="xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm
|
||||
#Gestor de energia xfce4-power-manager
|
||||
allpackages=$allpackages" "$pak
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
### More optional configs ###
|
||||
@@ -844,7 +834,6 @@ echo 'EndSection' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
|
||||
}
|
||||
|
||||
function bootselect {
|
||||
|
||||
if [[ -z $partefi ]];then
|
||||
#Si no usa EFI, preguntar por instalar GRUB
|
||||
optboot=`dialog --stdout --nocancel --menu "¿Instalar bootloader/gestor de arranque?" 0 0 4 1 "Si (GRUB)" 2 "No, no instalar gestor de arranque"`
|
||||
|
||||
Reference in New Issue
Block a user