root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix calamares branding

Browse source 
Signed-off-by: Ste74 <stefano@manjaro.org>
This commit is contained in:
Ste74 2018-12-18 21:13:25 -05:00
parent 8d140615f6
commit 08ba08e846
No known key found for this signature in database
GPG key ID: 8DB9F8C18DF53602
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/util-iso-image.sh
View file

@ -96,18 +96,17 @@ configure_lsb(){
}
configure_branding(){
if [ -e $1/usr/share/calamares/branding/manjaro/branding.desc ] ; then
msg2 "Configuring branding"
echo "---
msg2 "Configuring branding"
echo "---
componentName: manjaro
strings:
productName: Manjaro Linux
shortProductName: Manjaro
version: $dist_release
shortVersion: $dist_release
versionedName: Manjaro Linux $dist_release "$dist_codename"
shortVersionedName: Manjaro $dist_release
version: ${dist_release}
shortVersion: ${dist_release}
versionedName: Manjaro Linux ${dist_release} "${dist_codename}"
shortVersionedName: Manjaro ${dist_release}
bootloaderEntryName: Manjaro
images:
@ -123,7 +122,6 @@ style:
sidebarTextSelect: "#9E4F5D"
" > $1/usr/share/calamares/branding/manjaro/branding.desc
fi
}
configure_logind(){

4
lib/util-iso.sh
View file

@ -260,8 +260,6 @@ make_image_root() {
configure_lsb "${path}"
configure_branding "${path}"
clean_up_image "${path}"
: > ${work_dir}/build.${FUNCNAME}
msg "Done [Base installation] (rootfs)"
@ -313,6 +311,8 @@ make_image_live() {
copy_overlay "${profile_dir}/live-overlay" "${path}"
configure_live_image "${path}"
configure_branding "${path}"
reset_pac_conf "${path}"
umount_fs