util-iso-cal: write the chrootcfg.conf

upd docs
This commit is contained in:
udeved 2016-07-31 23:58:51 +02:00
parent a3bdf3ebd5
commit 95d368187b
4 changed files with 28 additions and 2 deletions

View file

@ -40,6 +40,9 @@
# configure calamares for netinstall
# cal_netinstall="false"
# the default url for the netinstall.yaml
# cal_netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master/netinstall.yaml"
# configure calamares to use chrootcfg instead of unpackfs
# cal_unpackfs="true"

View file

@ -149,6 +149,13 @@
</listitem>
</varlistentry>
<varlistentry>
<term><varname>cal_netgroups=</varname></term>
<listitem><para>Default url for the netinstall.yaml.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>efi_boot_loader=</varname></term>

View file

@ -229,10 +229,24 @@ write_settings_conf(){
echo "dont-chroot: false" >> "$conf"
}
write_chrootcfg_conf(){
local conf="$1/etc/calamares/modules/chrootcfg.conf"
echo "---" > "$conf"
echo "requirements:" >> "$conf"
echo " - name: /etc" >> "$conf"
echo " - name: /var/log" >> "$conf"
echo " - name: /var/cache/pacman/pkg" >> "$conf"
echo " - name: /var/lib/pacman" >> "$conf"
echo '' >> "$conf"
echo "kernel: ${kernel}" >> "$conf"
echo '' >> "$conf"
echo "defaultpkg: pacman" >> "$conf"
}
write_netinstall_conf(){
local conf="$1/etc/calamares/modules/netinstall.conf"
echo "---" > "$conf"
echo "groupsUrl: ${cal_grp_url}" >> "$conf"
echo "groupsUrl: ${cal_netgroups}" >> "$conf"
}
configure_calamares(){
@ -260,6 +274,8 @@ configure_calamares(){
write_netinstall_conf "$1"
write_chrootcfg_conf "$1"
write_services_conf "$1"
write_users_conf "$1"
}

View file

@ -449,7 +449,7 @@ load_profile_config(){
[[ -z ${cal_unpackfs} ]] && cal_unpackfs='true'
[[ -z ${cal_grp_url} ]] && cal_grp_url="https://raw.githubusercontent.com/calamares/calamares-manjaro/master/netinstall.yaml"
[[ -z ${cal_netgroups} ]] && cal_netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master/netinstall.yaml"
check_profile_vars