summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/stpd/ChangeLog4
-rw-r--r--runtime/stpd/librelay.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog
index d804d285..a8eccab1 100644
--- a/runtime/stpd/ChangeLog
+++ b/runtime/stpd/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-22 Tom Zanussi <zanussi@us.ibm.com>
+
+ * librelay.c (init_relayfs): Cleanup if stp_check fails.
+
2006-09-19 Tom Zanussi <zanussi@us.ibm.com>
* librelay.c (init_relayfs): Add debugfs path to relay files and
diff --git a/runtime/stpd/librelay.c b/runtime/stpd/librelay.c
index fb600280..33dc20fa 100644
--- a/runtime/stpd/librelay.c
+++ b/runtime/stpd/librelay.c
@@ -417,7 +417,7 @@ int init_relayfs(void)
if (WIFEXITED(wstat) && WEXITSTATUS(wstat)) {
perror (stp_check);
fprintf(stderr, "Could not execute %s\n", stp_check);
- exit(1);
+ return -1;
}
if (statfs("/mnt/relay", &st) == 0 && (int) st.f_type == (int) RELAYFS_MAGIC)