summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorMichael Brown2013-11-01 02:55:13 +0100
committerMichael Brown2013-11-01 17:26:02 +0100
commitd1be9f4acc9d4367fb6dc793495f0cc819b5a514 (patch)
tree6865cbc8e41c0b052aa704f0a41b7eaecd0f2f0a /src/usr
parent[job] Allow job_progress() to return an ongoing job status code, if known (diff)
downloadipxe-d1be9f4acc9d4367fb6dc793495f0cc819b5a514.tar.gz
ipxe-d1be9f4acc9d4367fb6dc793495f0cc819b5a514.tar.xz
ipxe-d1be9f4acc9d4367fb6dc793495f0cc819b5a514.zip
[monojob] Add timeout parameter to monojob_wait()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/dhcpmgmt.c4
-rw-r--r--src/usr/fcmgmt.c2
-rw-r--r--src/usr/imgmgmt.c2
-rw-r--r--src/usr/imgtrust.c2
-rw-r--r--src/usr/nslookup.c2
-rw-r--r--src/usr/pingmgmt.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/usr/dhcpmgmt.c b/src/usr/dhcpmgmt.c
index 10d8ecfa..7b8e5370 100644
--- a/src/usr/dhcpmgmt.c
+++ b/src/usr/dhcpmgmt.c
@@ -52,7 +52,7 @@ int dhcp ( struct net_device *netdev ) {
printf ( "DHCP (%s %s)", netdev->name,
netdev->ll_protocol->ntoa ( netdev->ll_addr ) );
if ( ( rc = start_dhcp ( &monojob, netdev ) ) == 0 )
- rc = monojob_wait ( "" );
+ rc = monojob_wait ( "", 0 );
return rc;
}
@@ -63,7 +63,7 @@ int pxebs ( struct net_device *netdev, unsigned int pxe_type ) {
/* Perform PXE Boot Server Discovery */
printf ( "PXEBS (%s type %d)", netdev->name, pxe_type );
if ( ( rc = start_pxebs ( &monojob, netdev, pxe_type ) ) == 0 )
- rc = monojob_wait ( "" );
+ rc = monojob_wait ( "", 0 );
return rc;
}
diff --git a/src/usr/fcmgmt.c b/src/usr/fcmgmt.c
index 2657ba0c..a30f37a7 100644
--- a/src/usr/fcmgmt.c
+++ b/src/usr/fcmgmt.c
@@ -112,5 +112,5 @@ int fcels ( struct fc_port *port, struct fc_port_id *peer_port_id,
}
/* Wait for ELS to complete */
- return monojob_wait ( "" );
+ return monojob_wait ( "", 0 );
}
diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c
index ef4e2c36..ecf9d31d 100644
--- a/src/usr/imgmgmt.c
+++ b/src/usr/imgmgmt.c
@@ -72,7 +72,7 @@ int imgdownload ( struct uri *uri, struct image **image ) {
}
/* Wait for download to complete */
- if ( ( rc = monojob_wait ( uri_string_redacted ) ) != 0 )
+ if ( ( rc = monojob_wait ( uri_string_redacted, 0 ) ) != 0 )
goto err_monojob_wait;
/* Register image */
diff --git a/src/usr/imgtrust.c b/src/usr/imgtrust.c
index afb41529..c49eb7f2 100644
--- a/src/usr/imgtrust.c
+++ b/src/usr/imgtrust.c
@@ -77,7 +77,7 @@ int imgverify ( struct image *image, struct image *signature,
list_for_each_entry ( info, &sig->info, list ) {
if ( ( rc = create_validator ( &monojob, info->chain ) ) != 0 )
goto err_create_validator;
- if ( ( rc = monojob_wait ( NULL ) ) != 0 )
+ if ( ( rc = monojob_wait ( NULL, 0 ) ) != 0 )
goto err_validator_wait;
}
diff --git a/src/usr/nslookup.c b/src/usr/nslookup.c
index cb6d8d2b..b691962e 100644
--- a/src/usr/nslookup.c
+++ b/src/usr/nslookup.c
@@ -186,7 +186,7 @@ int nslookup ( const char *name, const char *setting_name ) {
/* Perform name resolution */
if ( ( rc = resolv_setting ( &monojob, name, setting_name ) ) == 0 )
- rc = monojob_wait ( NULL );
+ rc = monojob_wait ( NULL, 0 );
if ( rc != 0 ) {
printf ( "Could not resolve %s: %s\n", name, strerror ( rc ) );
return rc;
diff --git a/src/usr/pingmgmt.c b/src/usr/pingmgmt.c
index 0db10c21..2d4db491 100644
--- a/src/usr/pingmgmt.c
+++ b/src/usr/pingmgmt.c
@@ -71,7 +71,7 @@ int ping ( const char *hostname, unsigned long timeout, size_t len ) {
}
/* Wait for ping to complete */
- if ( ( rc = monojob_wait ( NULL ) ) != 0 ) {
+ if ( ( rc = monojob_wait ( NULL, 0 ) ) != 0 ) {
printf ( "Finished: %s\n", strerror ( rc ) );
return rc;
}