diff options
| author | rh <rh> | 2000-03-15 07:00:52 +0000 |
|---|---|---|
| committer | rh <rh> | 2000-03-15 07:00:52 +0000 |
| commit | f48a1d53d4f5a6f655a115e6458f3bf83b150584 (patch) | |
| tree | 7822f97da1f548b4d1e85803b2554fe36428f689 /misc/staroffice | |
| parent | 1a4a0ed3f7cf99c9b6e7258cd78ab568ccdd9d7c (diff) | |
| download | pkgsrc-f48a1d53d4f5a6f655a115e6458f3bf83b150584.tar.gz | |
Add check whether /proc is mounted. Closes pr 9560 by Tim Walls, thx!
Diffstat (limited to 'misc/staroffice')
| -rw-r--r-- | misc/staroffice/Makefile | 6 | ||||
| -rwxr-xr-x | misc/staroffice/files/soffice | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile index b3c7efd21ef..be44573995a 100644 --- a/misc/staroffice/Makefile +++ b/misc/staroffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/12/07 20:59:26 sommerfeld Exp $ +# $NetBSD: Makefile,v 1.5 2000/03/15 07:00:52 rh Exp $ # DISTNAME= so51a_lnx_${LANGNO} @@ -99,6 +99,10 @@ pre-install: ${ECHO} "${DISTNAME} needs to be installed under X11."; \ exit 1; \ fi + @if [ "`/sbin/mount | grep 'on /proc' | cut -d ' ' -f 5`" != "procfs" ]; then \ + ${ECHO} "${DISTNAME} needs procfs to be mounted on /proc."; \ + exit 1; \ + fi @${CAT} ${PKGDIR}/PLIST.${LANGNO} ${PKGDIR}/PLIST >${PLIST_SRC} do-install: diff --git a/misc/staroffice/files/soffice b/misc/staroffice/files/soffice index 1f624e1ec0a..a533102cd54 100755 --- a/misc/staroffice/files/soffice +++ b/misc/staroffice/files/soffice @@ -1,10 +1,17 @@ #!/bin/sh # -# $NetBSD: soffice,v 1.1.1.1 1999/11/22 21:23:49 rh Exp $ +# $NetBSD: soffice,v 1.2 2000/03/15 07:00:52 rh Exp $ # SOINST=@@PREFIX@@/Office51 [ "$SOFFICE" = "" ] && SOFFICE=$HOME/Office51 +if [ "`/sbin/mount | grep 'on /proc' | cut -d ' ' -f 5`" != "procfs" ]; then + echo "-----------------------------------------------------------------" + echo "StarOffice needs procfs to be mounted on /proc in order to work. " + echo "-----------------------------------------------------------------" + exit 1 +fi + if [ ! -d "$SOFFICE" ]; then echo "" echo "-----------------------------------------------------------------" |