root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

sync with current cal

Browse source 
release 0.13.0
This commit is contained in:
udeved 2016-08-01 21:44:19 +02:00
parent a2ac03afc2
commit 66756402bc
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,4 +1,4 @@
Version=0.13-dev Version=0.13.0
PREFIX = /usr/local PREFIX = /usr/local
SYSCONFDIR = /etc SYSCONFDIR = /etc

11
lib/util-iso-calamares.sh
View file

@ -195,6 +195,8 @@ write_settings_conf(){
echo " - networkcfg" >> "$conf" echo " - networkcfg" >> "$conf"
echo " - packages" >> "$conf" echo " - packages" >> "$conf"
else else
# take out networkcfg once a new PR has been merged
echo " - networkcfg" >> "$conf"
echo " - chrootcfg" >> "$conf" echo " - chrootcfg" >> "$conf"
fi fi
else else
@ -242,10 +244,11 @@ write_chrootcfg_conf(){
echo "packages:" >> "$conf" echo "packages:" >> "$conf"
echo " - pacman" >> "$conf" echo " - pacman" >> "$conf"
echo " - ${kernel}" >> "$conf" echo " - ${kernel}" >> "$conf"
echo '' >> "$conf" # take out until a new PR has been merged
echo "keyrings:" >> "$conf" # echo '' >> "$conf"
echo " - archlinux" >> "$conf" # echo "keyrings:" >> "$conf"
echo " - manjaro" >> "$conf" # echo " - archlinux" >> "$conf"
# echo " - manjaro" >> "$conf"
} }
write_netinstall_conf(){ write_netinstall_conf(){