clean up if stp_check fails

diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog
index d804d28599df60fd87a1b4bc3d7000469c7159fd..a8eccab1666539f965055ff6a8f134a90b21181c 100644 (file)
--- 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 fb60028099222dccfbdee46719751d64a50e1af8..33dc20fab364a011f0f5f4508b1586fd139481e6 100644 (file)
--- 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)