From c09a8af5dfd15d21203b69edeb0eef8f95836d6c Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Mon, 16 Jan 2017 17:53:01 +0100 Subject: [PATCH] More fixes to offline install --- archinstall/archinstall-dev.sh | 14 +++++++------- archinstall/archinstall.sh | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/archinstall/archinstall-dev.sh b/archinstall/archinstall-dev.sh index 3f3584e..5114b4b 100755 --- a/archinstall/archinstall-dev.sh +++ b/archinstall/archinstall-dev.sh @@ -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/ diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh index 585f3ea..5114b4b 100755 --- a/archinstall/archinstall.sh +++ b/archinstall/archinstall.sh @@ -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 \ No newline at end of file