From 80e49d190ff99e8c489bbf420dc2bc248ae553e3 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Wed, 7 Sep 2022 14:35:40 +0200
Subject: [PATCH] Use new website flatcar.org

The flatcar-linux.org domain has redirects but it's better to use the
current domain directly.
---
 build_library/grub.cfg                   | 2 +-
 build_library/set_lsb_release            | 4 ++--
 contrib/create-coreos-vdi                | 2 +-
 sdk_container/.repo/manifests/os-release | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index ca6c5f1824..d62b98ec3f 100644
--- a/build_library/grub.cfg
+++ b/build_library/grub.cfg
@@ -130,7 +130,7 @@ function gptprio {
         echo
         echo "Reading or updating the GPT failed!"
         echo "Please file a bug with any messages above to Flatcar:"
-        echo " https://issues.flatcar-linux.org"
+        echo " https://issues.flatcar.org"
         abort
     fi
 
diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index 9b71a95907..f86c968909 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -55,8 +55,8 @@ BUILD_ID=$FLATCAR_BUILD_ID
 SYSEXT_LEVEL=1.0
 PRETTY_NAME="$OS_PRETTY_NAME"
 ANSI_COLOR="38;5;75"
-HOME_URL="https://flatcar-linux.org/"
-BUG_REPORT_URL="https://issues.flatcar-linux.org"
+HOME_URL="https://flatcar.org/"
+BUG_REPORT_URL="https://issues.flatcar.org"
 FLATCAR_BOARD="$FLAGS_board"
 CPE_NAME="cpe:2.3:o:${OS_ID}-linux:${OS_ID}_linux:${FLATCAR_VERSION}:*:*:*:*:*:*:*"
 EOF
diff --git a/contrib/create-coreos-vdi b/contrib/create-coreos-vdi
index fa7e4a862c..a2039275ba 100755
--- a/contrib/create-coreos-vdi
+++ b/contrib/create-coreos-vdi
@@ -12,7 +12,7 @@ This tool creates a Flatcar VDI image to be used with VirtualBox.
 "
 
 # Image signing key: buildbot@flatcar-linux.org
-GPG_KEY_URL="https://flatcar-linux.org/security/image-signing-key/Flatcar_Image_Signing_Key.pem"
+GPG_KEY_URL="https://www.flatcar.org/security/image-signing-key/Flatcar_Image_Signing_Key.pem"
 GPG_LONG_ID="E25D9AED0593B34A"
 GPG_KEY="$(wget -qO- $GPG_KEY_URL)"
 
diff --git a/sdk_container/.repo/manifests/os-release b/sdk_container/.repo/manifests/os-release
index 60048aca6a..3942c3a2d9 100644
--- a/sdk_container/.repo/manifests/os-release
+++ b/sdk_container/.repo/manifests/os-release
@@ -2,5 +2,5 @@ NAME="Flatcar Container Linux by Kinvolk"
 ID=flatcar
 ID_LIKE=coreos
 ANSI_COLOR="38;5;75"
-HOME_URL="https://flatcar-linux.org/"
-BUG_REPORT_URL="https://issues.flatcar-linux.org"
+HOME_URL="https://flatcar.org/"
+BUG_REPORT_URL="https://issues.flatcar.org"