diff options
| author | Simon Rettberg | 2016-06-16 12:47:27 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-06-16 12:47:27 +0200 |
| commit | fa40dcb6f438cc83dc432bda79e70e7e36f19c2c (patch) | |
| tree | e3ad4ff10066ceff86a6d8ee91dc69c6f100d6d9 /remote/rootfs | |
| parent | [run-virt] Clean up macaddr gen, move to run-virt-env, assign predictable MACs (diff) | |
| download | tm-scripts-fa40dcb6f438cc83dc432bda79e70e7e36f19c2c.tar.gz tm-scripts-fa40dcb6f438cc83dc432bda79e70e7e36f19c2c.tar.xz tm-scripts-fa40dcb6f438cc83dc432bda79e70e7e36f19c2c.zip | |
[rfs-stage31] Include dmidecode, pass UUID when fetching config
Diffstat (limited to 'remote/rootfs')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 6 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/module.conf | 1 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/module.conf.ubuntu | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 135408f3..39680afc 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -5,6 +5,8 @@ echo "Configuring stage 3.2 ..." # first a few variables CONFIG="${FUTURE_ROOT}/opt/openslx/config" +UUID=$(dmidecode -s system-uuid | grep -m1 -E '^[0-9A-F\-]{36}$') + ######################################################################### # # This function downloads the config containing environment variables @@ -13,7 +15,7 @@ fetch_sysconfig() { [ -e "$CONFIG" ] && grep -E '^#_RCONFIG_TAG$' "$CONFIG" > /dev/null \ && echo "Config already fetched." && return 0 - download "${SLX_BASE_PATH}/config" "${CONFIG}-remote" || return 1 + download "${SLX_BASE_PATH}/config?uuid=${UUID}" "${CONFIG}-remote" || return 1 echo "# Config fetched from $URL" >> "$CONFIG" echo "#_RCONFIG_TAG" >> "$CONFIG" @@ -26,7 +28,7 @@ fetch_sysconfig() { fetch_config_files() { [ -e "${CONFIG}.tgz" ] && echo "config.tgz already downloaded." && return 0 - download "${SLX_BASE_PATH}/config.tgz" "${CONFIG}.tgz" + download "${SLX_BASE_PATH}/config.tgz?uuid=${UUID}" "${CONFIG}.tgz" } diff --git a/remote/rootfs/rootfs-stage31/module.conf b/remote/rootfs/rootfs-stage31/module.conf index b41b1f10..e09e744b 100644 --- a/remote/rootfs/rootfs-stage31/module.conf +++ b/remote/rootfs/rootfs-stage31/module.conf @@ -1,5 +1,6 @@ REQUIRED_BINARIES=" ntpdate + dmidecode " REQUIRED_MODULES=" busybox diff --git a/remote/rootfs/rootfs-stage31/module.conf.ubuntu b/remote/rootfs/rootfs-stage31/module.conf.ubuntu index 35c9927b..6ced7b11 100644 --- a/remote/rootfs/rootfs-stage31/module.conf.ubuntu +++ b/remote/rootfs/rootfs-stage31/module.conf.ubuntu @@ -1,3 +1,4 @@ REQUIRED_INSTALLED_PACKAGES=" ntpdate + dmidecode " |