guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: Revert "gnu: openssh: Remove empty /var/empty."


From: guix-commits
Subject: 02/02: Revert "gnu: openssh: Remove empty /var/empty."
Date: Mon, 4 Oct 2021 08:28:38 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit a03562b478f50c302b6398fe5793fc072ed621f2
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Mon Oct 4 14:18:45 2021 +0200

    Revert "gnu: openssh: Remove empty /var/empty."
    
    Oh, hello, you must be new here:
    
      $ git show ba912479e8481d69b699ce348b35d5d70f0c9367
    
    That silly person really ought to have added a comment to the code,
    shouldn't they?  This reverts similar changes made in commit
    ec7bcdc35af17021a9dfd73ef49750d0ad82b989, and adds one.
---
 gnu/packages/ssh.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index f7e6286..4e21788 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -259,10 +259,9 @@ a server that supports the SSH-2 protocol.")
           (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
             (let ((out (assoc-ref outputs "out")))
               ;; Install without host keys and system configuration files.
+              ;; This will install /var/empty to the store, which is needed
+              ;; by the system openssh-service-type.
               (apply invoke "make" "install-nosysconf" make-flags)
-              (with-directory-excursion out
-                (rmdir "var/empty")
-                (rmdir "var"))
               (with-directory-excursion "contrib"
                 (chmod "ssh-copy-id" #o555)
                 (install-file "ssh-copy-id"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]