summaryrefslogtreecommitdiff
path: root/gnu/services/xorg.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-03-01 23:52:19 -0500
committerMark H Weaver <mhw@netris.org>2015-03-01 23:57:23 -0500
commit9515b745547cff08ad5b958bc54323dab19f29b9 (patch)
tree89e9b1be308c047c2078a79dd8d27a486cd7a622 /gnu/services/xorg.scm
parente013220eb6c42864ad21ab818a06914a3dbddf08 (diff)
Revert "services: xorg: Fix file descriptor leak from SLiM/xinitrc."
This reverts commit ec4a4c46efaf2e7373f331654640f1321c0f2e62, because it broke XFCE.
Diffstat (limited to 'gnu/services/xorg.scm')
-rw-r--r--gnu/services/xorg.scm12
1 files changed, 0 insertions, 12 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index bc1774840b..69a89584e0 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -155,13 +155,6 @@ which should be passed to this script as the first argument. If not, the
#~(begin
(use-modules (ice-9 match))
- (define (close-all-fdes)
- ;; Close all the open file descriptors.
- (let loop ((fd 0))
- (when (< fd 4096) ;FIXME: use sysconf + _SC_OPEN_MAX
- (false-if-exception (close-fdes fd))
- (loop (+ 1 fd)))))
-
(define (exec-from-login-shell command . args)
;; Run COMMAND from a login shell so that it gets to see the same
;; environment variables that one gets when logging in on a tty, for
@@ -170,11 +163,6 @@ which should be passed to this script as the first argument. If not, the
(shell (passwd:shell pw))
(st (stat command #f)))
(when (and st (not (zero? (logand (stat:mode st) #o100))))
- ;; Close any open file descriptors. This is all the more
- ;; important that SLiM itself exec's us directly without closing
- ;; its own file descriptors!
- (close-all-fdes)
-
;; The '--login' option is supported at least by Bash and zsh.
(execl shell shell "--login" "-c"
(string-join (cons command args))))))