From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id UMr0J7hN2WXtewEAe85BDQ:P1 (envelope-from ) for ; Sat, 24 Feb 2024 03:00:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id UMr0J7hN2WXtewEAe85BDQ (envelope-from ) for ; Sat, 24 Feb 2024 03:00:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=RJy5kZ+b; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708740024; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=AXeuWBSRmSlt9EvINEGmLViuGercix/5PaBpaWBkirM=; b=Z7z6K2sxnDvUiwzVFeED/k434lziHi+MLE/YogFQ0KKxVl5r7Kw380+CsZrKVJok9MpA9X sFcNNcDGBcjx6dfVw1sGSnFOVW4+8rjUu1gKDEm0iNS15BvoR/ric7NLvi9m7ILCbQHJtW zOLzezscKwPi4ORChknm05WPKazkKWX2tNeCM+Jago5vuwWbtAdimzlNqi1HRJ48gj1Wlr IFnCU5mZw8zxKAbISRqN0+fHTNaI+LdqjpYL8LeRpBBLvrMEZ75lH+L5/bmcRKlzL8I2GR 6+WbvDXfUZHg5goMBusE2bfQL+GJzv28kl+K0kKQJ2EZ12m0tA/QpNVY1L+Xng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=RJy5kZ+b; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708740024; a=rsa-sha256; cv=none; b=T0flMXk+cb6PEFW10YYO/HVDAX9bxQLylYfnuUuiZ251VS5vI6cTEUXWKw9/Lbuu5Ey5UP Of927L4T/+8mzEZ9rvoEqx4n2qra/YHJD4O9hmSnbc2MnlT4XJPOKHh/7es98hDguGCa3M zuF9JNqii0utqQ2dpCk5/7QMviqJh6M3CspGb9x+Sc4lzYRV4shimd6NXaxoFD4mTyOF9T KFG4yv/D0fxB4H1E+WFK0ZJ/BTMaAQlbR/cXjZlb29aJNAljIkhbDgnpUWlK9sDZ5tJXEu k1QXFpcE1BhnSqM2+p72nqJ6fg+vWOjvfs3epHmIj+2TZMEsvewkoq9Wi864yg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7839A3A7EF for ; Sat, 24 Feb 2024 03:00:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdhKR-0004Ti-CE; Fri, 23 Feb 2024 20:59:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdhKK-0004Qc-9k for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:45 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdhKJ-0006l7-HG; Fri, 23 Feb 2024 20:59:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdhKg-0003ed-3F; Fri, 23 Feb 2024 21:00:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 05/12] Move epoch->date-string to gnu/system/boot.scm and use it elsewhere. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 02:00:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69343@debbugs.gnu.org Cc: Felix Lechner , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.170873995513807 (code B ref 69343); Sat, 24 Feb 2024 02:00:06 +0000 Received: (at 69343) by debbugs.gnu.org; 24 Feb 2024 01:59:15 +0000 Received: from localhost ([127.0.0.1]:36547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJq-0003aV-Bz for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:14 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:41018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJi-0003Ye-2d for 69343@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=TYjSqt20F3oyd/m CHH1WcOjJ0noWTnNh6GAVmwY/EKU=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=RJy5kZ+bA43J6ZUxU9eRGj2ptr8ywM2Wy3Rs8fYV 06tn42rVqMp0tQ44ePzF2QszY1Plcg7hONjbj3LoXQbnBd6/0rlSIm/8+5bNWmHz/htchy GoempgsiNfYQcZPXgdOpDtll1c4XWRdBt0f69mI4z8vjMgl5tN0Vqql/kc0TQ= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 16beef28 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:51:56 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 267bae45; Sat, 24 Feb 2024 01:51:55 +0000 (UTC) Date: Fri, 23 Feb 2024 17:51:38 -0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches From: Felix Lechner via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.77 X-Spam-Score: -4.77 X-Migadu-Queue-Id: 7839A3A7EF X-Migadu-Scanner: mx11.migadu.com X-TUID: vN1VQH/4PKZh Change-Id: I6a5f793567221f81edd7b2d8d9f0f3e801d1b113 --- gnu/machine/ssh.scm | 10 ++++------ gnu/system/boot.scm | 8 ++++++++ guix/scripts/system.scm | 10 ++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 0ffe71367c..449b65dbfb 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -444,10 +444,10 @@ (define (machine-boot-parameters machine) generation)) (boot-parameters-path (string-append system-path "/parameters")) - (time (stat:mtime (lstat system-path)))) + (epoch (stat:mtime (lstat system-path)))) (list generation system-path - time + epoch (read-file boot-parameters-path)))) (reverse (generation-numbers %system-profile))))))) @@ -455,7 +455,7 @@ (define (machine-boot-parameters machine) (return (map (lambda (generation) (match generation - ((generation system-path time serialized-params) + ((generation system-path epoch serialized-params) (let* ((params (call-with-input-string serialized-params read-boot-parameters)) (root (boot-parameters-root-device params)) @@ -466,9 +466,7 @@ (define (machine-boot-parameters machine) (label (string-append label " (#" (number->string generation) ", " - (let ((time (make-time time-utc 0 time))) - (date->string (time-utc->date time) - "~Y-~m-~d ~H:~M")) + (epoch->date-string epoch) ")")) (kernel-arguments (append (bootable-kernel-arguments system-path root version) diff --git a/gnu/system/boot.scm b/gnu/system/boot.scm index d3f58e1ade..df04ef92da 100644 --- a/gnu/system/boot.scm +++ b/gnu/system/boot.scm @@ -41,6 +41,7 @@ (define-module (gnu system boot) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-19) #:use-module (srfi srfi-35) #:use-module (rnrs bytevectors) #:export (boot-parameters @@ -64,6 +65,7 @@ (define-module (gnu system boot) read-boot-parameters read-boot-parameters-file + epoch->date-string boot-parameters->menu-entry ensure-not-/dev)) @@ -276,6 +278,12 @@ (define (ensure-not-/dev device) #f device)) +(define (epoch->date-string epoch) + "Return a string representing the date for EPOCH seconds." + (let ((time (make-time time-utc 0 epoch))) + (date->string (time-utc->date time) + "~Y-~m-~d ~H:~M"))) + (define (boot-parameters->menu-entry conf) "Return a instance given CONF, a instance." (let* ((kernel (boot-parameters-kernel conf)) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 86ee2ddc76..47c072ba5c 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -323,19 +323,13 @@ (define-syntax-rule (unless-file-not-found exp) #f (apply throw args))))) -(define (epoch->date-string epoch) - "Return a string representing the date for EPOCH seconds." - (let ((time (make-time time-utc 0 epoch))) - (date->string (time-utc->date time) - "~Y-~m-~d ~H:~M"))) - (define* (profile-boot-parameters #:optional (profile %system-profile) (numbers (reverse (generation-numbers profile)))) "Return a list of 'boot-parameters' for the generations of PROFILE specified by NUMBERS, which is a list of generation numbers. The list is ordered from the most recent to the oldest profiles." - (define (system->boot-parameters system number time) + (define (system->boot-parameters system number epoch) (unless-file-not-found (let* ((params (read-boot-parameters-file system)) (label (boot-parameters-label params))) @@ -343,7 +337,7 @@ (define* (profile-boot-parameters #:optional (profile %system-profile) (inherit params) (label (string-append label " (#" (number->string number) ", " - (epoch->date-string time) ")")))))) + (epoch->date-string epoch) ")")))))) (let* ((systems (map (cut generation-file-name profile <>) numbers)) (times (map (lambda (system) -- 2.41.0