X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfsd.c;h=e3862aa74abbb81983ab7ccd5b22303e45974197;hb=ca027b3a4abb9e465a12ab9dec67654c1a3f9e46;hp=abd10509814f19f02ac598e6ddfc1282a940b7ba;hpb=e1fcdf3f1a7a2de0289526a5481009c3380f7547;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index abd1050..e3862aa 100644
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -19,31 +19,39 @@
 #include <netinet/in.h>
 #include <glib.h>
 
+#include "libs3.h"
 #include "bluesky.h"
 
 void register_rpc();
 
 BlueSkyFS *fs;
+static uint8_t filesystem_key[16];
 
 int main(int argc, char *argv[])
 {
-    g_thread_init(NULL);
+    int i;
+    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");
+
     fs = bluesky_new_fs("export");
+    fs->encryption_key = filesystem_key;
 
     BlueSkyInode *root;
-    root = bluesky_new_inode(BLUESKY_ROOT_INUM, BLUESKY_DIRECTORY);
-    root->nlink = 1;
-    root->mode = 0755;
-    bluesky_insert_inode(fs, root);
-
-    BlueSkyInode *file;
-    file = bluesky_new_inode(bluesky_fs_alloc_inode(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");