diff --git a/data/profile.conf.example b/data/profile.conf.example index d35fc1a..7e33486 100644 --- a/data/profile.conf.example +++ b/data/profile.conf.example @@ -21,14 +21,6 @@ # use pxe # pxe_boot="true" -# desktop session executable -# default: auto detect -# default_desktop_executable="none" - -# desktop file to launch session -# default: auto detect -# default_desktop_file="none" - ################ install ################ # possible values: grub;systemd-boot @@ -48,7 +40,7 @@ # names must match openrc service names # start_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') -################# livecd ################# +################# live-session ################# # unset defaults to given value # hostname="manjaro" diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh index e89a1eb..72a90c2 100644 --- a/lib/util-iso-calamares.sh +++ b/lib/util-iso-calamares.sh @@ -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" diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh index 4065046..d07104c 100644 --- a/lib/util-iso-image.sh +++ b/lib/util-iso-image.sh @@ -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]" } diff --git a/lib/util-iso.sh b/lib/util-iso.sh index ccdca12..30909db 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -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}" diff --git a/lib/util.sh b/lib/util.sh index 297459e..f7ad6fe 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -187,6 +187,7 @@ get_branch(){ # $1: chroot # $2: branch set_branch(){ + info "Setting mirrorlist branch: %s" "$2" sed -e "s|/stable|/$2|g" -i "$1/etc/pacman.d/mirrorlist" }