mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 13:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(set_lsb_release): Write configured group to /etc instead of /usr

Browse Source 
The /usr images must be identical across groups so that information is
static. Eventually the default will be 'stable'
This commit is contained in:
Michael Marineau 2014-05-06 13:21:10 -07:00
parent ce9d1c95a9
commit c3d07e942c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_library/dev_image_util.sh
View File

@ -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

13
build_library/set_lsb_release
View File

@ -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