From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Xp8-00034L-1I for guix-patches@gnu.org; Fri, 21 Apr 2017 08:38:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Xp7-0004Lg-6x for guix-patches@gnu.org; Fri, 21 Apr 2017 08:38:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33615) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d1Xp7-0004Lb-3x for guix-patches@gnu.org; Fri, 21 Apr 2017 08:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d1Xp6-0003i9-UQ for guix-patches@gnu.org; Fri, 21 Apr 2017 08:38:04 -0400 Subject: bug#26544: [PATCH v4 06/10] scripts: Make boot-parameters label include generation number and time. Resent-Message-ID: From: Danny Milosavljevic Date: Fri, 21 Apr 2017 14:37:10 +0200 Message-Id: <20170421123714.2395-7-dannym@scratchpost.org> In-Reply-To: <20170421123714.2395-1-dannym@scratchpost.org> References: <86h91ikw4m.fsf@gmail.com> <20170421123714.2395-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26544@debbugs.gnu.org * guix/scripts/system.scm (system->boot-parameters): Make label include generation number and time. --- guix/scripts/system.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index b278b6683..5e4e0df20 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -369,8 +369,13 @@ it atomically, and then run OS's activation script." NUMBERS, which is a list of generation numbers." (define (system->boot-parameters system number time) (unless-file-not-found - (let* ((params (read-boot-parameters-file system))) - params))) + (let* ((params (read-boot-parameters-file system)) + (label (boot-parameters-label params))) + (boot-parameters + (inherit params) + (label (string-append label " (#" + (number->string number) ", " + (seconds->string time) ")")))))) (let* ((systems (map (cut generation-file-name profile <>) numbers)) (times (map (lambda (system)