~ruther/guix-local

01ed3c4fe54548ca0c2848c4ecee3525c7dabc36 — Ludovic Courtès 11 years ago 9250b30
linux-boot: Don't fail if /root/etc/mtab is a dangling symlink.

Reported Joshua Grant.
Patch suggested by Mark H Weaver.

* gnu/build/linux-boot.scm (mount-root-file-system): Use
  'false-if-exception' instead of 'when (file-exists? ...)' to account
  for dangling symlinks.
1 files changed, 2 insertions(+), 2 deletions(-)

M gnu/build/linux-boot.scm
M gnu/build/linux-boot.scm => gnu/build/linux-boot.scm +2 -2
@@ 1,5 1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 276,7 276,7 @@ UNIONFS."
        (mount root "/root" type)))

  ;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts.
  (when (file-exists? "/root/etc/mtab")
  (false-if-exception
    (delete-file "/root/etc/mtab"))
  (symlink "/proc/self/mounts" "/root/etc/mtab"))