X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;ds=sidebyside;f=nfs3%2Fnfsd.c;h=b2e10713de2a473900af2b3275ad114712c9a66a;hb=af3612a90a6e83dec51de3f33fc46a29d4c6c339;hp=e3862aa74abbb81983ab7ccd5b22303e45974197;hpb=7ca401a44bfecb14b7e5ecf849aec31157382231;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index e3862aa..b2e1071 100644
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -19,39 +19,32 @@
 #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[])
 {
     int i;
+
+    signal(SIGPIPE, SIG_IGN);
+
     bluesky_init();
+    g_set_prgname("nfsd");
+
+    const char *target = getenv("BLUESKY_TARGET");
+    if (target == NULL)
+        target = "s3";
+
+    store = bluesky_store_new(target);
+    fs = bluesky_init_fs("export", store);
+
     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");
-
-    fs = bluesky_new_fs("export");
-    fs->encryption_key = filesystem_key;
-
-    BlueSkyInode *root;
-    root = bluesky_get_inode(fs, BLUESKY_ROOT_INUM);
-    if (root == NULL) {
-        printf("Initializing fresh root inode...\n");
-        root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs, BLUESKY_DIRECTORY);
-        root->nlink = 1;
-        root->mode = 0755;
-        bluesky_insert_inode(fs, root);
-    }
+    bluesky_debug_dump(fs);
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");