Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Tools
development-tools
manjaro-tools
Commits
66756402
Commit
66756402
authored
Aug 01, 2016
by
udeved
Browse files
sync with current cal
release 0.13.0
parent
a2ac03af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
66756402
Version
=
0.13
-dev
Version
=
0.13
.0
PREFIX
=
/usr/local
SYSCONFDIR
=
/etc
...
...
lib/util-iso-calamares.sh
View file @
66756402
...
...
@@ -195,6 +195,8 @@ write_settings_conf(){
echo
" - networkcfg"
>>
"
$conf
"
echo
" - packages"
>>
"
$conf
"
else
# take out networkcfg once a new PR has been merged
echo
" - networkcfg"
>>
"
$conf
"
echo
" - chrootcfg"
>>
"
$conf
"
fi
else
...
...
@@ -242,10 +244,11 @@ write_chrootcfg_conf(){
echo
"packages:"
>>
"
$conf
"
echo
" - pacman"
>>
"
$conf
"
echo
" -
${
kernel
}
"
>>
"
$conf
"
echo
''
>>
"
$conf
"
echo
"keyrings:"
>>
"
$conf
"
echo
" - archlinux"
>>
"
$conf
"
echo
" - manjaro"
>>
"
$conf
"
# take out until a new PR has been merged
# echo '' >> "$conf"
# echo "keyrings:" >> "$conf"
# echo " - archlinux" >> "$conf"
# echo " - manjaro" >> "$conf"
}
write_netinstall_conf
(){
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment