From 42d10464bedb43a9211d8bc187e668fe33272368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Sep 2014 23:46:48 +0200 Subject: linux-initrd: Store Linux modules in a normal store directory. * gnu/system/linux-initrd.scm (expression->initrd): Remove #:linux and #:linux-modules parameters. Remove call to 'float-linux-module-directory'. (base-initrd): Add call to 'float-linux-module-directory'. Use it in #:linux-modules argument in the gexp. Remove #:linux and #:linux-modules arguments to 'expression->initrd'. * gnu/build/linux-initrd.scm (build-initrd): Remove #:linux-module-directory parameter. Don't create 'modules' sub-directory. * gnu/build/linux-boot.scm (boot-system): Mentin that LINUX-MODULES is a list of absolute file names. Don't prepend "/modules/" to LINUX-MODULES. * doc/guix.texi (Initial RAM Disk): Adjust accordingly. --- gnu/build/linux-initrd.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu/build/linux-initrd.scm') diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm index 2c0acb200e..54639bd319 100644 --- a/gnu/build/linux-initrd.scm +++ b/gnu/build/linux-initrd.scm @@ -104,23 +104,18 @@ This is similar to what 'compiled-file-name' in (system base compile) does." (define* (build-initrd output #:key guile init - linux-module-directory (references-graphs '()) (cpio "cpio") (gzip "gzip")) "Write an initial RAM disk (initrd) to OUTPUT. The initrd starts the script at INIT, running GUILE. It contains all the items referred to by -REFERENCES-GRAPHS, plus the Linux modules from LINUX-MODULE-DIRECTORY." +REFERENCES-GRAPHS." (mkdir "contents") ;; Copy the closures of all the items referenced in REFERENCES-GRAPHS. (populate-store references-graphs "contents") (with-directory-excursion "contents" - ;; Copy Linux modules. - (mkdir "modules") - (copy-recursively linux-module-directory "modules") - ;; Make '/init'. (symlink init "init") -- cgit v1.2.3