From 5da1f1324b120f99f0aee6ec4a14de4b5e4ed095 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 21 Jan 2014 16:10:43 -0500
Subject: [PATCH] Rename generate-interfaces-file.sh...

Rename generate-interfaces-file.sh to dhcp-all-interfaces.sh
so that it is easier to find/remember in the $PATH on a deployed
image.

Also, on some distros the script actually generates many files
so the previous name was a bit confusing.

Change-Id: I7152fa7c28e8ade251311da2cd5f75972423b66c
---
 elements/dhcp-all-interfaces/README.md                        | 2 +-
 elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces | 2 +-
 .../dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf    | 4 ++--
 .../dhcp-all-interfaces/install.d/dhcp-all-interfaces.service | 2 +-
 .../{generate-interfaces-file.sh => dhcp-all-interfaces.sh}   | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename elements/dhcp-all-interfaces/install.d/{generate-interfaces-file.sh => dhcp-all-interfaces.sh} (100%)

diff --git a/elements/dhcp-all-interfaces/README.md b/elements/dhcp-all-interfaces/README.md
index 6857f942a..480b2f37e 100644
--- a/elements/dhcp-all-interfaces/README.md
+++ b/elements/dhcp-all-interfaces/README.md
@@ -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.
diff --git a/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces b/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
index df4867098..eaa51c715 100755
--- a/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
+++ b/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
@@ -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
diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf
index 8cdbef009..bc0e74715 100644
--- a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf
+++ b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf
@@ -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
diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service
index b38476f01..e19c92406 100644
--- a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service
+++ b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service
@@ -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]
diff --git a/elements/dhcp-all-interfaces/install.d/generate-interfaces-file.sh b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh
similarity index 100%
rename from elements/dhcp-all-interfaces/install.d/generate-interfaces-file.sh
rename to elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh