[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "services: xorg: Fix file descriptor leak from SLiM/xinitr
From: |
Mark H. Weaver |
Subject: |
01/01: Revert "services: xorg: Fix file descriptor leak from SLiM/xinitrc." |
Date: |
Mon, 02 Mar 2015 04:57:06 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit 9515b745547cff08ad5b958bc54323dab19f29b9
Author: Mark H Weaver <address@hidden>
Date: Sun Mar 1 23:52:19 2015 -0500
Revert "services: xorg: Fix file descriptor leak from SLiM/xinitrc."
This reverts commit ec4a4c46efaf2e7373f331654640f1321c0f2e62,
because it broke XFCE.
---
gnu/services/xorg.scm | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index bc17748..69a8958 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))))))