diff options
| author | Roy Marples <roy@marples.name> | 2007-04-25 12:32:47 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-04-25 12:32:47 +0000 |
| commit | 00d596fb439d9c3aff6c6d06448b194681333d46 (patch) | |
| tree | f6178f22d594b5bab8559c21de26c9033b8d50c8 | |
| parent | dfc208bd25288dd09d531f3e0665274bb9cf2998 (diff) | |
Fix Makefile to clean and remove .svn when making dist. rc-mount no longer appends -f for linux mount and uses -i instead to ignore helpers
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | sh/rc-mount.sh | 10 |
2 files changed, 11 insertions, 2 deletions
@@ -90,6 +90,8 @@ diststatus: distforce: rm -rf /tmp/$(PKG) cp -pPR . /tmp/$(PKG) + $(MAKE) -C /tmp/$(PKG) clean + (find /tmp/$(PKG) -type d -name .svn -exec rm -rf {} \; 2>/dev/null; exit 0) tar -C /tmp -cvjpf /tmp/$(PKG).tar.bz2 $(PKG) rm -rf /tmp/$(PKG) ls -l /tmp/$(PKG).tar.bz2 @@ -97,6 +99,7 @@ distforce: distit: rm -rf /tmp/$(PKG) svn export . /tmp/$(PKG) + $(MAKE) -C /tmp/$(PKG) clean tar -C /tmp -cvjpf /tmp/$(PKG).tar.bz2 $(PKG) rm -rf /tmp/$(PKG) ls -l /tmp/$(PKG).tar.bz2 diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh index 67ea203f..2084911d 100644 --- a/sh/rc-mount.sh +++ b/sh/rc-mount.sh @@ -52,8 +52,14 @@ do_unmount() { # OK, try forcing things if [ ${retry} -le 0 ] ; then - ${cmd} -f "${mnt}" || retry=-999 - retry=-999 + local extra_opts="-f" + case "${cmd}" in + mount*) + # Silly reiserfs helper blocks us, so bypass it + [ "${RC_UNAME}" = "Linux" ] && extra_opts="-i" + ;; + esac + ${cmd} ${extra_opts} "${mnt}" || retry=-999 break fi done |