X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfsd.c;h=55819e05fd36b50f5c3c2238388dd8835357820f;hb=3c5c5e9b5a8650e0549712e20e007ba2399656bf;hp=e3862aa74abbb81983ab7ccd5b22303e45974197;hpb=7ca401a44bfecb14b7e5ecf849aec31157382231;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index e3862aa..55819e0 100644
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -19,13 +19,12 @@
 #include <netinet/in.h>
 #include <glib.h>
 
-#include "libs3.h"
 #include "bluesky.h"
 
 void register_rpc();
 
 BlueSkyFS *fs;
-static uint8_t filesystem_key[16];
+BlueSkyStore *store;
 
 int main(int argc, char *argv[])
 {
@@ -33,15 +32,10 @@ int main(int argc, char *argv[])
     bluesky_init();
     register_rpc();
 
-    bluesky_crypt_random_bytes(filesystem_key, sizeof(filesystem_key));
-    printf("Filesystem key: ");
-    for (i = 0; i < sizeof(filesystem_key); i++) {
-        printf("%02x", filesystem_key[i]);
-    }
-    printf("\n");
+    bluesky_options.synchronous_stores = 1;
 
-    fs = bluesky_new_fs("export");
-    fs->encryption_key = filesystem_key;
+    store = bluesky_store_new("s3");
+    fs = bluesky_init_fs("export", store);
 
     BlueSkyInode *root;
     root = bluesky_get_inode(fs, BLUESKY_ROOT_INUM);
@@ -53,6 +47,8 @@ int main(int argc, char *argv[])
         bluesky_insert_inode(fs, root);
     }
 
+    bluesky_debug_dump(fs);
+
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");
     exit(1);