From c3d07e942c89236856fa6be70e25e4e3314c8d7f Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 6 May 2014 13:21:10 -0700
Subject: [PATCH] feat(set_lsb_release): Write configured group to /etc instead
 of /usr

The /usr images must be identical across groups so that information is
static. Eventually the default will be 'stable'
---
 build_library/dev_image_util.sh |  3 +--
 build_library/set_lsb_release   | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index 2cc0eb3662..6b8f63a5d4 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -81,8 +81,7 @@ install_dev_packages() {
   # Setup portage for emerge and gmerge
   configure_dev_portage "${root_fs_dir}" "${devserver}"
 
-  sudo mkdir -p "${root_fs_dir}/etc/coreos"
-  sudo_clobber "${root_fs_dir}/etc/coreos/update.conf" <<EOF
+  sudo_append "${root_fs_dir}/etc/coreos/update.conf" <<EOF
 SERVER=${auserver}
 
 # For gmerge
diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index b74c93aca7..fd63991cf4 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -26,13 +26,9 @@ ROOT_FS_DIR="$FLAGS_root"
 [ -d "$ROOT_FS_DIR" ] || die "Root FS does not exist? ($ROOT_FS_DIR)"
 
 COREOS_VERSION_NAME="CoreOS"
-COREOS_VERSION_AUSERVER=""
-if [[ -n "${FLAGS_group}" ]]; then
-    COREOS_VERSION_AUSERVER="https://public.update.core-os.net/v1/update/"
-fi
 
 # DISTRIB_* are the standard lsb-release names
-sudo mkdir -p "${ROOT_FS_DIR}/usr/share/coreos" "${ROOT_FS_DIR}/etc"
+sudo mkdir -p "${ROOT_FS_DIR}/usr/share/coreos" "${ROOT_FS_DIR}/etc/coreos"
 sudo_clobber "${ROOT_FS_DIR}/usr/share/coreos/lsb-release" <<EOF
 DISTRIB_ID=$COREOS_VERSION_NAME
 DISTRIB_RELEASE=$COREOS_VERSION_STRING
@@ -63,7 +59,12 @@ COREOS_RELEASE_VERSION=$COREOS_VERSION_STRING
 COREOS_RELEASE_BOARD=$FLAGS_board
 EOF
 
+# TODO: update to beta, and then stable once those actually exist
 sudo_clobber "${ROOT_FS_DIR}/usr/share/coreos/update.conf" <<EOF
-SERVER=$COREOS_VERSION_AUSERVER
+SERVER=https://public.update.core-os.net/v1/update/
+GROUP=alpha
+EOF
+
+sudo_clobber "${ROOT_FS_DIR}/etc/coreos/update.conf" <<EOF
 GROUP=$FLAGS_group
 EOF