diff --git a/config/defaults.ini b/config/defaults.ini index e49c8879..511e1e87 100644 --- a/config/defaults.ini +++ b/config/defaults.ini @@ -218,7 +218,7 @@ branding_desktop_config = branding_desktop_logo = # Brand-specific configuration for the First Boot Experience -branding_fbe_config = ${build:datadir}/branding/gnome-initial-setup/default/gnome-initial-setup.conf +branding_fbe_config = # Environment variables to substitute in branding configuration files branding_subst_vars_add = diff --git a/data/branding/gnome-initial-setup/default/gnome-initial-setup.conf b/data/branding/gnome-initial-setup/default/gnome-initial-setup.conf deleted file mode 100644 index abc69c82..00000000 --- a/data/branding/gnome-initial-setup/default/gnome-initial-setup.conf +++ /dev/null @@ -1,5 +0,0 @@ -[pages] -run_welcome_tour=false - -[Language] -initial_languages=en_US.UTF-8;pt_BR.UTF-8;es_MX.UTF-8;id_ID.UTF-8;fr_FR.UTF-8;ar_AE.UTF-8;ru_RU.UTF_8;ro_RO.UTF-8 diff --git a/hooks/image/50-branding-fbe b/hooks/image/50-branding-fbe index dc191d38..65c7c158 100644 --- a/hooks/image/50-branding-fbe +++ b/hooks/image/50-branding-fbe @@ -1,7 +1,6 @@ -# Adds the configuration file and assets to customize the welcome page of the FBE. +# Adds a configuration file to customise GNOME Initial Setup. # -# The file will live in /var/lib/eos-image-defaults/branding/gnome-initial-setup.conf, -# and any related resources (e.g. logo) under /var/lib/eos-image-defaults/branding/assets. +# The file will live in /etc/gnome-initial-setup/vendor.conf. if [ -z "${EIB_IMAGE_BRANDING_FBE_CONFIG}" ]; then exit 0 @@ -14,18 +13,7 @@ if [ "$CHECK" != OK ]; then exit 1 fi -CONFIG_DIR="${OSTREE_VAR}"/lib/eos-image-defaults/branding +CONFIG_PATH="${OSTREE_DEPLOYMENT}"/etc/gnome-initial-setup/vendor.conf -mkdir -p "${CONFIG_DIR}" -cp "${EIB_IMAGE_BRANDING_FBE_CONFIG}" "${CONFIG_DIR}"/ - -CONFIG_BASENAME=$(basename "${EIB_IMAGE_BRANDING_FBE_CONFIG}") - -for SUBST_VAR in ${EIB_IMAGE_BRANDING_SUBST_VARS}; do - sed -i "s|@${SUBST_VAR}@|${!SUBST_VAR}|g" "${CONFIG_DIR}"/"${CONFIG_BASENAME}" -done - -# The skipped pages file and the logo are optional -if [ -n "${EIB_IMAGE_BRANDING_FBE_SKIP_PAGES_FILE}" ]; then - cp "${EIB_IMAGE_BRANDING_FBE_SKIP_PAGES_FILE}" "${CONFIG_DIR}"/ -fi +mkdir -p "$(dirname "$CONFIG_PATH")" +cp "${EIB_IMAGE_BRANDING_FBE_CONFIG}" "$CONFIG_PATH"