diff options
| author | Adam Tkac <atkac@redhat.com> | 2012-04-26 13:34:29 +0200 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2012-04-26 13:34:29 +0200 |
| commit | 773ac2b8b36f1011207d5de13b5c5b1ccea98686 (patch) | |
| tree | 0affa31247ea572f6c865ce4300e6ccf46db72d7 | |
| parent | 0e5b5af688d2465b917012d264340be7f5b8f5d6 (diff) | |
| download | bind-773ac2b8b36f1011207d5de13b5c5b1ccea98686.tar.gz bind-773ac2b8b36f1011207d5de13b5c5b1ccea98686.tar.xz bind-773ac2b8b36f1011207d5de13b5c5b1ccea98686.zip | |
initscript: don't umount /var/named when didn't mount it
Signed-off-by: Adam Tkac <atkac@redhat.com>
| -rw-r--r-- | bind.spec | 5 | ||||
| -rwxr-xr-x | setup-named-chroot.sh | 20 |
2 files changed, 15 insertions, 10 deletions
@@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.9.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -774,6 +774,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Thu Apr 26 2012 Adam Tkac <atkac redhat com> 32:9.9.0-5 +- initscript: don't umount /var/named when didn't mount it + * Tue Apr 24 2012 Adam Tkac <atkac redhat com> 32:9.9.0-4 - apply all non-SDB patches before SDB ones (#804475) - enable Berkeley DB DLZ backend (#804478) diff --git a/setup-named-chroot.sh b/setup-named-chroot.sh index 38cb1ce..20dfd35 100755 --- a/setup-named-chroot.sh +++ b/setup-named-chroot.sh @@ -53,15 +53,17 @@ mount_chroot_conf() umount_chroot_conf() { - for all in $ROOTDIR_MOUNT; do - # Check if file is mount target. Do not use /proc/mounts because detecting - # of modified mounted files can fail. - if mount | grep -q '.* on '"$ROOTDIR$all"' .*'; then - umount "$ROOTDIR$all" - # Remove temporary created files - [ -f "$all" ] && rm -f "$ROOTDIR$all" - fi - done + if [ -n "$ROOTDIR" ]; then + for all in $ROOTDIR_MOUNT; do + # Check if file is mount target. Do not use /proc/mounts because detecting + # of modified mounted files can fail. + if mount | grep -q '.* on '"$ROOTDIR$all"' .*'; then + umount "$ROOTDIR$all" + # Remove temporary created files + [ -f "$all" ] && rm -f "$ROOTDIR$all" + fi + done + fi } case "$2" in |