[Ovirt-devel] [PATCH] Moves all ovirt-config-* scripts to /usr/libexec.

[Darryl L. Pierce]

This is to reinforce with the user that the scripts are not meant to be
used at the commandline individually.

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 scripts/ovirt-config-boot-wrapper |    2 +-
 scripts/ovirt-early               |    4 ++--
 scripts/ovirt-firstboot           |   16 ++++++++--------
 scripts/ovirt-functions           |    1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/scripts/ovirt-config-boot-wrapper b/scripts/ovirt-config-boot-wrapper
index 89f0fc0..f6a28b5 100755
--- a/scripts/ovirt-config-boot-wrapper
+++ b/scripts/ovirt-config-boot-wrapper
@@ -26,7 +26,7 @@ continuing."
     fi
     if ask_yes_or_no "Do you wish to continue ([Y]es/[N]o)?"; then
         mount_live \
-            && /usr/sbin/ovirt-config-boot /live "${bootparams}"
+            && $OVIRT_EXECDIR/ovirt-config-boot /live "${bootparams}"
         rc=$?
         break
     else
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 23c4f6e..921aaa8 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -147,7 +147,7 @@ configure_management_interface() {
         "ovirt")
             configure_ovirt_management_nic $bootif
             if [ -n "$init" ]; then
-                ovirt-config-storage AUTO
+                $OVIRT_EXECDIR/ovirt-config-storage AUTO
                 # initial configuration storage, after /config creation
                 ovirt_store_config \
                     /etc/sysconfig/network-scripts/ifcfg-* \
@@ -155,7 +155,7 @@ configure_management_interface() {
                 if [ $upgrade = 1 ]; then
                     # local disk installation for managed mode
                     mount_live
-                    ovirt-config-boot /live "$bootparams"
+                    $OVIRT_EXECDIR/ovirt-config-boot /live "$bootparams"
                 fi
             fi
             ;;
diff --git a/scripts/ovirt-firstboot b/scripts/ovirt-firstboot
index b992909..dae252b 100755
--- a/scripts/ovirt-firstboot
+++ b/scripts/ovirt-firstboot
@@ -46,17 +46,17 @@ start ()
     chkconfig collectd off
 
     if is_auto_install; then
-        ovirt-config-storage AUTO
-        ovirt-config-hostname AUTO
-        ovirt-config-networking AUTO
-        ovirt-config-logging AUTO
-        ovirt-config-collectd AUTO
-        ovirt-config-password AUTO
+        $OVIRT_EXECDIR/ovirt-config-storage AUTO
+        $OVIRT_EXECDIR/ovirt-config-hostname AUTO
+        $OVIRT_EXECDIR/ovirt-config-networking AUTO
+        $OVIRT_EXECDIR/ovirt-config-logging AUTO
+        $OVIRT_EXECDIR/ovirt-config-collectd AUTO
+        $OVIRT_EXECDIR/ovirt-config-password AUTO
     fi
 
     if is_upgrade; then
         mount_live
-        ovirt-config-boot /live "$OVIRT_BOOTPARAMS" no
+        $OVIRT_EXECDIR/ovirt-config-boot /live "$OVIRT_BOOTPARAMS" no
         disable_firstboot
         reboot
         return
@@ -65,7 +65,7 @@ start ()
     if is_firstboot; then
         plymouth --hide-splash
 
-        ovirt-config-setup -x < /dev/console
+        $OVIRT_EXECDIR/ovirt-config-setup -x < /dev/console
 
         plymouth --show-splash
     fi
diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions
index ff2b016..730c06a 100644
--- a/scripts/ovirt-functions
+++ b/scripts/ovirt-functions
@@ -1,5 +1,6 @@
 # -*-Shell-script-*-
 
+OVIRT_EXECDIR=/usr/libexec
 OVIRT_LOGFILE=/var/log/ovirt.log
 OVIRT_TMP_LOGFILE=/tmp/ovirt.log
 _log_status=1
-- 
1.6.6