From d24b6df2d76df3bf4ff02fc17fffc8c1650cecf6 Mon Sep 17 00:00:00 2001 From: Igor Date: Wed, 17 May 2023 13:28:41 +0200 Subject: [PATCH] Change remaining variables of base-files --- .../artifacts/artifact-armbian-base-files.sh | 24 +++++++++++++++++++ lib/functions/configuration/main-config.sh | 5 ++++ 2 files changed, 29 insertions(+) diff --git a/lib/functions/artifacts/artifact-armbian-base-files.sh b/lib/functions/artifacts/artifact-armbian-base-files.sh index cec75b921..9d27211b9 100644 --- a/lib/functions/artifacts/artifact-armbian-base-files.sh +++ b/lib/functions/artifacts/artifact-armbian-base-files.sh @@ -126,10 +126,34 @@ function compile_armbian-base-files() { # Change the PRETTY_NAME and add ARMBIAN_PRETTY_NAME in os-release, and change issue, issue.net declare orig_distro_release="${RELEASE}" + cat <<- EOD >> "${destination}/etc/dpkg/origins/armbian" + Vendor: ${VENDOR} + Vendor-URL: ${VENDORURL} + Bugs: ${VENDORBUGS} + Parent: ${DISTRIBUTION} + EOD echo "ARMBIAN_PRETTY_NAME=\"${VENDOR} ${REVISION} ${orig_distro_release}\"" >> "${destination}"/etc/os-release echo -e "${VENDOR} ${REVISION} ${orig_distro_release} \\l \n" > "${destination}"/etc/issue echo -e "${VENDOR} ${REVISION} ${orig_distro_release}" > "${destination}"/etc/issue.net sed -i "s/^PRETTY_NAME=.*/PRETTY_NAME=\"${VENDOR} $REVISION ${orig_distro_release}\"/" "${destination}"/etc/os-release + sed -i "s|^HOME_URL=.*|HOME_URL=\"${VENDORURL}\"|" "${destination}"/etc/os-release + sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"${VENDORSUPPORT}\"|" "${destination}"/etc/os-release + sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"${VENDORBUGS}\"|" "${destination}"/etc/os-release + sed -i "s|^PRIVACY_POLICY_URL=.*|PRIVACY_POLICY_URL=\"${VENDORPRIVACY}\"|" "${destination}"/etc/os-release + sed -i "s|^LOGO=.*|LOGO=\"${VENDORLOGO}\"|" "${destination}"/etc/os-release + + # Remove content from motd: Ubuntu header, welcome text and news. We have our own + [[ -f "${destination}"/etc/update-motd.d/00-header ]] && echo "# placeholder" > "${destination}"/etc/update-motd.d/00-header + [[ -f "${destination}"/etc/update-motd.d/10-help-text ]] && echo "# placeholder" > "${destination}"/etc/update-motd.d/10-help-text + [[ -f "${destination}"/etc/update-motd.d/10-uname ]] && echo "# placeholder" > "${destination}"/etc/update-motd.d/10-uname + [[ -f "${destination}"/etc/update-motd.d/50-motd-news ]] && echo "# placeholder" > "${destination}"/etc/update-motd.d/50-motd-news + + # Remove Ubuntu default services + [[ -f "${destination}"/lib/systemd/motd-news.service ]] && rm "${destination}"/lib/systemd/motd-news.service + [[ -f "${destination}"/lib/systemd/motd-news.timer ]] && rm "${destination}"/lib/systemd/motd-news.timer + + # Adjust legal disclaimer + [[ -f "${destination}"/etc/legal ]] && sed -i "s/${DISTRIBUTION}/${VENDOR}/g" "${destination}"/etc/legal # Remove /etc/issue and /etc/issue.net from the DEBIAN/conffiles file sed -i '/^\/etc\/issue$/d' "${destination}"/DEBIAN/conffiles diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 1bc31e215..50b7c179d 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -39,6 +39,11 @@ function do_main_configuration() { declare -r -g artifact_prefix_version="${REVISION}--" [[ -z $VENDOR ]] && VENDOR="Armbian" + [[ -z $VENDORURL ]] && VENDORURL="https://www.armbian.com" + [[ -z $VENDORSUPPORT ]] && VENDORSUPPORT="https://forum.armbian.com" + [[ -z $VENDORPRIVACY ]] && VENDORPRIVACY="https://www.armbian.com" + [[ -z $VENDORBUGS ]] && VENDORBUGS="https://www.armbian.com/bugs" + [[ -z $VENDORLOGO ]] && VENDORLOGO="armbian-logo" [[ -z $ROOTPWD ]] && ROOTPWD="1234" # Must be changed @first login [[ -z $MAINTAINER ]] && MAINTAINER="Igor Pecovnik" # deb signature [[ -z $MAINTAINERMAIL ]] && MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature