X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfsd.c;h=d35c36d710882caa91b9736434f03a9918cc9295;hb=316dc9666f2406985235a3b71ec19523a6d0c947;hp=f80b01a8acefca6c7431a0d78aa1ed793c0b72ad;hpb=c83d8b650786b8e7d6a9d41c9449c203929c7215;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index f80b01a..d35c36d 100644
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -19,45 +19,24 @@
 #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;
-    g_thread_init(NULL);
-    bluesky_crypt_init();
+    bluesky_init();
+    g_set_prgname("nfsd");
     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");
+    store = bluesky_store_new("s3");
+    fs = bluesky_init_fs("export", store);
 
-    S3_initialize(NULL, S3_INIT_ALL);
-
-    fs = bluesky_new_fs("export");
-    fs->encryption_key = filesystem_key;
-
-    BlueSkyInode *root;
-    root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs, BLUESKY_DIRECTORY);
-    root->nlink = 1;
-    root->mode = 0755;
-    bluesky_insert_inode(fs, root);
-
-    BlueSkyInode *file;
-    file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
-    file->nlink = 1;
-    file->mode = 0755;
-    bluesky_insert_inode(fs, file);
-    bluesky_directory_insert(root, "demo", file->inum);
+    bluesky_debug_dump(fs);
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");