jkanetwork/JKArch
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-16 18:21:33 +01:00
Code Issues Releases Wiki Activity

More fixes to offline install

Browse Source
This commit is contained in:
JKA Network
2017-01-16 17:53:01 +01:00
parent 72245ae749
commit c09a8af5df
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
archinstall/archinstall-dev.sh
View File

@@ -619,14 +619,14 @@ function installconf {
cp -r /etc/netctl/* /mnt/etc/netctl/
cp -f /etc/resolv.conf /mnt/etc/resolv.conf
fi
# 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
# CD bind if is offline
if [[ $isoffline = "1" ]];then
mount --bind /run/archiso/bootmnt/ /mnt/run/archiso/bootmnt/
fi
#
# Var allpackages have in this moment all the packages selected by user, and will be the install packages list for pacman #
@@ -666,7 +666,7 @@ function installconf {
# User skel move
if [[ $isoffline = 1 ]];then # Is an offline installation?
if [[ $isoffline = "1" ]];then # Is an offline installation?
tar xJf mods/skel.tar.xz -C /mnt/
else # Online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.xz -O- | tar xJf - -C /mnt/
@@ -674,7 +674,7 @@ function installconf {
# Themes skel before creating user and remove some progs
if [[ $optentorno = 1 ]];then #LXDE
if [[ $isoffline = 1 ]];then # Is an offline installation?
if [[ $isoffline = "1" ]];then # Is an offline installation?
tar xJf mods/LXDE.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/LXDE.tar.xz -O- | tar xJf - -C /mnt/
@@ -682,7 +682,7 @@ function installconf {
fi
if [[ $optentorno = 2 ]];then #XFCE4
if [[ $isoffline = 1 ]];then # Is an offline installation?
if [[ $isoffline = "1" ]];then # Is an offline installation?
tar xJf mods/XFCE4.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/XFCE4.tar.xz -O- | tar xJf - -C /mnt/

16
archinstall/archinstall.sh
View File

@@ -619,14 +619,14 @@ function installconf {
cp -r /etc/netctl/* /mnt/etc/netctl/
cp -f /etc/resolv.conf /mnt/etc/resolv.conf
fi
# 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
# CD bind if is offline
if [[ $isoffline = "1" ]];then
mount --bind /run/archiso/bootmnt/ /mnt/run/archiso/bootmnt/
fi
#
# Var allpackages have in this moment all the packages selected by user, and will be the install packages list for pacman #
@@ -666,7 +666,7 @@ function installconf {
# User skel move
if [[ $isoffline = 1 ]];then # Is an offline installation?
if [[ $isoffline = "1" ]];then # Is an offline installation?
tar xJf mods/skel.tar.xz -C /mnt/
else # Online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.xz -O- | tar xJf - -C /mnt/
@@ -674,7 +674,7 @@ function installconf {
# Themes skel before creating user and remove some progs
if [[ $optentorno = 1 ]];then #LXDE
if [[ $isoffline = 1 ]];then # Is an offline installation?
if [[ $isoffline = "1" ]];then # Is an offline installation?
tar xJf mods/LXDE.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/LXDE.tar.xz -O- | tar xJf - -C /mnt/
@@ -682,7 +682,7 @@ function installconf {
fi
if [[ $optentorno = 2 ]];then #XFCE4
if [[ $isoffline = 1 ]];then # Is an offline installation?
if [[ $isoffline = "1" ]];then # Is an offline installation?
tar xJf mods/XFCE4.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/XFCE4.tar.xz -O- | tar xJf - -C /mnt/
@@ -988,4 +988,4 @@ mv /tmp/install.log /mnt/home/$nameuser/install.log
umount /mnt/*
umount /mnt
# Reboot, finished
reboot
reboot