unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Tomas Volf <~@wolfsden.cz>
To: 74508@debbugs.gnu.org
Cc: "Tomas Volf" <~@wolfsden.cz>, "Ludovic Courtès" <ludo@gnu.org>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>
Subject: [bug#74508] [PATCH v3 1/3] services: mingetty: Add additional configuration options.
Date: Tue,  3 Dec 2024 01:11:37 +0100	[thread overview]
Message-ID: <746975a119582d4dc85f1e5615d6b870a81164a9.1733184699.git.~@wolfsden.cz> (raw)
In-Reply-To: <cover.1732458407.git.~@wolfsden.cz>

Not all aspects of mingetty were configurable, so this commit adds the
additional configuration fields to support that.

* gnu/services/base.scm (<mingetty-configuration>): Add delay, print-issue,
print-hostname, nice, chdir, chroot fields.
(mingetty-shepherd-service): Use the new fields.
(define-module)<#:export>: Export the new accessors.
* doc/guix.texi (Base Services)<mingetty-configuration>: Document the
additional field.

Change-Id: I4557a82498805ade0b341feda9d33eccc305690f
---
v2: Split the renaming into separate commit (2/3).  Do not delete the
    mingetty-configuration-mingetty accessor.
v3: Use working-directory and root-directory instead of chdir and chroot.

 doc/guix.texi         | 28 ++++++++++++++++-
 gnu/services/base.scm | 72 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 8a6640124c..3432a5d604 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19410,7 +19410,33 @@ Base Services
 will have to press a key before the log-in shell is launched.

 @item @code{clear-on-logout?} (default: @code{#t})
-When set to @code{#t}, the screen will be cleared after logout.
+When set to @code{#t}, the screen will be cleared before showing the
+login prompt.  The field name is bit unfortunate, since it controls
+clearing also before the initial login, not just after a logout.
+
+@item @code{delay} (default: @code{#f})
+When set to a number, sleep that many seconds after startup.
+
+@item @code{print-issue} (default: @code{#t})
+When set to @code{#t}, write out a new line and the content of
+@file{/etc/issue}.  Value of @code{'no-nl} can be used to suppress the
+new line.
+
+@item @code{print-hostname} (default: @code{#t})
+When set to @code{#t}, print the host name before the login prompt.  The
+host name is printed up to the first dot.  Can be set to @code{'long} to
+print the full host name.
+
+@item @code{nice} (default: @code{#f})
+When set to a number, change the process priority using @code{nice}.
+
+@item @code{working-directory} (default: @code{#f})
+When set to a string, change into that directory before calling the
+login program.
+
+@item @code{root-directory} (default: @code{#f})
+When set to a string, use this directory at the process's root
+directory.

 @item @code{mingetty} (default: @var{mingetty})
 The Mingetty package to use.
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 6473e1a91a..798356ed84 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -187,6 +187,12 @@ (define-module (gnu services base)
             mingetty-configuration-login-pause?
             mingetty-configuration-clear-on-logout?
             mingetty-configuration-mingetty
+            mingetty-configuration-delay
+            mingetty-configuration-print-issue
+            mingetty-configuration-print-hostname
+            mingetty-configuration-nice
+            mingetty-configuration-working-directory
+            mingetty-configuration-root-directory
             mingetty-configuration?
             mingetty-service  ; deprecated
             mingetty-service-type
@@ -1240,22 +1246,36 @@ (define-deprecated (agetty-service config)
 (define-record-type* <mingetty-configuration>
   mingetty-configuration make-mingetty-configuration
   mingetty-configuration?
-  (mingetty         mingetty-configuration-mingetty ;file-like
-                    (default mingetty))
-  (tty              mingetty-configuration-tty)     ;string
-  (auto-login       mingetty-auto-login             ;string | #f
-                    (default #f))
-  (login-program    mingetty-login-program          ;gexp
-                    (default #f))
-  (login-pause?     mingetty-login-pause?           ;Boolean
-                    (default #f))
-  (clear-on-logout? mingetty-clear-on-logout?       ;Boolean
-                    (default #t)))
+  (mingetty          mingetty-configuration-mingetty ;file-like
+                     (default mingetty))
+  (tty               mingetty-configuration-tty) ;string
+  (auto-login        mingetty-auto-login         ;string | #f
+                     (default #f))
+  (login-program     mingetty-login-program ;gexp
+                     (default #f))
+  (login-pause?      mingetty-login-pause? ;Boolean
+                     (default #f))
+  (clear-on-logout?  mingetty-clear-on-logout? ;Boolean
+                     (default #t))
+  (delay             mingetty-configuration-delay ;Integer | #f
+                     (default #f))
+  (print-issue       mingetty-configuration-print-issue ;Boolean | Symbol
+                     (default #t))
+  (print-hostname    mingetty-configuration-print-hostname ;Boolean | Symbol
+                     (default #t))
+  (nice              mingetty-configuration-nice ;Integer | #f
+                     (default #f))
+  (working-directory mingetty-configuration-working-directory ;String | #f
+                     (default #f))
+  (root-directory    mingetty-configuration-root-directory ;String | #f
+                     (default #f)))

 (define (mingetty-shepherd-service config)
   (match-record config <mingetty-configuration>
-    (mingetty tty auto-login login-program
-              login-pause? clear-on-logout?)
+                ( mingetty tty auto-login login-program
+                  login-pause? clear-on-logout? delay
+                  print-issue print-hostname nice
+                  working-directory root-directory)
     (list
      (shepherd-service
       (documentation "Run mingetty on an tty.")
@@ -1286,6 +1306,32 @@ (define (mingetty-shepherd-service config)
                               #~())
                        #$@(if login-pause?
                               #~("--loginpause")
+                              #~())
+                       #$@(if delay
+                              #~("--delay" #$(number->string delay))
+                              #~())
+                       #$@(match print-issue
+                            (#t
+                             #~())
+                            ('no-nl
+                             #~("--nonewline"))
+                            (#f
+                             #~("--noissue")))
+                       #$@(match print-hostname
+                            (#t
+                             #~())
+                            ('long
+                             #~("--long-hostname"))
+                            (#f
+                             #~("--nohostname")))
+                       #$@(if nice
+                              #~("--nice" #$(number->string nice))
+                              #~())
+                       #$@(if working-directory
+                              #~("--chdir" #$working-directory)
+                              #~())
+                       #$@(if root-directory
+                              #~("--chroot" #$root-directory)
                               #~()))))
       (stop   #~(make-kill-destructor))))))

--
2.46.0




  parent reply	other threads:[~2024-12-03  0:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-24 14:28 [bug#74508] [PATCH 0/2] Improvements for mingetty-service-type Tomas Volf
2024-11-24 14:31 ` [bug#74508] [PATCH 1/2] services: mingetty: Add additional configuration options Tomas Volf
2024-11-25  1:45   ` Maxim Cournoyer
2024-11-25 15:37     ` Tomas Volf
2024-11-24 14:31 ` [bug#74508] [PATCH 2/2] services: mingetty: Support waiting on shepherd services Tomas Volf
2024-11-25  1:49   ` Maxim Cournoyer
2024-11-25 16:05 ` [bug#74508] [PATCH v2 1/3] services: mingetty: Add additional configuration options Tomas Volf
2024-11-25 16:05   ` [bug#74508] [PATCH v2 2/3] services: mingetty: Rename misnamed accessors Tomas Volf
2024-11-25 16:05   ` [bug#74508] [PATCH v2 3/3] services: mingetty: Support waiting on shepherd services Tomas Volf
2024-12-02 11:05   ` [bug#74508] [PATCH v2 1/3] services: mingetty: Add additional configuration options Ludovic Courtès
2024-12-03  0:18     ` Tomas Volf
2024-12-03  0:11 ` Tomas Volf [this message]
2024-12-03  0:11   ` [bug#74508] [PATCH v3 2/3] services: mingetty: Rename misnamed accessors Tomas Volf
2024-12-03  0:11   ` [bug#74508] [PATCH v3 3/3] services: mingetty: Support waiting on shepherd services Tomas Volf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='746975a119582d4dc85f1e5615d6b870a81164a9.1733184699.git.~@wolfsden.cz' \
    --to=~@wolfsden.cz \
    --cc=74508@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).