[PATCH 09/29] Correct paths of things started by loader/init that have moved.

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 loader/init.c       |    6 +++---
 loader/linuxrc.s390 |   14 +++++++-------
 loader/loader.c     |    2 +-
 loader/urlinstall.c |    4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/loader/init.c b/loader/init.c
index e79691f..aec1861 100644
--- a/loader/init.c
+++ b/loader/init.c
@@ -807,12 +807,12 @@ int main(int argc, char **argv) {
 
     /* D-Bus */
     if (fork() == 0) {
-        execl("/sbin/dbus-uuidgen", "/sbin/dbus-uuidgen", "--ensure", NULL);
+        execl("/bin/dbus-uuidgen", "/bin/dbus-uuidgen", "--ensure", NULL);
         doExit(1);
     }
 
     if (fork() == 0) {
-        execl("/sbin/dbus-daemon", "/sbin/dbus-daemon", "--system", NULL);
+        execl("/bin/dbus-daemon", "/bin/dbus-daemon", "--system", NULL);
         doExit(1);
     }
 
@@ -908,7 +908,7 @@ int main(int argc, char **argv) {
 
             if ((shellpid = fork()) == 0) {
                 if (chdir("/root") == 0) {
-                    execl("/sbin/bash", "/sbin/bash", NULL);
+                    execl("/bin/bash", "/in/bash", NULL);
                 } else {
                     perror("Unable to chdir to /root");
                 }
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index dc7f289..fccfdc5 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -91,7 +91,7 @@ function checkipv6()
 {
     local ip=$1
     [ -z "$ip" ] && return 1
-    /sbin/ipcalc -c -6 "$ip" >/dev/null 2>&1
+    /bin/ipcalc -c -6 "$ip" >/dev/null 2>&1
     return $?
 }
 
@@ -99,7 +99,7 @@ function checkipv4()
 {
     local ip=$1
     [ -z "$ip" ] && return 1
-    /sbin/ipcalc -c -4 "$ip" >/dev/null 2>&1
+    /bin/ipcalc -c -4 "$ip" >/dev/null 2>&1
     return $?
 }
 
@@ -182,7 +182,7 @@ function startinetd()
         echo >> /etc/motd
     fi # testing
 
-    /sbin/sshd -f /etc/ssh/sshd_config.anaconda
+    /usr/sbin/sshd -f /etc/ssh/sshd_config.anaconda
     if [ -z "$RUNKS" ]; then
         echo
         echo $"Connect now to $IPADDR and log in as user install to start the installation."
@@ -339,10 +339,10 @@ function init_main() {
         echo -e "127.0.0.1\tlocalhost.localdomain localhost localhost4 localhost4.localdomain4" > /etc/hosts
         echo -e     "::1\t\tlocalhost.localdomain localhost localhost6 localhost6.localdomain6" >> /etc/hosts
 
-        /sbin/dbus-uuidgen --ensure &
-        [ $? != 0 ] && echo "error on calling /sbin/dbus-uuidgen --ensure"
-        /sbin/dbus-daemon --system &
-        [ $? != 0 ] && echo "error on calling /sbin/dbus-daemon --system"
+        /bin/dbus-uuidgen --ensure &
+        [ $? != 0 ] && echo "error on calling /bin/dbus-uuidgen --ensure"
+        /bin/dbus-daemon --system &
+        [ $? != 0 ] && echo "error on calling /bin/dbus-daemon --system"
 
     fi # testing
 }
diff --git a/loader/loader.c b/loader/loader.c
index 7758f2f..44eeed8 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -158,7 +158,7 @@ void doShell(void) {
 
     if (child == 0) {
         if (chdir("/root") == 0) {
-            if (execl("/sbin/bash", "/sbin/bash", "-i", NULL) == -1) {
+            if (execl("/bin/bash", "/bin/bash", "-i", NULL) == -1) {
                 logMessage(ERROR, "%s (%d): %m", __func__, __LINE__);
                 _exit(1);
             }
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index fda3ecb..8e0439c 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -93,12 +93,12 @@ static char **headers() {
         }
     }
 
-    if (FL_KICKSTART_SEND_SERIAL(flags) && !access("/sbin/dmidecode", X_OK)) {
+    if (FL_KICKSTART_SEND_SERIAL(flags) && !access("/usr/sbin/dmidecode", X_OK)) {
         FILE *f;
         char sn[1024];
         size_t sn_len;
 
-        if ((f = popen("/sbin/dmidecode -s system-serial-number", "r")) == NULL) {
+        if ((f = popen("/usr/sbin/dmidecode -s system-serial-number", "r")) == NULL) {
             logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
             abort();
         }
-- 
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list