fix logging in autoyast.xml.erb

(cherry picked from commit 60bcc2b5dc6372311e312d5f5d0dc177bb31866f)

Conflicts:
	chef/cookbooks/provisioner/templates/default/autoyast.xml.erb
fix logging location for crowbar_join to be consistent

(cherry picked from commit 08fc3561d18013a18b5777c079d23e881649fdfb)
disable final reboot

this prevents the database proposal from failing in mkcloud

(cherry picked from commit de6dcc873d43c5ee1b11f16831348b6a659672a0)
adding final repos to autoyast.xml.erb

(cherry picked from commit adc123aeb565f41be9d23edfed5a6b06ddc75157)
(changed 1.0 repos -> 2.0)
remove old DHCPDIR, leftover from merge

(cherry picked from commit 4e4a3138a881b68a213330361742cbac4d73194c)

Conflicts:
	updates/control.sh
Make sure to fix things if hte final step in join recovery is successful.

Signed-off-by: Christoph Thiel <cthiel@suse.com>
(cherry picked from commit 740fced9bf41ef7cbcb064b23c78d8209bc0e672)

Seems to have been missed from backporting from trunk to Pebbles.
add logging output

(cherry picked from commit ab67409b9ea1eb1b26cd01f75c2bc79b68ee81b7)
Prevent accidental infinite recursion in control.sh

If something goes wrong with $HOSTNAME calculation in start-up.sh,
we need to avoid source'ing this script, which would cause infinite
recursion and eventually a segfault from bash.

https://bugzilla.novell.com/show_bug.cgi?id=778124
(cherry picked from commit 2ced30fd3c05f6a7a77aa753c70258be89dcce52)
Rebuild /root/.ssh/authorized_keys from scratch

This ensures that removal of a key from the proposal will be
propagated to removal from /root/.ssh/authorized_keys.  Another
side-effect is that any keys manually added to authorized_keys will be
automatically removed by Chef.

https://bugzilla.novell.com/show_bug.cgi?id=782525
(cherry picked from commit 7ce5f293babeec718ee07e32c95cdccca76e450a)
Remove unnecessary removal of /root/.ssh/authorized_keys before reconstruction

This introduced a tiny race window in which /root/.ssh/authorized_keys
did not exist.  Chef's template resource will happily overwrite existing
files when the action is :create, so this delete was unnecessary.

(cherry picked from commit 8ba65522400d4834fd013693a0cbc824602f8d36)
explicitly do not run chrooted (bnc#787344)

run as dhcpd user for enhanced security

(cherry picked from commit 323b98741f655963a2ac96876b042ee6174e4b3e)
TFTP server not running because xinetd was not reloaded (bnc#785689)

(cherry picked from commit 0c1d40d193facb67929acfa241a1dbb0d572c981)
provisioner recipe requires utils

(cherry picked from commit 9991cf4540ec50894a5049f18d5927ab58e8cf87)
Change provisioner web server root to /srv/tftpboot (SUSE)

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit aab7ad9e05cbdc516141dcb5a8ef6beefd855d87)
control.sh: Correctly save hostname on SLES
Update supported_oses in template for SLES-11-SP3

(cherry picked from commit 4c6a2bd335d855381dee0a5afb6142ee8c57380c)
Signed-off-by: Adam Spiers <aspiers@suse.com>
crowbar_join: Use /var/log/crowbar/crowbar_join as log directory

(cherry picked from commit 28d46a8e16516ac363b0509b66c851f686abc143)
Signed-off-by: Adam Spiers <aspiers@suse.com>
Merge branch 'release/pebbles/master' into release/pebbles/pending