fix(set_lsb_release): Set default GROUP= from arg again.

This makes sure developer builds stick to the developer group. After
commit c3d07e94 developer PXE/ISO images would report as 'alpha'.
This commit is contained in:
Michael Marineau 2014-05-07 12:49:53 -07:00
parent af8e6da2da
commit b4d6fb9597
2 changed files with 2 additions and 2 deletions

View File

@ -19,6 +19,7 @@ assert_not_root_user
DEFAULT_GROUP=developer DEFAULT_GROUP=developer
if [[ ${COREOS_OFFICIAL:-0} -eq 1 ]]; then if [[ ${COREOS_OFFICIAL:-0} -eq 1 ]]; then
# TODO: update to beta, and then stable once those actually exist
DEFAULT_GROUP=alpha DEFAULT_GROUP=alpha
fi fi

View File

@ -59,10 +59,9 @@ COREOS_RELEASE_VERSION=$COREOS_VERSION_STRING
COREOS_RELEASE_BOARD=$FLAGS_board COREOS_RELEASE_BOARD=$FLAGS_board
EOF EOF
# TODO: update to beta, and then stable once those actually exist
sudo_clobber "${ROOT_FS_DIR}/usr/share/coreos/update.conf" <<EOF sudo_clobber "${ROOT_FS_DIR}/usr/share/coreos/update.conf" <<EOF
SERVER=https://public.update.core-os.net/v1/update/ SERVER=https://public.update.core-os.net/v1/update/
GROUP=alpha GROUP=$FLAGS_group
EOF EOF
sudo_clobber "${ROOT_FS_DIR}/etc/coreos/update.conf" <<EOF sudo_clobber "${ROOT_FS_DIR}/etc/coreos/update.conf" <<EOF