jkanetwork/JKArch
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-22 13:03:45 +01:00
Code Issues Releases Wiki Activity

changes

Browse Source
This commit is contained in:
kprkpr
2016-06-02 11:16:05 +02:00
parent 1d28710de3
commit 3902d72866
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/archinstall.sh
View File

@@ -177,12 +177,10 @@ if [[ $? != 0 ]];then
fatalerror "Error de conexion con internet, compruebe la red" fatalerror "Error de conexion con internet, compruebe la red"
fi fi
chmod +x /mnt/root/inst/chrootinstall.sh chmod +x /mnt/root/inst/chrootinstall.sh
pause
genfstab -U /mnt >> /mnt/etc/fstab genfstab -U /mnt >> /mnt/etc/fstab
cp /etc/netctl/* /mnt/etc/netctl/ cp /etc/netctl/* /mnt/etc/netctl/
mv /tmp/pacman.conf /mnt/etc/pacman.conf mv /tmp/pacman.conf /mnt/etc/pacman.conf
argpart=$(echo $particionraiz | cut -c1-3) argpart=$(echo $particionraiz | cut -c1-3)
pause
arch-chroot /mnt /bin/bash -c "./root/inst/chrootinstall.sh $argpart $partefi" arch-chroot /mnt /bin/bash -c "./root/inst/chrootinstall.sh $argpart $partefi"
} }
clear clear
@@ -200,9 +198,7 @@ if [[ $particionhome ]];then
echo "Partición home (/home): $particionhome , con formato $formatohome" echo "Partición home (/home): $particionhome , con formato $formatohome"
fi fi
echo "Si estas de acuerdo, presione enter, en caso contrario, apague el ordenador a la fuerza" echo "Si estas de acuerdo, presione enter, en caso contrario, apague el ordenador a la fuerza"
pause
install install
#clear clear
pause
mostrardialog "Fin" "Instalación finalizada, al pulsar aceptar, se reiniciará el sistema" mostrardialog "Fin" "Instalación finalizada, al pulsar aceptar, se reiniciará el sistema"
reboot reboot

4
archinstall/chrootinstall.sh
View File

@@ -203,8 +203,8 @@ case $tipoinstall in
*5*) *5*)
packages="$packages jre8-openjdk";;& packages="$packages jre8-openjdk";;&
*6*) *6*)
packages="$packages wine-staging wine_gecko";;& packages="$packages wine-staging wine_gecko"
inswine=1 inswine=1;;&
esac esac
pacman -S $packages --noconfirm pacman -S $packages --noconfirm
if [[ $inswine = 1 ]];then if [[ $inswine = 1 ]];then