diff options
| -rwxr-xr-x | 2-jenkins.sh | 4 | ||||
| -rwxr-xr-x | build-iso.sh | 22 | ||||
| -rw-r--r-- | extras/not-vyos/splash.png | bin | 0 -> 4291 bytes | |||
| -rw-r--r-- | readme.md | 10 |
4 files changed, 35 insertions, 1 deletions
diff --git a/2-jenkins.sh b/2-jenkins.sh index df6f5a3..deb843a 100755 --- a/2-jenkins.sh +++ b/2-jenkins.sh @@ -211,7 +211,7 @@ else -s "//tree-map" -t elem -n "default" -v "" \ -s "//default" -t elem -n "comparator" -v "" \ -i "//comparator" -t attr -n "class" -v "java.lang.String\$CaseInsensitiveComparator" \ - -s "//tree-map" -t elem -n "int" -v "4" \ + -s "//tree-map" -t elem -n "int" -v "5" \ -s "//tree-map" -t elem -n "string" -v "ARM64_BUILD_DISABLED" \ -s "//tree-map" -t elem -n "string" -v "true" \ -s "//tree-map" -t elem -n "string" -v "CUSTOM_BUILD_CHECK_DISABLED" \ @@ -220,6 +220,8 @@ else -s "//tree-map" -t elem -n "string" -v "172.17.17.17:5000" \ -s "//tree-map" -t elem -n "string" -v "DEV_PACKAGES_VYOS_NET_HOST" \ -s "//tree-map" -t elem -n "string" -v "jenkins@172.17.17.17" \ + -s "//tree-map" -t elem -n "string" -v "NOT_VYOS" \ + -s "//tree-map" -t elem -n "string" -v "$NOT_VYOS" \ $JENKINS_CONFIG_FILE 2>/dev/null } diff --git a/build-iso.sh b/build-iso.sh index 5e6907a..735a842 100755 --- a/build-iso.sh +++ b/build-iso.sh @@ -38,6 +38,28 @@ pushd vyos-build > /dev/null echo "Checking out the $BRANCH branch..." git checkout "$BRANCH" > /dev/null 2>&1 +function HandleBranding { + if [ "$NOT_VYOS" == "yes" ]; then + echo "Removing branding..." + cp ../extras/not-vyos/splash.png ./data/live-build-config/includes.binary/isolinux/splash.png + sed -i 's/VyOS/NOTvyos/' ./data/live-build-config/includes.binary/isolinux/menu.cfg + defaultToml="./data/defaults.toml" + if [ -f "$defaultToml" ]; then + sed -i -E 's/website_url =.*/website_url = "localhost"/' "$defaultToml" + sed -i -E 's/support_url =.*/support_url = "There is no support."/' "$defaultToml" + sed -i -E 's/bugtracker_url =.*/bugtracker_url = "You are on your own. DO NOT report bugs to VyOS!"/' "$defaultToml" + sed -i -E 's/project_news_url =.*/project_news_url = "This is unofficial NOTvyos build."/' "$defaultToml" + fi + defaultMotd="./data/live-build-config/includes.chroot/usr/share/vyos/default_motd" + if [ -f "$defaultMotd" ]; then + sed -i 's/VyOS/NOTvyos/' "$defaultMotd" + sed -i -E 's/Check out project news at.*/This is unofficial NOTvyos build./' "$defaultMotd" + sed -i -E 's/and feel free to report bugs at.*/You are on your own. DO NOT report bugs to VyOS!/' "$defaultMotd" + fi + fi +} +(set -e; HandleBranding) + echo "Downloading apt signing key..." wget http://172.17.17.17/apt.gpg.key -O /tmp/apt.gpg.key > /dev/null 2>&1 diff --git a/extras/not-vyos/splash.png b/extras/not-vyos/splash.png Binary files differnew file mode 100644 index 0000000..5dd0028 --- /dev/null +++ b/extras/not-vyos/splash.png @@ -89,6 +89,16 @@ Not defined or empty value means all branches (the default). export BRANCH="sagitta" ``` +**If you want to distribute ISO** + +Then you should remove VyOS branding, you can do this by configuring `NOT_VYOS` environment variable to `yes` +before you run any script. Beware - by default, the ISO will include VyOS branding thus you shall not distribute +the ISO. + +```bash +export NOT_VYOS="yes" +``` + **Then execute each script and follow instructions:** - `1-prereqs.sh`- installs dependencies. |
