Skip to content

Commit c2d12de

Browse files
authored
Merge pull request #5 from luii/master
docker: ignore symlinks if already present
2 parents 82f8c07 + 07e0be1 commit c2d12de

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

server.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,19 @@ rimraf('/sbin')
377377
mkdirp('/etc', '0100', function(error)
378378
{
379379
if(error && error.code != 'EEXIST') return callback(error)
380+
cmdline = linuxCmdline(fs.readFileSync('/proc/cmdline', 'utf8'))
380381

381-
fs.symlinkSync('/proc/mounts' , '/etc/mtab')
382-
fs.symlinkSync('/proc/net/pnp', '/etc/resolv.conf')
382+
try {
383+
fs.symlinkSync('/proc/mounts', '/etc/mtab')
384+
} catch (e) {
385+
if (e && e.code !== 'EEXIST') return callback(e)
386+
}
383387

384-
cmdline = linuxCmdline(fs.readFileSync('/proc/cmdline', 'utf8'))
388+
try {
389+
fs.symlinkSync('/proc/net/pnp', '/etc/resolv.conf')
390+
} catch (e) {
391+
if (e && e.code !== 'EEXIST') return callback(e)
392+
}
385393

386394
single = cmdline.single
387395

0 commit comments

Comments
 (0)