summaryrefslogtreecommitdiff
path: root/usr/src/cmd/su
diff options
context:
space:
mode:
authormeem <none@none>2005-06-28 14:23:40 -0700
committermeem <none@none>2005-06-28 14:23:40 -0700
commita787240632bcb1404b9fd4583516b875d3f02c8b (patch)
treec3d4416c26f04b6905696aa7c02b7d92cb81d50b /usr/src/cmd/su
parent8238724e5dcbed824cc9f1fd4d9b6bed72d0bfcc (diff)
downloadillumos-joyent-a787240632bcb1404b9fd4583516b875d3f02c8b.tar.gz
4533144 ON needs a single set of rules for installing default files
6281095 /etc/default files have inconsistent permissions 6288958 findunref's exception_list has become bloated --HG-- rename : usr/src/cmd/cmd-inet/etc/default/inetinit => usr/src/cmd/cmd-inet/etc/default/inetinit.dfl rename : usr/src/cmd/cmd-inet/etc/default/ipsec => usr/src/cmd/cmd-inet/etc/default/ipsec.dfl rename : usr/src/cmd/fs.d/autofs/autofs => usr/src/cmd/fs.d/autofs/autofs.dfl rename : usr/src/cmd/fs.d/nfs/etc/nfs => usr/src/cmd/fs.d/nfs/etc/nfs.dfl rename : usr/src/cmd/lvm/metassist/sysfiles/metassist.xml => usr/src/cmd/lvm/metassist/sysfiles/metassist.xml.dfl rename : usr/src/cmd/netfiles/nss => usr/src/cmd/netfiles/nss.dfl rename : usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/rpc.nisd => usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/rpc.nisd.dfl
Diffstat (limited to 'usr/src/cmd/su')
-rw-r--r--usr/src/cmd/su/Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/usr/src/cmd/su/Makefile b/usr/src/cmd/su/Makefile
index bbe403aac6..b98c7ae751 100644
--- a/usr/src/cmd/su/Makefile
+++ b/usr/src/cmd/su/Makefile
@@ -30,6 +30,7 @@
PROG = su
ROOTFS_PROG = su.static
+DEFAULTFILES = su.dfl
include ../Makefile.cmd
@@ -38,16 +39,12 @@ ROOTEMB_PROG = $(ROOTLIB)/$(EMB_PROG)
PROG_STATIC = $(ROOTSBIN)/$(ROOTFS_PROG)
-DFLTD = $(ROOTETC)/default
-ETCDFLTPROG = $(PROG:%=$(DFLTD)/%)
-
# set /usr/bin/su to 4555; set /sbin/su.static to 0555
FILEMODE = 04555
GROUP = sys
$(PROG_STATIC) := FILEMODE = 0555
-$(ETCDFLTPROG) := FILEMODE = $(LIBFILEMODE)
# A reduced su.static is created, with just enough functionality
# to satisfy the needs of a single-user login with /usr not mounted.
@@ -66,11 +63,7 @@ lint := LDLIBS += -lcmd -lbsm -lpam
.KEEP_STATE:
-all: $(PROG) $(ROOTFS_PROG) $(EMB_PROG) $(PROG).dfl
-
-# install rule for the default file
-$(DFLTD)/%: %.dfl
- $(INS.rename)
+all: $(PROG) $(ROOTFS_PROG) $(EMB_PROG)
# install rule for non-setuid /sbin/su.static
# (exec'd by /sbin/sulogin when booting single user)
@@ -78,8 +71,8 @@ $(ROOTFS_PROG): $(PROG).c
$(LINK.c) $(PROG).c -o $@ $(LDLIBS)
$(POST_PROCESS)
-install: all $(PROG_STATIC) $(ROOTPROG) $(ROOTSBINPROG) $(ETCDFLTPROG) \
- $(ROOTEMB_PROG)
+install: all $(PROG_STATIC) $(ROOTPROG) $(ROOTSBINPROG) \
+ $(ROOTETCDEFAULTFILES) $(ROOTEMB_PROG)
$(ROOTSBINPROG): $(ROOTPROG)
$(RM) $(ROOTSBINPROG); \