diff options
| author | root | 2016-07-13 16:34:02 +0200 |
|---|---|---|
| committer | root | 2016-07-13 16:34:02 +0200 |
| commit | edfafb5c887c8015ce594435090d1cc26b9c33c3 (patch) | |
| tree | 0de48c71e418fb505a25f70ffde9b1e845783abe /remote | |
| parent | Revert "[rfs-stage31] Include dmidecode, pass UUID when fetching config" (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-edfafb5c887c8015ce594435090d1cc26b9c33c3.tar.gz tm-scripts-edfafb5c887c8015ce594435090d1cc26b9c33c3.tar.xz tm-scripts-edfafb5c887c8015ce594435090d1cc26b9c33c3.zip | |
Merge branch 'master' of git://git.openslx.org/openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/kernel-vanilla/module.conf | 2 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/remote/modules/kernel-vanilla/module.conf b/remote/modules/kernel-vanilla/module.conf index a0973a2b..0ea12bc3 100644 --- a/remote/modules/kernel-vanilla/module.conf +++ b/remote/modules/kernel-vanilla/module.conf @@ -1,5 +1,5 @@ REQUIRED_BINARIES="" REQUIRED_LIBRARIES="" REQUIRED_DIRECTORIES="" -REQUIRED_KERNEL="4.4.13" +REQUIRED_KERNEL="4.4.15" REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 135408f3..ec98ff70 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -96,6 +96,17 @@ HEREEND # fetch_sysconfig || drop_shell "Could not download remote config" +if ! ash -n "${CONFIG}-remote"; then + echo -e "\n\tFATAL: Could not download configuration!" + echo -e "\tAborting boot since the system would be in an unusable state." + echo -en "\tRebooting in 60 seconds" + timeout=60 + while [ $(( timeout-- )) -gt 0 ]; do + echo -n "." + sleep 1 + done + echo b > /proc/sysrq-trigger +fi . "${CONFIG}-remote" || drop_shell "Could not source remote config" fetch_config_files || drop_shell "Could not download config.tgz" update_sysconfig || drop_shell "Could not update sysconfig" |