From ec63a78c9c0d8dedda5b06733cb91c0ce2bc27be Mon Sep 17 00:00:00 2001
From: root
Date: Mon, 20 Jun 2016 16:32:53 +0200
Subject: Revert "[rfs-stage31] Include dmidecode, pass UUID when fetching
 config"

This reverts commit fa40dcb6f438cc83dc432bda79e70e7e36f19c2c.
Doesn't work with shitty rewrite rule we currently ship
---
 remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 6 ++----
 remote/rootfs/rootfs-stage31/module.conf                 | 1 -
 remote/rootfs/rootfs-stage31/module.conf.ubuntu          | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'remote')

diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
index 39680afc..135408f3 100644
--- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
+++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig
@@ -5,8 +5,6 @@ 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
@@ -15,7 +13,7 @@ fetch_sysconfig() {
 	[ -e "$CONFIG" ] && grep -E '^#_RCONFIG_TAG$' "$CONFIG" > /dev/null \
 		&& echo "Config already fetched." && return 0
 
-	download "${SLX_BASE_PATH}/config?uuid=${UUID}" "${CONFIG}-remote" || return 1
+	download "${SLX_BASE_PATH}/config" "${CONFIG}-remote" || return 1
 
 	echo "# Config fetched from $URL" >> "$CONFIG"
 	echo "#_RCONFIG_TAG" >> "$CONFIG"
@@ -28,7 +26,7 @@ fetch_sysconfig() {
 fetch_config_files() {
 	[ -e "${CONFIG}.tgz" ] && echo "config.tgz already downloaded." && return 0
 
-	download "${SLX_BASE_PATH}/config.tgz?uuid=${UUID}" "${CONFIG}.tgz"
+	download "${SLX_BASE_PATH}/config.tgz" "${CONFIG}.tgz"
 }
 
 
diff --git a/remote/rootfs/rootfs-stage31/module.conf b/remote/rootfs/rootfs-stage31/module.conf
index e09e744b..b41b1f10 100644
--- a/remote/rootfs/rootfs-stage31/module.conf
+++ b/remote/rootfs/rootfs-stage31/module.conf
@@ -1,6 +1,5 @@
 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 6ced7b11..35c9927b 100644
--- a/remote/rootfs/rootfs-stage31/module.conf.ubuntu
+++ b/remote/rootfs/rootfs-stage31/module.conf.ubuntu
@@ -1,4 +1,3 @@
 REQUIRED_INSTALLED_PACKAGES="
 	ntpdate
-	dmidecode
 "
-- 
cgit v1.2.3-55-g7522