simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2018-08-22 00:00:29 +02:00
parent dd064b199a
commit 22436aa4ee
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch-install
View file

@ -322,6 +322,14 @@ function removeinstaller {
echo "" echo ""
} }
function freshinstall {
arch-chroot ${mountpoint} <<EOT
cd /opt/${repo}/
git pull
EOT
arch-chroot ${mountpoint} pacman -Syu $(cat /opt/${repo}/packages_${version}.txt) --needed --noconfirm
}
function installation { function installation {
#boot #boot
@ -369,20 +377,17 @@ function installation {
if [ -f /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs ]; then if [ -f /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs ]; then
echo "It is not a copytoram system." echo "It is not a copytoram system."
unsquashfs -f -d ${mountpoint} /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs unsquashfs -f -d ${mountpoint} /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs
freshinstall
elif [ -f /run/archiso/copytoram/airootfs.sfs ]; then elif [ -f /run/archiso/copytoram/airootfs.sfs ]; then
echo "It is a copytoram system." echo "It is a copytoram system."
unsquashfs -f -d ${mountpoint} /run/archiso/copytoram/airootfs.sfs unsquashfs -f -d ${mountpoint} /run/archiso/copytoram/airootfs.sfs
freshinstall
else else
read -p "Where is the airootfs.sfs? Please specify the complete path or choose the online installation? [/airootfs.sfs/online] : " installationsfehler read -p "Where is the airootfs.sfs? Please specify the complete path or choose the online installation? [/airootfs.sfs/online] : " installationsfehler
if [ "${installationsfehler}" == "online" ]; then if [ "${installationsfehler}" == "online" ]; then
minimalinstallation minimalinstallation
else else
unsquashfs -f -d ${mountpoint} ${installationsfehler} unsquashfs -f -d ${mountpoint} ${installationsfehler}
arch-chroot ${mountpoint} <<EOT
cd /opt/${repo}/
git pull
EOT
arch-chroot ${mountpoint} pacman -Syu $(cat /opt/${repo}/packages_${version}.txt) --needed --noconfirm
fi fi
fi fi
else else