diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-02-03 22:22:30 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-02-03 22:22:30 +0000 |
| commit | d5fef2f4802f515505a545dfee6c81b5fd377a96 (patch) | |
| tree | 04c65392c2a4cd383edaefad7337ba7d8a3ddc91 | |
| parent | bb633f5b0e92fa59f65274f8b5637a7107ca29ec (diff) | |
| download | illumos-joyent-d5fef2f4802f515505a545dfee6c81b5fd377a96.tar.gz | |
OS-3792 platform uses obsolete nfs mount command
| -rw-r--r-- | manifest | 4 | ||||
| -rw-r--r-- | usr/src/cmd/fs.d/nfs/mount/Makefile | 14 |
2 files changed, 7 insertions, 11 deletions
@@ -310,7 +310,7 @@ f etc/fs/dev/mount 0555 root bin d etc/fs/hsfs 0755 root sys f etc/fs/hsfs/mount 0555 root bin d etc/fs/nfs 0755 root sys -f etc/fs/nfs/mount 0555 root bin +s etc/fs/nfs/mount=../../../usr/lib/fs/nfs/mount d etc/fs/ufs 0755 root sys f etc/fs/ufs/mount 0555 root bin d etc/fs/zfs 0755 root sys @@ -5407,7 +5407,7 @@ f usr/lib/fs/nfs/dfmounts 0555 root bin h usr/lib/fs/nfs/dfshares=usr/lib/fs/nfs/dfmounts f usr/lib/fs/nfs/libshare_nfs.so.1 0755 root sys s usr/lib/fs/nfs/libshare_nfs.so=libshare_nfs.so.1 -s usr/lib/fs/nfs/mount=../../../../etc/fs/nfs/mount +f usr/lib/fs/nfs/mount 0555 root bin f usr/lib/fs/nfs/nfsfind 0555 root sys f usr/lib/fs/nfs/showmount 0555 root bin f usr/lib/fs/nfs/umount 0555 root bin diff --git a/usr/src/cmd/fs.d/nfs/mount/Makefile b/usr/src/cmd/fs.d/nfs/mount/Makefile index dad33922a3..c2485208a8 100644 --- a/usr/src/cmd/fs.d/nfs/mount/Makefile +++ b/usr/src/cmd/fs.d/nfs/mount/Makefile @@ -19,18 +19,12 @@ # CDDL HEADER END # # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2014, Joyent, Inc. All rights reserved. # # cmd/fs.d/nfs/mount/Makefile FSTYPE= nfs LIBPROG= mount -ROOTFS_PROG= $(LIBPROG) - -# duplicate ROOTLIBFSTYPE value needed for installation rule -# we must define this before including Makefile.fstype -ROOTLIBFSTYPE = $(ROOT)/usr/lib/fs/$(FSTYPE) -$(ROOTLIBFSTYPE)/%: $(ROOTLIBFSTYPE) % - $(RM) $@; $(SYMLINK) ../../../../etc/fs/$(FSTYPE)/$(LIBPROG) $@ include ../../Makefile.fstype @@ -65,7 +59,7 @@ CLOBBERFILES += $(LIBPROG) .KEEP_STATE: -all: $(ROOTFS_PROG) +all: $(LIBPROG) $(LIBPROG): webnfs.h $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) @@ -114,7 +108,9 @@ $(POFILE): $(SRCS) sed "/^domain/d" messages.po > $@ $(RM) $(POFILE).i messages.po -install: $(ROOTETCPROG) +install: all $(FSTYPEPROG) + $(RM) $(ROOTETCPROG) + $(SYMLINK) ../../../usr/lib/fs/$(FSTYPE)/$(LIBPROG) $(ROOTETCPROG) lint: webnfs.h webnfs_xdr.c webnfs_client.c lint_SRCS |