Miscellaneous fixes.

[bluesky.git] / nfs3 / nfsd.c

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index 03b39fb..323c1b1 100644 (file)
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -24,20 +24,35 @@
 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);
-
-    svc_run ();
-    fprintf (stderr, "%s", "svc_run returned");
-    exit (1);
-    /* NOTREACHED */
+    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");
+    exit(1);
 }