X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfsd.c;h=16011f4ab7bd8c5dc091e9188ab56490eeb8df55;hb=cb5c460ba6a31c27ac0d6803c33e9e6c5a140acd;hp=8ba3ef04193d22129fb6799c0b049146f62a0c23;hpb=a5a9eca66728d271a442125ac52098378c70cf42;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index 8ba3ef0..16011f4 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,28 +32,20 @@ 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("file");
+    fs = bluesky_init_fs("export", store);
 
     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);
+    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);
+    }
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");