[util*] fix the profile.conf for cli-installer
This commit is contained in:
parent
2e39400723
commit
120708bc8a
3 changed files with 24 additions and 20 deletions
|
@ -191,6 +191,29 @@ configure_calamares(){
|
|||
fi
|
||||
}
|
||||
|
||||
write_cli_inst_conf(){
|
||||
local conf=$1/profile.conf
|
||||
echo '' >> ${conf}
|
||||
echo '# profile image name' >> ${conf}
|
||||
echo "profile=${profile}" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo '# iso_name' >> ${conf}
|
||||
echo "iso_name=${iso_name}" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo '# kernel' >> ${conf}
|
||||
echo "kernnel=${kernel}" >> ${conf}
|
||||
}
|
||||
|
||||
configure_cli_inst(){
|
||||
msg2 "Configuring cli-installer ..."
|
||||
local path=$1${DATADIR}
|
||||
[[ ! -d $path ]] && mkdir -p $path
|
||||
|
||||
cp ${profile_conf} $path
|
||||
|
||||
write_cli_inst_conf "$path"
|
||||
}
|
||||
|
||||
configure_thus(){
|
||||
msg2 "Configuring Thus ..."
|
||||
source "$1/etc/mkinitcpio.d/${kernel}.preset"
|
||||
|
|
|
@ -18,25 +18,6 @@ copy_overlay(){
|
|||
fi
|
||||
}
|
||||
|
||||
write_profile_conf_entries(){
|
||||
local conf=$1/profile.conf
|
||||
echo '' >> ${conf}
|
||||
echo '# profile image name' >> ${conf}
|
||||
echo "profile=${profile}" >> ${conf}
|
||||
echo '' >> ${conf}
|
||||
echo '# iso_name' >> ${conf}
|
||||
echo "iso_name=${iso_name}" >> ${conf}
|
||||
}
|
||||
|
||||
copy_profile_conf(){
|
||||
msg2 "Copying profile.conf ..."
|
||||
[[ ! -d $1 ]] && mkdir -p $1
|
||||
|
||||
cp ${profile_conf} $1
|
||||
|
||||
write_profile_conf_entries $1
|
||||
}
|
||||
|
||||
copy_cache_mhwd(){
|
||||
msg2 "Copying mhwd package cache ..."
|
||||
rsync -v --files-from="$1/cache-packages.txt" /var/cache/pacman/pkg "$1/opt/live/pkgs"
|
||||
|
@ -428,6 +409,7 @@ configure_live_image(){
|
|||
configure_services_live "$1"
|
||||
configure_calamares "$1"
|
||||
configure_thus "$1"
|
||||
configure_cli_inst "$1"
|
||||
msg "Done configuring [live-image]"
|
||||
}
|
||||
|
||||
|
|
|
@ -267,7 +267,6 @@ make_image_live() {
|
|||
|
||||
pacman -Qr "${path}" > "${path}/live-image-pkgs.txt"
|
||||
copy_overlay "${profile_dir}/live-overlay" "${path}"
|
||||
copy_profile_conf "${path}${DATADIR}"
|
||||
configure_live_image "${path}"
|
||||
${is_custom_pac_conf} && clean_pacman_conf "${path}"
|
||||
|
||||
|
|
Loading…
Reference in a new issue