summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-09-04 22:37:11 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-09-05 02:57:58 -1000
commit805f564ac79492bb7ad33e5830bd0592337866a4 (patch)
tree25512b219affd5d9abc474455ac6d7bc62d0afc7 /isys
parent2e7f35af5e07f33b72d63888429d0613434bba15 (diff)
downloadanaconda-805f564ac79492bb7ad33e5830bd0592337866a4.tar.gz
anaconda-805f564ac79492bb7ad33e5830bd0592337866a4.tar.xz
anaconda-805f564ac79492bb7ad33e5830bd0592337866a4.zip
iface_start_NetworkManager() cleanups
No need to pass iface_t to iface_start_NetworkManager(). Remove unnecessary else { exit(0); } from the child process. Increase wait loop to 45 iterations.
Diffstat (limited to 'isys')
-rw-r--r--isys/iface.c4
-rw-r--r--isys/iface.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/isys/iface.c b/isys/iface.c
index 029f42f28..7a995c42c 100644
--- a/isys/iface.c
+++ b/isys/iface.c
@@ -448,7 +448,7 @@ int iface_have_in6_addr(struct in6_addr *addr6) {
* Start NetworkManager -- requires that you have already written out the
* control files in /etc/sysconfig for the interface.
*/
-int iface_start_NetworkManager(iface_t *iface) {
+int iface_start_NetworkManager(void) {
int status;
pid_t pid;
@@ -469,8 +469,6 @@ int iface_start_NetworkManager(iface_t *iface) {
"--pid-file=/var/run/NetworkManager/NetworkManager.pid",
NULL) == -1) {
exit(3);
- } else {
- exit(0);
}
} else if (pid == -1) {
return 1;
diff --git a/isys/iface.h b/isys/iface.h
index 00a980c28..8dcb1900a 100644
--- a/isys/iface.h
+++ b/isys/iface.h
@@ -154,7 +154,7 @@ int iface_have_in6_addr(struct in6_addr *addr6);
/*
* Start NetworkManager
*/
-int iface_start_NetworkManager(iface_t *iface);
+int iface_start_NetworkManager(void);
/*
* Set Maximum Transfer Unit (MTU) on specified interface