From 01497dfe6c0a2ce69287d0fd0008747965a000df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Jun 2016 09:30:01 +0200 Subject: Merge branch 'master' into core-updates --- gnu/system/install.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/system/install.scm') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index a72613e9c5..de14f6fb4c 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -208,8 +208,7 @@ the user's target storage device rather than on the RAM disk." "Return a list of tuples representing configuration templates to add to /etc." (define (file f) - (local-file (search-path %load-path - (string-append "gnu/system/examples/" f)))) + (local-file (string-append "examples/" f))) (define directory (computed-file "configuration-templates" -- cgit v1.2.3 From a8cb87abe98d57fb763d5b14524dc32c96bd31b5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Aug 2016 23:08:48 +0200 Subject: install: Add nvi to the image. * gnu/system/install.scm (installation-os)[packages]: Add NVI. * doc/guix.texi (Proceeding with the Installation): Mention it. --- doc/guix.texi | 5 +++-- gnu/system/install.scm | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/system/install.scm') diff --git a/doc/guix.texi b/doc/guix.texi index de996907fe..f1848a1c5d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6394,8 +6394,9 @@ builds to @file{/gnu/store} which, initially, is an in-memory file system. Next, you have to edit a file and provide the declaration of the operating system to be installed. To -that end, the installation system comes with two text editors: GNU nano -(@pxref{Top,,, nano, GNU nano Manual}), and GNU Zile, an Emacs clone. +that end, the installation system comes with three text editors: GNU nano +(@pxref{Top,,, nano, GNU nano Manual}), GNU Zile (an Emacs clone), and +nvi (a clone of the original BSD @command{vi} editor). We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}. Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system. diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 734a361c37..5acfa2c65b 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages grub) #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) + #:use-module (gnu packages nvi) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (self-contained-tarball @@ -401,6 +402,7 @@ Use Alt-F2 for documentation. ;; space; furthermore util-linux's fdisk is already ;; available here, so we keep that. bash-completion + nvi ;:wq! %base-packages)))) ;; Return it here so 'guix system' can consume it directly. -- cgit v1.2.3