diff options
| author | Jonathan Bauer | 2016-07-14 14:07:52 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-07-14 14:07:52 +0200 |
| commit | d5a262c682f4b6f09c979f0e0f13c6023d18f3e6 (patch) | |
| tree | 90a363a650bdc3e68786ac1f23dd901fcb47b798 /remote/rootfs | |
| parent | [pvs2-freiburg] add missing configuration options to pvs2.ini (diff) | |
| parent | [xscreensaver] initial module (diff) | |
| download | tm-scripts-d5a262c682f4b6f09c979f0e0f13c6023d18f3e6.tar.gz tm-scripts-d5a262c682f4b6f09c979f0e0f13c6023d18f3e6.tar.xz tm-scripts-d5a262c682f4b6f09c979f0e0f13c6023d18f3e6.zip | |
Merge branch 'master' of 10.4.9.56:/root/tm-scripts
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, 2 insertions, 6 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 2903e5e4..ec98ff70 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 " |