From patchwork Sun Dec 31 11:39:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58244 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 666C627BBE2; Sun, 31 Dec 2023 11:41:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF45827BBEB for ; Sun, 31 Dec 2023 11:41:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJuBl-0001eZ-Jz; Sun, 31 Dec 2023 06:41:05 -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 1rJuBj-0001aG-EZ for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:03 -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 1rJuBj-0003jY-6a for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJuBk-0004Vh-9a for guix-patches@gnu.org; Sun, 31 Dec 2023 06:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68169] [PATCH 4/9] system: Export default gdbinit. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 11:41:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68169@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 68169-submit@debbugs.gnu.org id=B68169.170402283717200 (code B ref 68169); Sun, 31 Dec 2023 11:41:04 +0000 Received: (at 68169) by debbugs.gnu.org; 31 Dec 2023 11:40:37 +0000 Received: from localhost ([127.0.0.1]:45731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBI-0004TI-Ew for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:36 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:48626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJuBF-0004SZ-Hx for 68169@debbugs.gnu.org; Sun, 31 Dec 2023 06:40:34 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3333b46f26aso7639464f8f.1 for <68169@debbugs.gnu.org>; Sun, 31 Dec 2023 03:40:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022826; x=1704627626; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Yf3x3yYROLZtQ3oOIg6pLvgPnyvPiboldy1IrEayIOs=; b=ixjW3Y0wGR4oF+Dqv3H6wJefUYZ8v14LboZxfdeYzxNO0CqAt31jucaChUdN2IsqSV DAuMsVoPq/CMUIwa0SpoS10HiSbojdFL9z5rPz2aOP5qAu0rLgvI4qBDJ63Wo2XeadwM gZbShG180uLJ7useHFIQbwqs8i4EE9ZkyzBFvDjITdQWGAowYmwOEvL+5MnqhQwCGyhs 2Niv/VcA9epTJTMUwE6GcMWIPEpc5D3X05JEdyUSFTqO8LWgWB8r7nKpWkX0ZNoeWBfG Z1sE5q2nsTu+SZndbMc8B570dHTXL2Gx8dL1narvnjvjB17hvJigdEG7DSCbDWnVeQOO 79Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022826; x=1704627626; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Yf3x3yYROLZtQ3oOIg6pLvgPnyvPiboldy1IrEayIOs=; b=HXoPS7oqkQbL+qO2PH9o2G54XQemL7WUPtdYHM7sqqWpJVz5j9F/zS5QqHE7Qsox7I Zb9+YhfiLYqWcg0vsjaUsRz3Lbfe0zbA6FkViEUEhiM6E2+/Jf3KEIFzTDAspcg8D4Bq iZvoj1XdbuB0nCGfP8ZVsduyR3KhjiqLP+usdHit4DecvDdevQ18Kun829OHlmXXJ3la 7U78zM/KlapnP9WKQBkfURZpf5ByyfFvImXe0XqVFxo23TjXjnZt+H+osO5aZe0L+Ss7 wiWOgf3aJkecmnV8MYA7RfCLbRyxEkSSS0LxG0GgKfog9U5VkzQudiQookluIJXX+hg+ X5/A== X-Gm-Message-State: AOJu0Yz/jh0So4MvWX4SYef4lRHw2fD8VenvmrA3qRQtzUYpM2Ver53+ cB3L2B04dudovs4c4vFfTRLJRC7EOI5XMg== X-Google-Smtp-Source: AGHT+IESSP478VG7J/OAqtvCSfqhBIHbrSiKtQ171P2iGe1Iufm4BOKiUyQ0DDWOkd4Cps6TLDOZOQ== X-Received: by 2002:a05:600c:213:b0:40d:5fd4:ce3a with SMTP id 19-20020a05600c021300b0040d5fd4ce3amr3480869wmi.85.1704022826520; Sun, 31 Dec 2023 03:40:26 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id n15-20020a5d400f000000b0033662fb321esm23460316wrp.33.2023.12.31.03.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:40:26 -0800 (PST) From: Efraim Flashner Date: Sun, 31 Dec 2023 13:39:43 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/system/shadow.scm (%default-gdbinit): Extract from default-skeletons, export. (default-skeletons): Use %default-gdbinit. Change-Id: Ia5188f8083a83ad4cdb96e234dbd730b1bfe0072 --- gnu/system/shadow.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index be7c4370a2..e1dd31262a 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -67,6 +67,7 @@ (define-module (gnu system shadow) %default-bash-profile %default-zprofile %default-xdefaults + %default-gdbinit default-skeletons skeleton-directory %base-groups @@ -188,16 +189,9 @@ (define %default-xdefaults XTerm*utf8: always XTerm*metaSendsEscape: true\n")) -(define (default-skeletons) - "Return the default skeleton files for /etc/skel. These files are copied by -'useradd' in the home directory of newly created user accounts." - - (let ((profile %default-bash-profile) - (bashrc %default-bashrc) - (zprofile %default-zprofile) - (xdefaults %default-xdefaults) - (gdbinit (plain-file "gdbinit" "\ -# Tell GDB where to look for separate debugging files. +(define %default-gdbinit + (plain-file "gdbinit" + "# Tell GDB where to look for separate debugging files. guile (use-modules (gdb)) (execute (string-append \"set debug-file-directory \" @@ -215,7 +209,17 @@ (define (default-skeletons) # Authorize extensions found in the store, such as the # pretty-printers of libstdc++. -set auto-load safe-path /gnu/store/*/lib\n"))) +set auto-load safe-path /gnu/store/*/lib\n")) + +(define (default-skeletons) + "Return the default skeleton files for /etc/skel. These files are copied by +'useradd' in the home directory of newly created user accounts." + + (let ((profile %default-bash-profile) + (bashrc %default-bashrc) + (zprofile %default-zprofile) + (xdefaults %default-xdefaults) + (gdbinit %default-gdbinit)) `((".bash_profile" ,profile) (".bashrc" ,bashrc) ;; Zsh sources ~/.zprofile before ~/.zshrc, and it sources ~/.zlogin