diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-01-28 21:07:42 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-28 21:32:58 +0100 |
| commit | 01ed3c4fe54548ca0c2848c4ecee3525c7dabc36 (patch) | |
| tree | b21b90fdc14c4339bea99ca24f92535715b227b6 | |
| parent | 9250b30466c17747a32f215551ded8dc52bc2c32 (diff) | |
| download | guix-01ed3c4fe54548ca0c2848c4ecee3525c7dabc36.tar.gz | |
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.
| -rw-r--r-- | gnu/build/linux-boot.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 3096989468..f54e3d3a35 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -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")) |