Package: fai-server
Version: 5.3.5
Severity: important
Tags: patch

Dear Maintainer,

ran fai-cd twice, second time it failed on mount, I noticed a leftover
mount of a blank dir in the nfsroot.

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 4.9.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages fai-server depends on:
ii  debootstrap  1.0.89
ii  fai-client   5.3.4
ii  xz-utils     5.2.2-1.2+b1

Versions of packages fai-server recommends:
pn  isc-dhcp-server                   <none>
pn  libproc-daemon-perl               <none>
ii  nfs-kernel-server                 1:1.3.4-2.1
pn  openbsd-inetd | inet-superserver  <none>
ii  openssh-client                    1:7.4p1-10
ii  openssh-server                    1:7.4p1-10
ii  tftpd-hpa                         5.2+20150808-1+b1

Versions of packages fai-server suggests:
ii  aptitude           0.8.6-1
ii  binutils           2.28-3
pn  debmirror          <none>
pn  fai-setup-storage  <none>
pn  grub2              <none>
ii  perl-tk            1:804.033-1+b3
ii  qemu-utils         1:2.8+dfsg-3
ii  reprepro           5.1.1-1
ii  squashfs-tools     1:4.3-3+b1
pn  xorriso            <none>

-- Configuration Files:
/etc/fai/NFSROOT changed [not included]
/etc/fai/apt/sources.list changed [not included]
/etc/fai/nfsroot.conf changed [not included]

-- no debconf information
>From a08860f6162c19bfbf9b3637f42b8891a02062f4 Mon Sep 17 00:00:00 2001
From: Ian Kelling <i...@iankelling.org>
Date: Wed, 12 Apr 2017 16:43:02 -0700
Subject: [PATCH] fix fai-cd leftover mountpoints in nfsroot

The mounts are from an empty directory to temporarily hide some
directories in the nfsroot. Unmounting fixes it.
---
 bin/fai-cd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/fai-cd b/bin/fai-cd
index b65551f4..eb19433d 100755
--- a/bin/fai-cd
+++ b/bin/fai-cd
@@ -288,7 +288,7 @@ unhide_dirs() {
                umount  $target/$d 2>/dev/null
             fi
        else
-            if [ -d $nfsrootdir/$d ]; then
+            if [ -d $ONFSROOT/$d ]; then
                [ "$debug" ] && echo "disclosing $d"
                umount $ONFSROOT/$d 2>/dev/null
             fi
-- 
2.11.0

Reply via email to