openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Prevent tftp sysv init script from firing."

This commit is contained in:
Jenkins 2014-06-11 04:22:48 +00:00 committed by Gerrit Code Review
parent 12df31c364 2e3862990b
commit 68528f24b8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/ironic-conductor/install.d/68-ironic-tftp-support
View File

@ -20,6 +20,9 @@ install -o ironic -g ironic -m 744 $pxe_zero /tftpboot/pxelinux.0
# Disable the tftp-hpa upstart job, we're using xinetd
[ -f /etc/init/tftpd-hpa.conf ] && echo "manual" > /etc/init/tftpd-hpa.override
# Disable the tftpd-hpa SysV script for the same reason
[ -f /etc/init.d/tftpd-hpa ] && update-rc.d -f tftpd-hpa disable
cat > /etc/xinetd.d/tftp << EOF
service tftp
{