From patchwork Tue Jun 16 21:15:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 22753 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 0FD7C27BBE3; Tue, 16 Jun 2020 22:16:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D708827BBE4 for ; Tue, 16 Jun 2020 22:16:09 +0100 (BST) Received: from localhost ([::1]:49482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlIwD-0002uH-Em for patchwork@mira.cbaines.net; Tue, 16 Jun 2020 17:16:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlIw6-0002tx-Lw for guix-patches@gnu.org; Tue, 16 Jun 2020 17:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlIw6-0005yu-DL for guix-patches@gnu.org; Tue, 16 Jun 2020 17:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlIw6-0003vV-8r for guix-patches@gnu.org; Tue, 16 Jun 2020 17:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41855] [PATCH 1/2] hurd-boot: Create individual translators instead of running MAKEDEV. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jun 2020 21:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 41855@debbugs.gnu.org Received: via spool by 41855-submit@debbugs.gnu.org id=B41855.159234211715032 (code B ref 41855); Tue, 16 Jun 2020 21:16:02 +0000 Received: (at 41855) by debbugs.gnu.org; 16 Jun 2020 21:15:17 +0000 Received: from localhost ([127.0.0.1]:49770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlIvM-0003uO-2n for submit@debbugs.gnu.org; Tue, 16 Jun 2020 17:15:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlIvK-0003uB-Hi for 41855@debbugs.gnu.org; Tue, 16 Jun 2020 17:15:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35707) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlIvF-0005jz-Ao; Tue, 16 Jun 2020 17:15:09 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=41218 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jlIvE-0006Qr-QB; Tue, 16 Jun 2020 17:15:09 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <20200614165430.3411-1-janneke@gnu.org> <20200614165649.3496-1-janneke@gnu.org> <87imfsyuib.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Tue, 16 Jun 2020 23:15:07 +0200 In-Reply-To: <87imfsyuib.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 15 Jun 2020 21:54:52 +0200") Message-ID: <87y2omyap0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) 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" X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès writes: Hi! > "Jan (janneke) Nieuwenhuizen" skribis: > >> * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Do not create >> dev/{null,zero,full,random,urandom} mount points. >> (setup-translator, xattr-translator, >> showtrans-translator?, translated?, set-hurd-device-translators): New >> procedures. >> (boot-hurd-system): Use them instead of running MAKEDEV. > > This is mostly about moving the logic from the MAKEDEV script to this > file, right? Sounds nice. Yes. Glad you like the idea too. >> +(define (xattr-translator? file-name) >> + "Return true if FILE-NAME has an extended @code{gnu.translator} attribute >> +set." >> + (false-if-exception >> + (not (string-null? (getxattr file-name "gnu.translator"))))) > > I’d call it ‘passive-translator-xattr?’. > In general, I’d avoid ‘false-if-exception’ as much as possible because > it can hide real issues. So here, you could catch 'system-error and > check for ENODATA. If you need it in several places, you can define a > ‘false-if-ENODATA’ macro Nice. Ah, I remember having file-exists? checks or no check at all and then found it only worked on first boot, not with a persistent image. Minor detail. So I got out my axe and..."it worked" :-/ >> +(define (showtrans-translator? file-name) >> + "Return true if @file{showtrans} finds a translator installed on FILE-NAME." > > Should be ‘passive-translator-installed?’ no? (IIRC ‘showtrans’ only > shows passive translator settings by default.) Yes, thanks. >> + (with-output-to-port (%make-void-port "w") >> + (lambda _ >> + (with-error-to-port (%make-void-port "w") >> + (lambda _ >> + (zero? (system* "showtrans" "--silent" file-name))))))) >> + >> +(define (translated? file-name) >> + "Return true if a translator is installed on FILE-NAME." >> + (if (string-contains %host-type "linux-gnu") >> + (xattr-translator? file-name) >> + (showtrans-translator? file-name))) > > It’s counter-intuitive that hurd-boot.scm is used from GNU/Linux. > Should we move the shared bits in (gnu build hurd) or similar? Maybe...I don't know. hurd-boot defines functions that are needed to create a bootable hurd -- some can be called from GNU/Linux. Similarly, "linux-boot" defines "make-essential-device-nodes", which could be called from GNU/Hurd when we cross build a linux VM. Well, having one weird situation is a bad argument to propagate the madness. I guess it makes sense to move utility functions like passive-translator-xattr, passive-translator-installed?, and translated? could be moved to (gnu build hurd). Haven't made this change yet, let me know you want; or feel free to make the change yourself :-) >> +(define* (setup-translator file-name command #:optional (mode #o600)) >> + "Setup translator COMMAND on FILE-NAME." > > ‘set-translator’? :-) => set-translator! :-) >> + (false-if-exception (mkdir-p (scope "dev/vcs/1"))) >> + (false-if-exception (mkdir-p (scope "dev/vcs/2"))) >> + (false-if-exception (mkdir-p (scope "dev/vcs/3"))) >> + (false-if-exception (rename-file "/dev/console" "/dev/console-")) >> + (for-each scope-setup-translator devices) >> + >> + (false-if-exception (symlink "/dev/random" "/dev/urandom")) >> + (false-if-exception (mkdir-p "/dev/fd")) >> + (false-if-exception (symlink "/dev/fd/0" "/dev/stdin")) >> + (false-if-exception (symlink "/dev/fd/1" "/dev/stdout")) >> + (false-if-exception (symlink "/dev/fd/2" "/dev/stderr"))) > > ‘false-if-EEXIST’? Done for symlink; for mkdir, using (define (mkdir* dir) (let ((dir (scope dir))) (unless (file-exists? dir) (mkdir-p dir)))) New patch attached. Greetings, Janneke From 1e27aabb8bf32e85547517e1f0e35f789a08933d Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 8 Jun 2020 13:02:13 +0200 Subject: [PATCH v2 1/2] hurd-boot: Create individual translators instead of running MAKEDEV. * guix/build/utils.scm * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Do not create dev/{null,zero,full,random,urandom} mount points. (passive-translator-xattr?, passive-translator-installed?, translated?, set-hurd-device-translators): New procedures. (false-if-EEXIST): New macro. (boot-hurd-system): Use them instead of running MAKEDEV. --- gnu/build/hurd-boot.scm | 190 ++++++++++++++++++++++++++++++---------- 1 file changed, 143 insertions(+), 47 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 09326233d2..3f0e215344 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -80,16 +80,8 @@ Return the value associated with OPTION, or #f on failure." (string-append root (if (string-suffix? "/" root) "" "/") dir)) (mkdir (scope "dev")) - (for-each (lambda (file) - (call-with-output-file (scope file) - (lambda (port) - (display file port) ;avoid hard-linking - (chmod port #o666)))) - '("dev/null" - "dev/zero" - "dev/full" - "dev/random" - "dev/urandom")) + ;; Don't create /dev/null etc just yet; the store + ;; messes-up the permission bits. ;; Don't create /dev/console, /dev/vcs, etc.: they are created by ;; console-run on first boot. @@ -115,6 +107,143 @@ Return the value associated with OPTION, or #f on failure." ;; settings? ) +(define (passive-translator-xattr? file-name) + "Return true if FILE-NAME has an extended @code{gnu.translator} attribute +set." + (catch 'system-error + (lambda _ (not (string-null? (getxattr file-name "gnu.translator")))) + (lambda args + (if (= ENODATA (system-error-errno args)) + #f + (apply throw args))))) + +(define (passive-translator-installed? file-name) + "Return true if @file{showtrans} finds a translator installed on FILE-NAME." + (with-output-to-port (%make-void-port "w") + (lambda _ + (with-error-to-port (%make-void-port "w") + (lambda _ + (zero? (system* "showtrans" "--silent" file-name))))))) + +(define (translated? file-name) + "Return true if a translator is installed on FILE-NAME." + (if (string-contains %host-type "linux-gnu") + (passive-translator-xattr? file-name) + (passive-translator-installed? file-name))) + +(define* (set-translator! file-name command #:optional (mode #o600)) + "Setup translator COMMAND on FILE-NAME." + (unless (translated? file-name) + (let ((dir (dirname file-name))) + (unless (directory-exists? dir) + (mkdir-p dir)) + (unless (file-exists? file-name) + (call-with-output-file file-name + (lambda (port) + (display file-name port) ;avoid hard-linking + (chmod port mode))))) + (catch 'system-error + (lambda _ + (apply invoke "settrans" "--create" file-name command)) + (lambda (key . args) + (let ((errno (system-error-errno (cons key args)))) + (format (current-error-port) "~a: ~a\n" + (strerror errno) file-name) + (format (current-error-port) "Ignoring...Good Luck!\n")))))) + +(define-syntax-rule (false-if-EEXIST exp) + "Evaluate EXP but return #f if it raises to 'system-error with EEXIST." + (catch 'system-error + (lambda () exp) + (lambda args + (if (= EEXIST (system-error-errno args)) + #f + (apply throw args))))) + +(define* (set-hurd-device-translators #:optional (root "/")) + "Make some of the device nodes needed on GNU/Hurd." + + (define (scope dir) + (string-append root (if (string-suffix? "/" root) "" "/") dir)) + + (define scope-set-translator! + (match-lambda + ((file-name command) + (scope-set-translator! (list file-name command #o600))) + ((file-name command mode) + (let ((mount-point (scope file-name))) + (set-translator! mount-point command mode))))) + + (define (mkdir* dir) + (let ((dir (scope dir))) + (unless (file-exists? dir) + (mkdir-p dir)))) + + (define servers + '(("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) + ("servers/crash-kill" ("/hurd/crash" "--kill")) + ("servers/crash-suspend" ("/hurd/crash" "--suspend")) + ("servers/password" ("/hurd/password")) + ("servers/socket/1" ("/hurd/pflocal")) + ("servers/socket/2" ("/hurd/pfinet" + "--interface" "eth0" + "--address" + "10.0.2.15" ;the default QEMU guest IP + "--netmask" "255.255.255.0" + "--gateway" "10.0.2.2" + "--ipv6" "/servers/socket/16")))) + + (define devices + '(("dev/full" ("/hurd/null" "--full") #o666) + ("dev/null" ("/hurd/null") #o666) + ("dev/random" ("/hurd/random" "--seed-file" "/var/lib/random-seed") + #o644) + ("dev/zero" ("/hurd/storeio" "--store-type=zero") #o666) + + ("dev/console" ("/hurd/term" "/dev/console" "device" "console")) + + ("dev/klog" ("/hurd/streamio" "kmsg")) + ("dev/mem" ("/hurd/storeio" "--no-cache" "mem") #o660) + ("dev/shm" ("/hurd/tmpfs" "--mode=1777" "50%") #o644) + ("dev/time" ("/hurd/storeio" "--no-cache" "time") #o644) + + ("dev/vcs" ("/hurd/console")) + ("dev/tty" ("/hurd/magic" "tty") #o666) + + ("dev/tty1" ("/hurd/term" "/dev/tty1" "hurdio" "/dev/vcs/1/console") + #o666) + ("dev/tty2" ("/hurd/term" "/dev/tty2" "hurdio" "/dev/vcs/2/console") + #o666) + ("dev/tty3" ("/hurd/term" "/dev/tty3" "hurdio" "/dev/vcs/3/console") + #o666) + + ("dev/ptyp0" ("/hurd/term" "/dev/ptyp0" "pty-master" "/dev/ttyp0") + #o666) + ("dev/ptyp1" ("/hurd/term" "/dev/ptyp1" "pty-master" "/dev/ttyp1") + #o666) + ("dev/ptyp2" ("/hurd/term" "/dev/ptyp2" "pty-master" "/dev/ttyp2") + #o666) + + ("dev/ttyp0" ("/hurd/term" "/dev/ttyp0" "pty-slave" "/dev/ptyp0") + #o666) + ("dev/ttyp1" ("/hurd/term" "/dev/ttyp1" "pty-slave" "/dev/ptyp1") + #o666) + ("dev/ttyp2" ("/hurd/term" "/dev/ttyp2" "pty-slave" "/dev/ptyp2") + #o666))) + + (for-each scope-set-translator! servers) + (mkdir* (scope "dev/vcs/1")) + (mkdir* (scope "dev/vcs/2")) + (mkdir* (scope "dev/vcs/2")) + (rename-file (scope "/dev/console") (scope "/dev/console-")) + (for-each scope-set-translator! devices) + + (false-if-EEXIST (symlink "/dev/random" (scope "dev/urandom"))) + (mkdir* (scope "dev/fd")) + (false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin"))) + (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) + (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))) + (define* (boot-hurd-system #:key (on-error 'debug)) "This procedure is meant to be called from an early RC script. @@ -126,20 +255,9 @@ starting the Shepherd. XXX TODO: see linux-boot.scm:boot-system. XXX TODO: add proper file-system checking, mounting XXX TODO: move bits to (new?) (hurd?) (activation?) services -XXX TODO: use settrans/setxattr instead of MAKEDEV +XXX TODO: use Linux xattr/setxattr to remove (settrans in) /libexec/RUNSYSTEM " - (define translators - '(("/servers/crash-dump-core" ("/hurd/crash" "--dump-core")) - ("/servers/crash-kill" ("/hurd/crash" "--kill")) - ("/servers/crash-suspend" ("/hurd/crash" "--suspend")) - ("/servers/password" ("/hurd/password")) - ("/servers/socket/1" ("/hurd/pflocal")) - ("/servers/socket/2" ("/hurd/pfinet" "--interface" "eth0" - "--address" "10.0.2.15" ;the default QEMU guest IP - "--netmask" "255.255.255.0" - "--gateway" "10.0.2.2" - "--ipv6" "/servers/socket/16")))) (display "Welcome, this is GNU's early boot Guile.\n") (display "Use '--repl' for an initrd REPL.\n\n") @@ -147,35 +265,13 @@ XXX TODO: use settrans/setxattr instead of MAKEDEV (call-with-error-handling (lambda () - (define (translated? node) - ;; Return true if a translator is installed on NODE. - (with-output-to-port (%make-void-port "w") - (lambda () - (with-error-to-port (%make-void-port "w") - (lambda () - (zero? (system* "showtrans" "--silent" node))))))) - (let* ((args (command-line)) (system (find-long-option "--system" args)) (to-load (find-long-option "--load" args))) - (format #t "Creating essential servers...\n") - (setenv "PATH" (string-append system "/profile/bin" - ":" system "/profile/sbin")) - (for-each (match-lambda - ((node command) - (unless (translated? node) - (mkdir-p (dirname node)) - (apply invoke "settrans" "--create" node command)))) - translators) - - (format #t "Creating essential device nodes...\n") - (with-directory-excursion "/dev" - (invoke "MAKEDEV" "--devdir=/dev" "std") - (invoke "MAKEDEV" "--devdir=/dev" "vcs") - (invoke "MAKEDEV" "--devdir=/dev" "tty1""tty2" "tty3" "tty4" "tty5" "tty6") - (invoke "MAKEDEV" "--devdir=/dev" "ptyp0" "ptyp1" "ptyp2") - (invoke "MAKEDEV" "--devdir=/dev" "console")) + (format #t "Setting-up essential translators...\n") + (setenv "PATH" (string-append system "/profile/bin")) + (set-hurd-device-translators) (false-if-exception (delete-file "/hurd")) (let ((hurd/hurd (readlink* (string-append system "/profile/hurd")))) -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com