diff options
| author | Martin Schwenke <martin@meltin.net> | 2010-05-21 11:53:54 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2010-05-21 11:53:54 +1000 |
| commit | 06853207c5c3db2d40a419a2fbb30acbd71203ff (patch) | |
| tree | c124add740053b49c98b36fcb49b2ae2537ee8c1 | |
| parent | 167b4e520bd9f760047d5c24db499bd2b8776b78 (diff) | |
New config variable KS_DONE_MESSAGE, used to find end of kickstart install.
Currently we look for a fixed string to indicate that a kickstart
install is complete. This changes that string to be parametrised, in
case we're using a non-standard installer.
Signed-off-by: Martin Schwenke <martin@meltin.net>
| -rwxr-xr-x | autocluster | 2 | ||||
| -rw-r--r-- | config.d/00base.defconf | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/autocluster b/autocluster index bd2a810..051ffa6 100755 --- a/autocluster +++ b/autocluster @@ -511,7 +511,7 @@ EOF sleep 2 # wait for the install to finish - if ! waitfor $KVMLOG/serial.$NAME "you may safely reboot your system" $CREATE_BASE_TIMEOUT ; then + if ! waitfor $KVMLOG/serial.$NAME "$KS_DONE_MESSAGE" $CREATE_BASE_TIMEOUT ; then $VIRSH destroy $NAME die "Failed to create base image $DISK" fi diff --git a/config.d/00base.defconf b/config.d/00base.defconf index 39b7598..0aeca73 100644 --- a/config.d/00base.defconf +++ b/config.d/00base.defconf @@ -280,6 +280,9 @@ defconf POSTINSTALL_TEMPLATE "" \ defconf KS_KERNEL_OPTS "rhgb console=tty1 console=ttyS0,19200 nodmraid nompath" \ "<opts>" "options passed by kickstart to the kernel" +defconf KS_DONE_MESSAGE "you may safely reboot your system" \ + "<string>" "string indicating kickstart install is complete" + ############################## defconf CREATE_BASE_TIMEOUT 3600 \ |