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-05-26 01:42:05 +02:00
parent d6991888a4
commit 2093269b32
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
make_mksquashfs-auto.sh
View file

@ -60,12 +60,15 @@ EOT
fi fi
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
cp pacman.conf_libre /etc/pacman.conf
pacman -U --noconfirm --force https://www.parabola.nu/packages/libre/any/parabola-keyring/download pacman -U --noconfirm --force https://www.parabola.nu/packages/libre/any/parabola-keyring/download
./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt) ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
elif [ "${version}" == "manjaro" ]; then elif [ "${version}" == "manjaro" ]; then
cp pacman.conf_manjaro /etc/pacman.conf
pacman -U --noconfirm --force https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20171027-2-any.pkg.tar.xz pacman -U --noconfirm --force https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20171027-2-any.pkg.tar.xz
./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) ./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
else else
cp pacman.conf /etc/pacman.conf
./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) ./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
fi fi
} }