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

buildiso: prepare 0.13.4 release

Browse source
This commit is contained in:
udeved 2016-08-19 16:54:24 +02:00
parent 804d92d48c
commit 9d89232e65
6 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/buildiso.in
View file

@ -34,8 +34,8 @@ show_profile(){
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}" [[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
msg2 "cal_netinstall: %s" "${cal_netinstall}" msg2 "netinstall: %s" "${netinstall}"
msg2 "cal_unpackfs: %s" "${cal_unpackfs}" msg2 "unpackfs: %s" "${unpackfs}"
msg2 "efi_boot_loader: %s" "${efi_boot_loader}" msg2 "efi_boot_loader: %s" "${efi_boot_loader}"

6
data/profile.conf.example
View file

@ -35,13 +35,13 @@
# efi_boot_loader="grub" # efi_boot_loader="grub"
# configure calamares for netinstall # configure calamares for netinstall
# cal_netinstall="false" # netinstall="false"
# the default url for the netinstall.yaml # the default url for the netinstall.yaml
# cal_netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master" # netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master"
# configure calamares to use chrootcfg instead of unpackfs # configure calamares to use chrootcfg instead of unpackfs
# cal_unpackfs="true" # unpackfs="true"
# unset defaults to given value # unset defaults to given value
# plymouth_theme=manjaro-elegant # plymouth_theme=manjaro-elegant

6
docbook/profile.conf.xml
View file

@ -132,7 +132,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>cal_netinstall=</varname></term> <term><varname>netinstall=</varname></term>
<listitem><para>Accepts <listitem><para>Accepts
<option>true</option> (the default) <option>true</option> (the default)
@ -141,7 +141,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>cal_unpackfs=</varname></term> <term><varname>unpackfs=</varname></term>
<listitem><para>Accepts <listitem><para>Accepts
<option>true</option> (the default) <option>true</option> (the default)
@ -150,7 +150,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>cal_netgroups=</varname></term> <term><varname>netgroups=</varname></term>
<listitem><para>Default url for the netinstall.yaml. <listitem><para>Default url for the netinstall.yaml.
</para></listitem> </para></listitem>

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

@ -120,7 +120,7 @@ write_unpack_conf(){
echo " - source: \"/bootmnt/${iso_name}/${target_arch}/root-image.sqfs\"" >> "$conf" echo " - source: \"/bootmnt/${iso_name}/${target_arch}/root-image.sqfs\"" >> "$conf"
echo " sourcefs: \"squashfs\"" >> "$conf" echo " sourcefs: \"squashfs\"" >> "$conf"
echo " destination: \"\"" >> "$conf" echo " destination: \"\"" >> "$conf"
if ! ${cal_netinstall};then if ! ${netinstall};then
echo " - source: \"/bootmnt/${iso_name}/${target_arch}/${profile}-image.sqfs\"" >> "$conf" echo " - source: \"/bootmnt/${iso_name}/${target_arch}/${profile}-image.sqfs\"" >> "$conf"
echo " sourcefs: \"squashfs\"" >> "$conf" echo " sourcefs: \"squashfs\"" >> "$conf"
echo " destination: \"\"" >> "$conf" echo " destination: \"\"" >> "$conf"
@ -168,7 +168,7 @@ write_welcome_conf(){
echo " - storage" >> "$conf" echo " - storage" >> "$conf"
echo " - ram" >> "$conf" echo " - ram" >> "$conf"
echo " - root" >> "$conf" echo " - root" >> "$conf"
if ${cal_netinstall};then if ${netinstall};then
echo " - internet" >> "$conf" echo " - internet" >> "$conf"
fi fi
} }
@ -183,7 +183,7 @@ write_settings_conf(){
echo "sequence:" >> "$conf" echo "sequence:" >> "$conf"
echo "- show:" >> "$conf" echo "- show:" >> "$conf"
echo " - welcome" >> "$conf" echo " - welcome" >> "$conf"
${cal_netinstall} && echo " - netinstall" >> "$conf" ${netinstall} && echo " - netinstall" >> "$conf"
echo " - locale" >> "$conf" echo " - locale" >> "$conf"
echo " - keyboard" >> "$conf" echo " - keyboard" >> "$conf"
echo " - partition" >> "$conf" echo " - partition" >> "$conf"
@ -192,8 +192,8 @@ write_settings_conf(){
echo "- exec:" >> "$conf" echo "- exec:" >> "$conf"
echo " - partition" >> "$conf" echo " - partition" >> "$conf"
echo " - mount" >> "$conf" echo " - mount" >> "$conf"
if ${cal_netinstall};then if ${netinstall};then
if ${cal_unpackfs};then if ${unpackfs};then
echo " - unpackfs" >> "$conf" echo " - unpackfs" >> "$conf"
echo " - networkcfg" >> "$conf" echo " - networkcfg" >> "$conf"
echo " - packages" >> "$conf" echo " - packages" >> "$conf"
@ -257,8 +257,8 @@ write_mhwdcfg_conf(){
echo "driver: free" >> "$conf" echo "driver: free" >> "$conf"
fi fi
echo '' >> "$conf" echo '' >> "$conf"
if ${cal_netinstall};then if ${netinstall};then
if ${cal_unpackfs};then if ${unpackfs};then
echo "local: true" >> "$conf" echo "local: true" >> "$conf"
else else
echo "local: false" >> "$conf" echo "local: false" >> "$conf"
@ -287,7 +287,7 @@ write_netinstall_conf(){
local yaml="netinstall.yaml" local yaml="netinstall.yaml"
[[ ${initsys} == 'openrc' ]] && yaml="netinstall-${initsys}.yaml" [[ ${initsys} == 'openrc' ]] && yaml="netinstall-${initsys}.yaml"
echo "---" > "$conf" echo "---" > "$conf"
echo "groupsUrl: ${cal_netgroups}/${yaml}" >> "$conf" echo "groupsUrl: ${netgroups}/${yaml}" >> "$conf"
} }
configure_calamares(){ configure_calamares(){

12
lib/util-iso.sh
View file

@ -180,10 +180,10 @@ make_checksum(){
gen_iso_fn(){ gen_iso_fn(){
local vars=() name local vars=() name
vars+=("${iso_name}") vars+=("${iso_name}")
if ! ${cal_netinstall};then if ! ${netinstall};then
[[ -n ${profile} ]] && vars+=("${profile}") [[ -n ${profile} ]] && vars+=("${profile}")
else else
if ${cal_unpackfs};then if ${unpackfs};then
[[ -n ${profile} ]] && vars+=("${profile}") [[ -n ${profile} ]] && vars+=("${profile}")
fi fi
fi fi
@ -563,8 +563,8 @@ check_profile(){
[[ -f "${profile_dir}/Packages-Mhwd" ]] && packages_mhwd=${profile_dir}/Packages-Mhwd [[ -f "${profile_dir}/Packages-Mhwd" ]] && packages_mhwd=${profile_dir}/Packages-Mhwd
if ! ${cal_netinstall};then if ! ${netinstall};then
cal_unpackfs="true" unpackfs="true"
fi fi
} }
@ -675,8 +675,8 @@ reset_profile(){
unset login_shell unset login_shell
unset tracker_url unset tracker_url
unset piece_size unset piece_size
unset cal_netinstall unset netinstall
unset cal_unpackfs unset unpackfs
} }
make_profile(){ make_profile(){

14
lib/util.sh
View file

@ -365,11 +365,11 @@ check_profile_vars(){
if ! is_valid_bool "${pxe_boot}";then if ! is_valid_bool "${pxe_boot}";then
die "pxe_boot only accepts true/false value!" die "pxe_boot only accepts true/false value!"
fi fi
if ! is_valid_bool "${cal_netinstall}";then if ! is_valid_bool "${netinstall}";then
die "cal_netinstall only accepts true/false value!" die "netinstall only accepts true/false value!"
fi fi
if ! is_valid_bool "${cal_unpackfs}";then if ! is_valid_bool "${unpackfs}";then
die "cal_unpackfs only accepts true/false value!" die "unpackfs only accepts true/false value!"
fi fi
} }
@ -449,11 +449,11 @@ load_profile_config(){
[[ -z ${piece_size} ]] && piece_size=21 [[ -z ${piece_size} ]] && piece_size=21
[[ -z ${cal_netinstall} ]] && cal_netinstall='false' [[ -z ${netinstall} ]] && netinstall='false'
[[ -z ${cal_unpackfs} ]] && cal_unpackfs='true' [[ -z ${unpackfs} ]] && unpackfs='true'
[[ -z ${cal_netgroups} ]] && cal_netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master" [[ -z ${netgroups} ]] && netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master"
check_profile_vars check_profile_vars