diff options
| author | Chris Marusich <cmmarusich@gmail.com> | 2016-12-02 01:52:04 -0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-05 23:19:37 +0100 |
| commit | 067a2e2de9e5f8437ce020c62f64e08b82af72b8 (patch) | |
| tree | 216dd46d9f104fe8ca310d19987f8cb8ef9dec16 | |
| parent | 4bd391f557a66660525805e9ea56d506f8eaed68 (diff) | |
| download | guix-067a2e2de9e5f8437ce020c62f64e08b82af72b8.tar.gz | |
guix system: If the new system generation already exists, overwrite it.
Fixes <http://bugs.gnu.org/25100>. Before that, 'guix system reconfigure' would fail if the next generation already existed. * guix/scripts/system.scm (switch-to-system): Use 'switch-symlink' instead of 'symlink'. * doc/guix.texi (Using the Configuration System, Invoking guix system): Document the behavior. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | doc/guix.texi | 16 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 4d7f96d907..5c94a56c01 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7174,7 +7174,15 @@ modifying or deleting previous generations. Old system generations get an entry in the GRUB boot menu, allowing you to boot them in case something went wrong with the latest generation. Reassuring, no? The @command{guix system list-generations} command lists the system -generations available on disk. +generations available on disk. It is also possible to roll back the +system via the commands @command{guix system roll-back} and +@command{guix system switch-generation}. + +Although the command @command{guix system reconfigure} will not modify +previous generations, must take care when the current generation is not +the latest (e.g., after invoking @command{guix system roll-back}), since +the operation might overwrite a later generation (@pxref{Invoking guix +system}). @unnumberedsubsubsec The Programming Interface @@ -12599,6 +12607,12 @@ currently running; if a service is currently running, it does not attempt to upgrade it since this would not be possible without stopping it first. +This command creates a new generation whose number is one greater than +the current generation (as reported by @command{guix system +list-generations}). If that generation already exists, it will be +overwritten. This behavior mirrors that of @command{guix package} +(@pxref{Invoking guix package}). + It also adds a GRUB menu entry for the new OS configuration, and moves entries for older configurations to a submenu---unless @option{--no-grub} is passed. diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index bb373a6726..144a7fd377 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -326,7 +326,7 @@ it atomically, and then run OS's activation script." (let* ((system (derivation->output-path drv)) (number (+ 1 (generation-number profile))) (generation (generation-file-name profile number))) - (symlink system generation) + (switch-symlinks generation system) (switch-symlinks profile generation) (format #t (_ "activating system...~%")) |