diff options
| author | Leo Famulari <leo@famulari.name> | 2016-10-30 19:19:21 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-10-30 19:19:21 -0400 |
| commit | 205f0107bb894745ee740227c090ff90ee599915 (patch) | |
| tree | 08b2ddba47ce404468d6aba31b768e013dfb1fa3 /guix | |
| parent | a8dd960ac0c68957dac281812f0d16f1295a6eaa (diff) | |
| parent | b89cbf5832fd920ef85002041bc690204b0174a3 (diff) | |
| download | gnu-guix-205f0107bb894745ee740227c090ff90ee599915.tar gnu-guix-205f0107bb894745ee740227c090ff90ee599915.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/profiles.scm | 6 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index d162f6241b..6a9e570a3f 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -490,12 +490,12 @@ if not found." inputs)) (define (find-among-store-items items) (find (lambda (item) - (let-values (((pkg-name pkg-version) + (let-values (((name* version*) (package-name->name+version (store-path-package-name item)))) - (and (equal? name pkg-name) + (and (string=? name name*) (if version - (string-prefix? version pkg-version) + (string-prefix? version version*) #t)))) items)) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 0519ab8c0b..e548be649d 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> +;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -384,6 +385,8 @@ it atomically, and then run OS's activation script." (label (string-append label " (#" (number->string number) ", " (seconds->string time) ")")) + (device (boot-parameters-store-device params)) + (device-mount-point (boot-parameters-store-mount-point params)) (linux kernel) (linux-arguments (cons* (string-append "--root=" root-device) |