Merge "Rename generate-interfaces-file.sh..."

This commit is contained in:
Jenkins 2014-01-23 21:58:31 +00:00 committed by Gerrit Code Review
commit fac607e8d8
5 changed files with 5 additions and 5 deletions

View File

@ -6,6 +6,6 @@ to know ahead of time which one is which, so we will simply run a
DHCP client on all interfaces with real MAC addresses (except lo) that
are visible on the first boot.
The script /usr/local/sbin/generate-interfaces-file.sh will be called
The script /usr/local/sbin/dhcp-all-interfaces.sh will be called
early in each boot and will scan available network interfaces and
ensure they are configured properly before networking services are started.

View File

@ -3,7 +3,7 @@ set -x
SCRIPTDIR=$(dirname $0)
install -D -g root -o root -m 0755 ${SCRIPTDIR}/generate-interfaces-file.sh /usr/local/sbin/generate-interfaces-file.sh
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.sh /usr/local/sbin/dhcp-all-interfaces.sh
DIB_INIT_SYSTEM=$(dib-init-system)
if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then

View File

@ -1,4 +1,4 @@
# Call a script to generate an /etc/network/interfaces file to DHCP all available interfaces
# Call a script to generate a /etc/network/interfaces file to DHCP all available interfaces
# Then remove this config file so the script is never run again
description "DHCP any connected, but unconfigured network interfaces"
@ -8,4 +8,4 @@ instance $INTERFACE
task
exec /usr/local/sbin/generate-interfaces-file.sh
exec /usr/local/sbin/dhcp-all-interfaces.sh

View File

@ -6,7 +6,7 @@ Before=network.service
[Service]
Type=oneshot
ExecStart=/usr/local/sbin/generate-interfaces-file.sh
ExecStart=/usr/local/sbin/dhcp-all-interfaces.sh
RemainAfterExit=yes
[Install]