From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Wed, 25 Jul 2007 19:05:43 +0000 (+0000)
Subject: fixed build issue
X-Git-Tag: vsys-0.7-19~29
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a4ec1d7553194ce810c554b91f81c13591b606dd;p=vsys.git

fixed build issue
---

diff --git a/backend.ml b/backend.ml
index 1a3a432..1cf44a4 100644
--- a/backend.ml
+++ b/backend.ml
@@ -32,7 +32,7 @@ let rec list_check lst elt =
 class backendHandler dir_root (frontend_lst: frontendHandler list) =
         let mk_rel_path = delete_prefix dir_root in object(this)
 
-  val file_regexp = ref (Str.regexp "[a-zA-Z][a-zA-Z0-9_'.']*")
+  val file_regexp = ref (Str.regexp "[a-zA-Z][a-zA-Z0-9_\.]*")
 
   method new_dir fqp func =
     let s = Unix.stat fqp in
diff --git a/frontend.ml b/frontend.ml
index fc7a88f..194d7ce 100644
--- a/frontend.ml
+++ b/frontend.ml
@@ -34,11 +34,19 @@ object(this)
 
   method unlink rp =
     match rp with Relpath(rel) ->
-    let fqp = String.concat "/" [root_dir;rel] in
-      Unix.unlink fqp
+    let fqp1 = String.concat "/" [root_dir;rel;".in"] in
+    let fqp2 = String.concat "/" [root_dir;rel;".out"] in
+      try 
+      Unix.unlink fqp1;
+      Unix.unlink fqp2
+      with _ ->
+        printf "Hm. %s disappeared. Never mind\n" fqp1;flush Pervasives.stdout
 
   method rmdir rp =
     match rp with Relpath(rel) ->
     let fqp = String.concat "/" [root_dir;rel] in
+      try
       Unix.rmdir fqp
+      with _ ->
+        printf "Hm. %s disappeared. Never mind\n" fqp;flush Pervasives.stdout
 end
diff --git a/inotify.a b/inotify.a
new file mode 100644
index 0000000..ddd0196
Binary files /dev/null and b/inotify.a differ
diff --git a/inotify_stubs.o b/inotify_stubs.o
new file mode 100644
index 0000000..0328514
Binary files /dev/null and b/inotify_stubs.o differ
diff --git a/vsys b/vsys
index eb89a80..473050d 100755
Binary files a/vsys and b/vsys differ
diff --git a/vsys-initscript b/vsys-initscript
index eb68b5d..c448b52 100755
--- a/vsys-initscript
+++ b/vsys-initscript
@@ -9,7 +9,7 @@ case "$1" in
         echo -n "Starting vsys:"
         if [ ! -d $backend ]; then mkdir $backend; fi
         find /vservers -maxdepth 1 -type d | perl -e 'while (<>) {if (/(\/vservers\/(.*_.*))/) {$dir=$1;if (not (-d "$dir/vsys")) {mkdir "$dir/vsys";}}}'
-        frontends=`find /vservers -maxdepth 1 -type d | perl -e 'while (<>) {if (/(\/vservers\/(.*_.*))/) {$dir=$1;$slice=$2;printf "-frontend $dir $slice "}}'`
+        frontends=`find /vservers -maxdepth 1 -type d | perl -e 'while (<>) {if (/(\/vservers\/(.*_.*))/) {$dir=$1;$slice=$2;printf "-frontend $dir/vsys $slice "}}'`
         vsys_command="/usr/bin/vsys -backend $backend $frontends"
         echo $vsys_command
         $vsys_command