diff options
| author | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
| commit | cbe96f14700f4805552c47d5f163a75c35f86575 (patch) | |
| tree | d7791d29b283507bb8953a292d764b24774c955c /gnu/build/hurd-boot.scm | |
| parent | 337333c2567bdf767fdc8e04520c4bc0c8b33784 (diff) | |
| parent | 7a9a27a051a04a7fee2e7fe40127fedbe9112cfd (diff) | |
| download | guix-cbe96f14700f4805552c47d5f163a75c35f86575.tar.gz guix-cbe96f14700f4805552c47d5f163a75c35f86575.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build/hurd-boot.scm')
| -rw-r--r-- | gnu/build/hurd-boot.scm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index aea2ac3307..adc8b4ce16 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -191,7 +191,8 @@ set." "10.0.2.15" ;the default QEMU guest IP "--netmask" "255.255.255.0" "--gateway" "10.0.2.2" - "--ipv6" "/servers/socket/16")))) + "--ipv6" "/servers/socket/16")) + ("proc" ("/hurd/procfs" "--stat-mode=444")))) (define devices '(("dev/full" ("/hurd/null" "--full") #o666) @@ -232,17 +233,22 @@ set." #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-")) + (mkdir* "dev/vcs/1") + (mkdir* "dev/vcs/2") + (mkdir* "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")) + (mkdir* "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")))) + (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr"))) + + ;; Make sure /etc/mtab is a symlink to /proc/mounts. + (false-if-exception (delete-file (scope "etc/mtab"))) + (mkdir* (scope "etc")) + (symlink "/proc/mounts" (scope "etc/mtab"))) (define* (boot-hurd-system #:key (on-error 'debug)) |