Compatibility with Docker & show REPL for single usage without root account

piranna · piranna · commit 255872e5192b · 2017-01-22T17:53:08.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -78,6 +78,13 @@ function prepareSessions(home, single, callback)
     {
       if(error.code !== 'ENOENT') return callback(error)
 
+      if(single)
+      {
+        console.warn('Administrator account not found')
+
+        return startRepl('Administrator mode')
+      }
+
       return usersSessions(home, callback)
     }
 
diff --git a/lib/jocker_root.js b/lib/jocker_root.js
@@ -72,7 +72,8 @@ function waitUntilDevMounted(path, tries, callback)
   {
     if(error) return callback(error)
 
-    if(files.length > 1) return callback()
+    // Docker adds by default `console` device, and `pts` and `shm` directories
+    if(files.length > 3) return callback()
 
     if(tries-- <= 0) return callback(new Error(path+' not mounted'))
 

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,13 @@ function prepareSessions(home, single, callback)`
`78`	`78`	`{`
`79`	`79`	`if(error.code !== 'ENOENT') return callback(error)`
`80`	`80`
	`81`	`+ if(single)`
	`82`	`+ {`
	`83`	`+ console.warn('Administrator account not found')`
	`84`	`+`
	`85`	`+ return startRepl('Administrator mode')`
	`86`	`+ }`
	`87`	`+`
`81`	`88`	`return usersSessions(home, callback)`
`82`	`89`	`}`
`83`	`90`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ function waitUntilDevMounted(path, tries, callback)`
`72`	`72`	`{`
`73`	`73`	`if(error) return callback(error)`
`74`	`74`
`75`		`- if(files.length > 1) return callback()`
	`75`	+ // Docker adds by default `console` device, and `pts` and `shm` directories
	`76`	`+ if(files.length > 3) return callback()`
`76`	`77`
`77`	`78`	`if(tries-- <= 0) return callback(new Error(path+' not mounted'))`
`78`	`79`