X-Git-Url: https://ruin.nu/git/?p=popboot.git;a=blobdiff_plain;f=action.cpp;h=5dbe86954cbbd29644ba710d35dd8585b2774c62;hp=6e4b60785917cf7627c7ef1969b9621481c40022;hb=HEAD;hpb=fdcf46671ca1dab0dadb490bb4375dc3dd2fc9a4

diff --git a/action.cpp b/action.cpp
index 6e4b607..5dbe869 100644
--- a/action.cpp
+++ b/action.cpp
@@ -1,5 +1,7 @@
 #include "action.h"
 #include <cstdlib>
+#include <unistd.h>
+#include <sys/wait.h>
 #include <iostream>
 using namespace std;
 using namespace __gnu_cxx;
@@ -33,7 +35,19 @@ const Preconditions& Action::preconditions() const{
 
 int Action::execute() const{
 	cout << "Executing: " << _name << endl;
-	return system(_executable.c_str());
+	//return system(_executable.c_str());
+	pid_t proc = fork();
+	if (proc == -1) return proc;
+
+	int retval;
+	if (proc == 0) {
+		//execl("/bin/sh",  "-c", _executable.c_str(), (char*) NULL);
+		retval = system(_executable.c_str());
+		_exit(WEXITSTATUS(retval));
+	}
+	waitpid(proc,&retval,0);
+	cout << "Done executing: " << _name << ", returnvalue: " << WEXITSTATUS(retval) << endl;
+	return WEXITSTATUS(retval);
 }
 
 const string& Action::name() const{