From 4dfe6c58ee204cf05ce9ef5abbc96ada44ef0784 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 30 Apr 2014 15:44:59 +0200
Subject: system: Add (guix build activation).

* gnu/services/dmd.scm (dmd-configuration-file): Remove 'etc'
  parameter.  Move /etc activation code to...
* guix/build/activation.scm: ... here; new file.
* gnu/system.scm (operating-system-boot-script): Augment script: add
  (guix build activation) to the load path; call 'activate-etc'.
* Makefile.am (MODULES): Add guix/build/activation.scm.
---
 gnu/services/dmd.scm | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'gnu/services')

diff --git a/gnu/services/dmd.scm b/gnu/services/dmd.scm
index c187c09857..161a971edd 100644
--- a/gnu/services/dmd.scm
+++ b/gnu/services/dmd.scm
@@ -30,9 +30,8 @@
 ;;;
 ;;; Code:
 
-(define (dmd-configuration-file services etc)
-  "Return the dmd configuration file for SERVICES, that initializes /etc from
-ETC (the derivation that builds the /etc directory) on startup."
+(define (dmd-configuration-file services)
+  "Return the dmd configuration file for SERVICES."
   (define config
     #~(begin
         (use-modules (ice-9 ftw))
@@ -48,28 +47,6 @@ ETC (the derivation that builds the /etc directory) on startup."
                        #:stop #$(service-stop service)))
                  services))
 
-        ;; /etc is a mixture of static and dynamic settings.  Here is where we
-        ;; initialize it from the static part.
-        (format #t "populating /etc from ~a...~%" #$etc)
-        (let ((rm-f (lambda (f)
-                      (false-if-exception (delete-file f)))))
-          (rm-f "/etc/static")
-          (symlink #$etc "/etc/static")
-          (for-each (lambda (file)
-                      ;; TODO: Handle 'shadow' specially so that changed
-                      ;; password aren't lost.
-                      (let ((target (string-append "/etc/" file))
-                            (source (string-append "/etc/static/" file)))
-                        (rm-f target)
-                        (symlink source target)))
-                    (scandir #$etc
-                             (lambda (file)
-                               (not (member file '("." ".."))))))
-
-          ;; Prevent ETC from being GC'd.
-          (rm-f "/var/guix/gcroots/etc-directory")
-          (symlink #$etc "/var/guix/gcroots/etc-directory"))
-
         ;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around it.
         (setenv "PATH" "/run/current-system/bin")
 
-- 
cgit 1.4.1