summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2012-06-15 18:15:57 +1000
committerDan Callaghan <dcallagh@redhat.com>2012-06-15 18:15:57 +1000
commitfec32616316694c10e0efe185625b0048d0d7ef3 (patch)
treea06b96d243d0a73244a89c9a0cb37ae1d37ccde6
parent8d8477fb5fd6f53f4a5b9191f12f925b7f926d7e (diff)
/distribution/beaker/setup: stop cobblerd, optionally enable beaker-pxemenubeaker-distribution-beaker-setup-1_4-79
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 0b20de9..9c9b42e 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -162,10 +162,19 @@ function LabController()
# Using cobbler to get the netboot loaders..
rlRun "cobbler get-loaders" 0 "get network boot loaders"
rlRun "cobbler sync" 0 "sync boot loaders to tftpboot"
+ rlServiceStop cobblerd
rlServiceStop iptables
rlRun "rhts-sync-set -s READY" 0 "Lab Controller ready"
rlRun "rhts-sync-block -s SERVERREADY -s ABORT $SERVER" 0 "Wait for Server to become ready"
rlServiceStart beaker-proxy beaker-watchdog beaker-provision
+ if [ -n "$ENABLE_BEAKER_PXEMENU" ] ; then
+ rlLog "Creating beaker_pxemenu cron job"
+ cat >/etc/cron.hourly/beaker_pxemenu <<"EOF"
+#!/bin/bash
+exec beaker-pxemenu -q
+EOF
+ chmod 755 /etc/cron.hourly/beaker_pxemenu
+ fi
# There is beaker-transfer as well but its disabled by default
rlRun "rhts-sync-set -s DONE" 0 "Lab Controller done"
rlPhaseEnd