diff options
| author | meem <none@none> | 2005-06-28 14:23:40 -0700 |
|---|---|---|
| committer | meem <none@none> | 2005-06-28 14:23:40 -0700 |
| commit | a787240632bcb1404b9fd4583516b875d3f02c8b (patch) | |
| tree | c3d4416c26f04b6905696aa7c02b7d92cb81d50b /usr/src/cmd | |
| parent | 8238724e5dcbed824cc9f1fd4d9b6bed72d0bfcc (diff) | |
| download | illumos-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')
38 files changed, 139 insertions, 375 deletions
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index 1d074eb78f..0ffe991336 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -180,10 +180,10 @@ $(ROOTMAN3FILES) := OWNER= root $(ROOTMAN3FILES) := GROUP= bin ROOTETCDEFAULT= $(ROOTETC)/default -ROOTETCDEFAULTFILES= $(DEFAULTFILES:%=$(ROOTETCDEFAULT)/%) +ROOTETCDEFAULTFILES= $(DEFAULTFILES:%.dfl=$(ROOTETCDEFAULT)/%) $(ROOTETCDEFAULTFILES) := OWNER = root $(ROOTETCDEFAULTFILES) := GROUP = sys -$(ROOTETCDEFAULTFILES) := FILEMODE = 0444 +$(ROOTETCDEFAULTFILES) := FILEMODE = 0644 # # Directories for smf(5) service manifests and profiles. @@ -288,6 +288,9 @@ $(ROOTUSRSBIN64)/%: % $(ROOTETC)/%: % $(INS.file) +$(ROOTETCDEFAULT)/%: %.dfl + $(INS.rename) + $(ROOTCCSBIN)/%: % $(INS.file) diff --git a/usr/src/cmd/cmd-inet/etc/default/Makefile b/usr/src/cmd/cmd-inet/etc/default/Makefile index e05432407b..5571d67464 100644 --- a/usr/src/cmd/cmd-inet/etc/default/Makefile +++ b/usr/src/cmd/cmd-inet/etc/default/Makefile @@ -20,36 +20,20 @@ # CDDL HEADER END # # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" # # cmd/cmd-inet/etc/default/Makefile -DFLTF= inetinit ipsec +DEFAULTFILES= inetinit.dfl ipsec.dfl include ../../../Makefile.cmd -DFLTD= $(ROOTETC)/default -ETCDFLTPROG = $(DFLTF:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = $(LIBFILEMODE) -$(ETCDFLTPROG) := GROUP = sys -DIRS=$(DFLTD) +all clean lint: -all: - -install: all $(DIRS) $(ETCDFLTPROG) - -$(DFLTD)/% : % $(DFLTD) - $(INS.file) - -$(DIRS): - $(INS.dir) - -clean: - -lint: +install: all $(ROOTETCDEFAULTFILES) include ../../../Makefile.targ diff --git a/usr/src/cmd/cmd-inet/etc/default/inetinit b/usr/src/cmd/cmd-inet/etc/default/inetinit.dfl index 71b1e1af3f..71b1e1af3f 100644 --- a/usr/src/cmd/cmd-inet/etc/default/inetinit +++ b/usr/src/cmd/cmd-inet/etc/default/inetinit.dfl diff --git a/usr/src/cmd/cmd-inet/etc/default/ipsec b/usr/src/cmd/cmd-inet/etc/default/ipsec.dfl index 0a2907ad0e..0a2907ad0e 100644 --- a/usr/src/cmd/cmd-inet/etc/default/ipsec +++ b/usr/src/cmd/cmd-inet/etc/default/ipsec.dfl diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile b/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile index 0403bd19a1..8acf78f5a0 100644 --- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile +++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -28,22 +28,16 @@ PROG = dhcpagent ROOTFS_PROG = $(PROG) -LOCOBJS = adopt.o agent.o arp_check.o async.o bound.o class_id.o defaults.o \ - dlpi_io.o dlprims.o inform.o init_reboot.o \ - interface.o ipc_action.o packet.o release.o renew.o request.o \ - script_handler.o select.o util.o +DEFAULTFILES = dhcpagent.dfl + +LOCOBJS = adopt.o agent.o arp_check.o async.o bound.o class_id.o defaults.o \ + dlpi_io.o dlprims.o inform.o init_reboot.o interface.o ipc_action.o \ + packet.o release.o renew.o request.o script_handler.o select.o util.o COMDIR = $(SRC)/common/net/dhcp COMOBJS = ipv4_sum.o udp_sum.o -INETDIR = $(SRC)/cmd/cmd-inet/common include ../../../Makefile.cmd -DFLTD = $(ROOTETC)/default -ETCDFLTPROG = $(PROG:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = 0444 -$(ETCDFLTPROG) := OWNER = root -$(ETCDFLTPROG) := GROUP = sys - OBJS = $(COMOBJS) $(LOCOBJS) SRCS = $(COMOBJS:%.o=$(COMDIR)/%.c) $(LOCOBJS:%.o=%.c) @@ -54,14 +48,14 @@ XGETFLAGS += -a -x dhcpagent.xcl # to compile a debug version, do a `make COPTFLAG="-g -XO0"' # -CPPFLAGS += -I$(COMDIR) -I$(INETDIR) +CPPFLAGS += -I$(COMDIR) LDLIBS += -lsocket -lnvpair -lnsl -ldhcpagent -ldhcputil -linetutil -ldevinfo .KEEP_STATE: -all: $(ROOTFS_PROG) $(PROG).dfl +all: $(ROOTFS_PROG) -install: all $(ROOTSBINPROG) $(ETCDFLTPROG) +install: all $(ROOTSBINPROG) $(ROOTETCDEFAULTFILES) $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) @@ -71,13 +65,6 @@ $(PROG): $(OBJS) $(COMPILE.c) $(OUTPUT_OPTION) $< $(POST_PROCESS_O) -%.o: $(INETDIR)/%.c - $(COMPILE.c) $(OUTPUT_OPTION) $< - $(POST_PROCESS_O) - -$(DFLTD)/%: %.dfl - $(INS.rename) - $(POFILE): $(POFILES) $(RM) $@; $(CAT) $(POFILES) > $@; $(RM) $(POFILES) diff --git a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile index b13f90f99f..e4c0460476 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile @@ -20,20 +20,20 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -PROG= ftp -PROGDFL= ftp -OBJS= cmds.o cmdtab.o ftp.o getpass.o glob.o main.o pclose.o \ - ruserpass.o domacro.o +PROG = ftp +DEFAULTFILES = ftp.dfl +OBJS = cmds.o cmdtab.o ftp.o getpass.o glob.o main.o pclose.o \ + ruserpass.o domacro.o AUTH_OBJS = auth.o cmds_gss.o secure.o OBJS += $(AUTH_OBJS) -SRCS= $(OBJS:%.o=%.c) +SRCS = $(OBJS:%.o=%.c) include ../../../Makefile.cmd @@ -45,31 +45,19 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 \ LDLIBS += -lsocket -lnsl -lcmd -lgss LDFLAGS += $(ZLAZYLOAD) -DFLTD = $(ROOTETC)/default -ETCDFLTPROG = $(PROGDFL:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = 0644 -$(ETCDFLTPROG) := OWNER = root -$(ETCDFLTPROG) := GROUP = sys - .KEEP_STATE: -all: $(PROG) $(PROGDFL).dfl +all: $(PROG) $(PROG): $(OBJS) - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) - $(POST_PROCESS) + $(LINK.c) $(OBJS) -o $@ $(LDLIBS) + $(POST_PROCESS) -install: all $(ROOTPROG) $(DFLTD) $(ETCDFLTPROG) +install: all $(ROOTPROG) $(ROOTETCDEFAULTFILES) clean: - $(RM) $(OBJS) - -lint: lint_SRCS - -$(DFLTD): - $(INS.dir) + $(RM) $(OBJS) -$(DFLTD)/%: %.dfl - $(INS.rename) +lint: lint_SRCS include ../../../Makefile.targ diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile index ff1e2c0fc8..b3240595af 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile @@ -20,17 +20,18 @@ # CDDL HEADER END # # -# Copyright 1992-2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # PROG = in.mpathd -PROGDFL = mpathd OBJS = mpd_tables.o mpd_main.o mpd_probe.o SRCS = $(OBJS:%.o=%.c) +DEFAULTFILES = mpathd.dfl + include ../../../Makefile.cmd POFILE = $(PROG).po @@ -43,12 +44,6 @@ POFILES = $(SRCS:%.c=%.po) CPPFLAGS += -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ -I$(SRC)/cmd/cmd-inet/common LDLIBS += -lcmd -lsocket -lnsl -lsysevent -lnvpair -lipmp -lc -DFLTD = $(ROOTETC)/default -ETCDFLTPROG = $(PROGDFL:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = 0444 -$(ETCDFLTPROG) := OWNER = root -$(ETCDFLTPROG) := GROUP = sys - LINTFLAGS += -erroff=E_FUNC_DECL_VAR_ARG2 -erroff=E_INCONS_VAL_TYPE_DECL2 \ -erroff=E_FUNC_USED_VAR_ARG2 -erroff=E_INCONS_ARG_DECL2 \ -erroff=E_NAME_USED_NOT_DEF2 -erroff=E_INCONS_ARG_USED2 \ @@ -56,7 +51,7 @@ LINTFLAGS += -erroff=E_FUNC_DECL_VAR_ARG2 -erroff=E_INCONS_VAL_TYPE_DECL2 \ .KEEP_STATE: -all: $(PROG) $(PROGDFL).dfl +all: $(PROG) $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) @@ -67,19 +62,13 @@ include ../Makefile.lib $(ROOTSBINPROG): $(RM) $@; $(SYMLINK) ../usr/lib/inet/$(PROG) $@ -install: all $(ROOTLIBINETPROG) $(ROOTSBINPROG) $(DFLTD) $(ETCDFLTPROG) +install: all $(ROOTLIBINETPROG) $(ROOTSBINPROG) $(ROOTETCDEFAULTFILES) clean: $(RM) $(OBJS) lint: lint_SRCS -$(DFLTD): - $(INS.dir) - -$(DFLTD)/%: %.dfl - $(INS.rename) - $(POFILE): $(POFILES) $(RM) $@ $(CAT) $(POFILES) > $@ diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile index 68e363bb66..fcf7f574b1 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile @@ -58,7 +58,7 @@ NSLPROG= 6to4relay arp gettable hostconfig ikeadm in.comsat in.rarpd \ CMDPROG= in.telnetd IPSECUTILPROG= ikeadm ipsecalgs ipsecconf ipseckey K5PROGS= in.telnetd in.rlogind in.rshd -DEFAULTFILES= telnetd +DEFAULTFILES= telnetd.dfl PROGSRCS= $(PROG:%=%.c) TFTPDOBJS= in.tftpd.o tftpsubs.o @@ -190,9 +190,6 @@ tftpsubs.o: $(OTHERSRC) $(ROOTUSRSBINLINKS): -$(RM) $@; $(SYMLINK) ../../sbin/$(@F) $@ -$(ROOTETCDEFAULT)/%: %.dfl - $(INS.rename) - install: $(PROG) $(ROOTFS_PROG) $(SUBDIRS) .WAIT $(ROOTUSRSBINPROG) \ $(ROOTSBINPROG) $(ROOTUSRSBINLINKS) $(ROOTETCDEFAULTFILES) \ $(ROOTMANIFEST) diff --git a/usr/src/cmd/cron/Makefile b/usr/src/cmd/cron/Makefile index 2601337eec..be8127b82b 100644 --- a/usr/src/cmd/cron/Makefile +++ b/usr/src/cmd/cron/Makefile @@ -26,6 +26,8 @@ # ident "%Z%%M% %I% %E% SMI" # +DEFAULTFILES = cron.dfl + include ../Makefile.cmd MANIFEST = cron.xml @@ -39,7 +41,6 @@ ROOTVAR = $(ROOT)/var ROOTSPCRON = $(ROOTVAR)/spool/cron ROOTCROND = $(ROOTETC)/cron.d -ROOTDEFAULT = $(ROOTETC)/default ROOTCRONTABS = $(ROOTSPCRON)/crontabs ROOTATJOBS = $(ROOTSPCRON)/atjobs ROOTLIBCRON = $(ROOTLIB)/cron @@ -52,22 +53,18 @@ PROG = $(PROG1) $(PROG2) SCRIPT = batch XPG4SCRIPT = batch.xpg4 -FILES = cron.dfl - POFILE= $(PROG1)_cmd.po POFILES= at.po crontab.po funcs.po batch.po XGETFLAGS= -a -x $(PROG1).xcl -ROOTDIRS = $(ROOTSPCRON) $(ROOTCROND) $(ROOTDEFAULT) \ +ROOTDIRS = $(ROOTSPCRON) $(ROOTCROND) \ $(ROOTCRONTABS) $(ROOTATJOBS) ROOTPROG = $(PROG1:%=$(ROOTUSRSBIN)/%) $(PROG2:%=$(ROOTBIN)/%) \ - $(SCRIPT:%=$(ROOTBIN)/%) $(FILES:%=$(ROOTDEFAULT)/%) \ + $(SCRIPT:%=$(ROOTBIN)/%) \ $(XPG4PROG:%=$(ROOTXPG4BIN)/%) \ $(XPG4SCRIPT:%.xpg4=$(ROOTXPG4BIN)/%) -ROOTSETUP = $(ROOTDEFAULT)/cron - ROOTSYMLINK = $(ROOTLIBCRON) $(ROOTETC)/cron COMMONOBJ1= permit.o @@ -149,7 +146,7 @@ $(ROOTLIBSVCMETHOD)/svc-cron := FILEMODE = 0555 all : $(PROG) $(XPG4) $(SCRIPT) $(XPG4SCRIPT) $(FILES) -install : all $(ROOTPROG) $(ROOTSETUP) $(ROOTSYMLINK) \ +install : all $(ROOTPROG) $(ROOTETCDEFAULTFILES) $(ROOTSYMLINK) \ $(ROOTMANIFEST) $(ROOTMETHOD) $(PROG) : $$(POBJS) @@ -183,15 +180,9 @@ att2.c : att2.l att2.ed att1.c #$(ROOTDIRS): # $(INS.dir) -$(ROOTCROND)/% $(ROOTDEFAULT)/% : % - $(INS.file) - $(ROOTSYMLINK) : $(RM) $@; $(SYMLINK) $(SYMLNKDEST) $@ -$(ROOTSETUP) : $(ROOTDEFAULT)/cron.dfl - $(RM) $@; $(MV) $(ROOTDEFAULT)/cron.dfl $@ - check: $(CHKMANIFEST) $(POFILE): $(POFILES) diff --git a/usr/src/cmd/devfsadm/Makefile b/usr/src/cmd/devfsadm/Makefile index ebfc2c58fb..e6c3081194 100644 --- a/usr/src/cmd/devfsadm/Makefile +++ b/usr/src/cmd/devfsadm/Makefile @@ -22,16 +22,20 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 1998 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # cmd/devfsadm/Makefile # +DEFAULTFILES = devfsadm.dfl + +include ../Makefile.cmd + # # One for each ISA. # -SUBDIRS= $(MACH) +SUBDIRS = $(MACH) all := TARGET= all install := TARGET= install @@ -42,10 +46,11 @@ lint := TARGET= lint .KEEP_STATE: -all install clean clobber lint _msg: $(SUBDIRS) +all clean clobber lint _msg: $(SUBDIRS) + +install: $(SUBDIRS) $(ROOTETCDEFAULTFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) FRC: - diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com index 5df58289bc..4d7268b042 100644 --- a/usr/src/cmd/devfsadm/Makefile.com +++ b/usr/src/cmd/devfsadm/Makefile.com @@ -105,9 +105,6 @@ LINK_MODS = \ DEVLINKTAB = devlink.tab DEVLINKTAB_SRC = $(COMMON)/$(DEVLINKTAB).sh -DEVFSADM_DEFAULT = devfsadm -DEVFSADM_DEFAULT_SRC = $(COMMON)/devfsadm.dfl - COMPAT_LINKS = disks tapes ports audlinks devlinks drvconfig CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ @@ -134,9 +131,6 @@ POFILE = pdevfsadm.po ROOTLIB_DEVFSADM = $(ROOTLIB)/$(DEVFSADM_DIR) ROOTLIB_DEVFSADM_LINKMOD = $(ROOTLIB_DEVFSADM)/$(LINKMOD_DIR) -ETCDEFAULT = $(ROOTETC)/default -ETCDEFAULT_DEVFSADM = $(DEVFSADM_DEFAULT:%=$(ETCDEFAULT)/%) - ROOTLIB_DEVFSADM_LINK_MODS = $(LINK_MODS:%=$(ROOTLIB_DEVFSADM_LINKMOD)/%) ROOTUSRSBIN_COMPAT_LINKS = $(COMPAT_LINKS:%=$(ROOTUSRSBIN)/%) @@ -153,8 +147,6 @@ FILEMODE= 755 $(ROOTETC_DEVLINKTAB) := FILEMODE = 644 -$(ETCDEFAULT_DEVFSADM) := FILEMODE = 444 - all := TARGET= all install := TARGET= install clean := TARGET= clean @@ -174,8 +166,6 @@ install: all \ $(ROOTLIB_DEVFSADM_LINK_MODS) \ $(ROOTUSRINCLUDE) \ $(ROOTLIB_DEVFSADM_DAEMON) \ - $(ETCDEFAULT) \ - $(ETCDEFAULT_DEVFSADM) \ $(ROOTUSRSBIN_COMPAT_LINKS) @@ -213,16 +203,6 @@ $(DEVLINKTAB): $(DEVLINKTAB_SRC) $(RM) $(DEVLINKTAB) /bin/sh $(DEVLINKTAB_SRC) > $(DEVLINKTAB) -$(ETCDEFAULT)/%: % - $(RM) -r default - mkdir default - cp $(DEVFSADM_DEFAULT_SRC) default/$(DEVFSADM_DEFAULT) - cd default ; $(INS.file) - $(RM) -r default - -$(ETCDEFAULT): - $(INS.dir) - $(ROOTUSRSBIN): $(INS.dir) diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile index 1cbfb9cb3c..6e73bf7714 100644 --- a/usr/src/cmd/fs.d/Makefile +++ b/usr/src/cmd/fs.d/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -41,7 +41,7 @@ ROOTFS_PROG= mount umount XPG4PROG= df SPPROG= clri MNTTAB= mnttab -FSTYPE= fs +DEFAULTFILES= fs.dfl include ../Makefile.cmd @@ -79,7 +79,6 @@ ROOTUSRSBINF= $(USRSBINF:%=$(ROOTUSRSBIN)/%) ROOTUSRSBINCLRI= $(USRSBINCLRI:%=$(ROOTUSRSBIN)/%) ROOTUSRSBINFF= $(USRSBINFF:%=$(ROOTUSRSBIN)/%) ROOTETCMNTTAB= $(MNTTAB:%=$(ROOTETC)/%) -ROOTFSTYPE= $(ROOTETC)/default/$(FSTYPE) SYMETC2SBIN = $(ETC2SBIN:%=$(ROOTETC)/%) SYMETC2USRSBIN = $(ETC2USRSBIN:%=$(ROOTETC)/%) SYMUSRBIN2USRSBIN= $(USRBIN2USRSBIN:%=$(ROOTBIN)/%) @@ -96,7 +95,6 @@ $(SPPROG) := LDLIBS += -lcmd -lkstat $(ROOTETCMNTTAB) := FILEMODE = 444 $(ROOTETCMNTTAB) := OWNER = root $(ROOTETCMNTTAB) := GROUP = root -$(ROOTFSTYPE) := FILEMODE = 444 # for messaging catalog # @@ -131,7 +129,8 @@ _msg: $(I18NDIRS) $(POFILES1) $(POFILES_XPG4) $(RM) $(MSGDOMAIN)/$(POFILE) cp $(POFILE) $(MSGDOMAIN) -all_local: $(PROG) $(ROOTFS_PROG) $(XPG4PROG) $(SPPROG) $(MNTTAB) $(FSTYPE) +all_local: $(PROG) $(ROOTFS_PROG) $(XPG4PROG) $(SPPROG) $(MNTTAB) \ + $(DEFAULTFILES) ff volcopy: deffs.o $$(@F).o $(LINK.c) -o $@ $@.o deffs.o $(LDLIBS) @@ -160,13 +159,10 @@ $(SPPROG): switchout.o deffs.o fssnapsup.o install: $(FSLIB) .WAIT $(SUBDIRS) .WAIT install_local install_local: all_local $(ROOTSBINPROG) $(ROOTUSRSBINF) $(ROOTUSRSBINCLRI) \ - $(ROOTUSRSBINFF) $(ROOTETCMNTTAB) $(ROOTFSTYPE) \ + $(ROOTUSRSBINFF) $(ROOTETCMNTTAB) $(ROOTETCDEFAULTFILES) \ $(ROOTXPG4PROG) $(SYMETC2SBIN) $(SYMETC2USRSBIN) \ $(SYMUSRBIN2USRSBIN) $(SYMDEVNM) $(ROOTUSRSBINLINKS) -$(ROOTETC)/default/%:% - $(INS.file) - # Links from /etc to /sbin such as /etc/mount -> ../sbin/mount $(SYMETC2SBIN): -$(RM) $@; $(SYMLINK) ../sbin/$(@F) $@ @@ -194,8 +190,8 @@ $(ROOTUSRSBINCLRI): $(ROOTUSRSBIN)/clri $(MNTTAB): touch $(MNTTAB) -$(FSTYPE): - @$(RM) $@; $(ECHO) "LOCAL=ufs" >$@ +fs.dfl: + $(RM) $@; $(ECHO) "LOCAL=ufs" >$@ # Multiple names for ff (ncheck) $(ROOTUSRSBINFF): $(ROOTUSRSBIN)/ff @@ -208,7 +204,8 @@ clean_local: clobber: $(ALL_SUBDIRS) .WAIT clobber_local clobber_local: clean_local - $(RM) $(PROG) $(ROOTFS_PROG) $(SPPROG) $(MNTTAB) $(FSTYPE) $(CLOBBERFILES) + $(RM) $(PROG) $(ROOTFS_PROG) $(SPPROG) $(MNTTAB) $(DEFAULTFILES) \ + $(CLOBBERFILES) lint: diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile index 1a7ccc314f..41b7aea868 100644 --- a/usr/src/cmd/fs.d/autofs/Makefile +++ b/usr/src/cmd/fs.d/autofs/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -42,13 +42,13 @@ LINKVALUE= ../lib/fs/$(FSTYPE)/$(AUTO) MAPS= auto_master auto_home MAPINSTALL= $(MAPS:%=$(ROOTETC)/%) AUTOFS= autofs -AUTOFSINSTALL= $(AUTOFS:%=$(ROOTETC)/default/%) +DEFAULTFILES= autofs.dfl SMFMANIFEST= autofs.xml SMFMETHOD= svc-autofs MFSTINSTALL= $(SMFMANIFEST:%=$(ROOTSVCSYSTEM)/filesystem/%) METHODINSTALL= $(SMFMETHOD:%=$(ROOTLIBSVCMETHOD)/%) -OTHERINSTALL= $(MAPINSTALL) $(LINKINSTALL) $(AUTOFSINSTALL) \ +OTHERINSTALL= $(MAPINSTALL) $(LINKINSTALL) $(ROOTETCDEFAULTFILES) \ $(MFSTINSTALL) $(METHODINSTALL) UNCHECKED_HDRS= webnfs.h @@ -61,10 +61,6 @@ include ../Makefile.fstype $(MAPINSTALL) := OWNER= root $(MAPINSTALL) := FILEMODE= 0644 -$(AUTOFSINSTALL) := OWNER= root -$(AUTOFSINSTALL) := FILEMODE= 0444 -$(AUTOFSINSTALL) := GROUP= sys - $(MFSTINSTALL) := FILEMODE = 0444 REAL_COMMON= debug_alloc.o @@ -134,9 +130,6 @@ $(UNSHARE): $(UNSHAREOBJS) $(LINK.c) -o $@ $(UNSHAREOBJS) $(POST_PROCESS) -$(ROOTETC)/default/%:% - $(INS.file) - $(ROOTSVCSYSTEM)/filesystem/%: % $(INS.file) diff --git a/usr/src/cmd/fs.d/autofs/autofs b/usr/src/cmd/fs.d/autofs/autofs.dfl index f38be8f150..f38be8f150 100644 --- a/usr/src/cmd/fs.d/autofs/autofs +++ b/usr/src/cmd/fs.d/autofs/autofs.dfl diff --git a/usr/src/cmd/fs.d/nfs/etc/Makefile b/usr/src/cmd/fs.d/nfs/etc/Makefile index ac387873c3..a07bd86b81 100644 --- a/usr/src/cmd/fs.d/nfs/etc/Makefile +++ b/usr/src/cmd/fs.d/nfs/etc/Makefile @@ -22,24 +22,22 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +DEFAULTFILES = nfs.dfl include ../../../Makefile.cmd ETCNFS= $(ROOTETC)/nfs VARNFS= $(ROOT)/var/nfs -DEFNFS= $(ROOT)/default TXTS= nfssec.conf NFSTXTS= nfslog.conf -DEFTXTS= nfs V4SSDIR= $(VARNFS)/v4_state $(VARNFS)/v4_oldstate IETCFILES= $(TXTS:%=$(ROOTETC)/%) INFSETCFILES= $(NFSTXTS:%=$(ROOTETC)/nfs/%) -IDEFFILES= $(DEFTXTS:%=$(ROOTETC)/default/%) $(VARNFS) := GROUP = bin FILEMODE= 0644 @@ -49,9 +47,10 @@ GROUP= sys $(V4SSDIR) := GROUP = daemon $(V4SSDIR) := OWNER = daemon -all: $(TXTS) $(NFSTXTS) $(DEFTXTS) +all: $(TXTS) $(NFSTXTS) -install: all $(IETCFILES) $(ETCNFS) $(INFSETCFILES) $(VARNFS) $(V4SSDIR) $(IDEFFILES) +install: all $(IETCFILES) $(ETCNFS) $(INFSETCFILES) $(VARNFS) $(V4SSDIR) \ + $(IDEFFILES) $(ROOTETCDEFAULTFILES) $(ROOTETC)/%: % $(INS.file) @@ -68,11 +67,6 @@ $(VARNFS): $(V4SSDIR): $(INS.dir) -$(ROOTETC)/default/%: % - $(INS.file) - .KEEP_STATE: -FRC: - clean clobber lint: diff --git a/usr/src/cmd/fs.d/nfs/etc/nfs b/usr/src/cmd/fs.d/nfs/etc/nfs.dfl index 790ac32da1..790ac32da1 100644 --- a/usr/src/cmd/fs.d/nfs/etc/nfs +++ b/usr/src/cmd/fs.d/nfs/etc/nfs.dfl diff --git a/usr/src/cmd/fs.d/nfs/nfslog/Makefile b/usr/src/cmd/fs.d/nfs/nfslog/Makefile index 60bc12202b..54178a0000 100644 --- a/usr/src/cmd/fs.d/nfs/nfslog/Makefile +++ b/usr/src/cmd/fs.d/nfs/nfslog/Makefile @@ -22,7 +22,7 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # cmd/fs.d/nfs/nfslog/Makefile @@ -30,6 +30,7 @@ FSTYPE= nfs TYPEPROG= nfslogd ATTMK= $(TYPEPROG) +DEFAULTFILES= nfslogd.dfl include ../../Makefile.fstype @@ -57,20 +58,11 @@ $(POFILE): $(SRCS) sed "/^domain/d" messages.po > $@ $(RM) messages.po $(POFILE).i - -DFLTD= $(ROOTETC)/default -ETCDFLTPROG= $(TYPEPROG:%=$(DFLTD)/%) - -$(ETCDFLTPROG) := FILEMODE = $(LIBFILEMODE) - $(TYPEPROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) -$(DFLTD)/% : %.dfl - $(INS.rename) - -install: all $(ETCDFLTPROG) +install: all $(ROOTETCDEFAULTFILES) nfslog_config.o: ../lib/nfslog_config.c $(COMPILE.c) ../lib/nfslog_config.c diff --git a/usr/src/cmd/init/Makefile b/usr/src/cmd/init/Makefile index ab2868d3df..bb197d6d9d 100644 --- a/usr/src/cmd/init/Makefile +++ b/usr/src/cmd/init/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -29,10 +29,7 @@ PROG= init ROOTFS_PROG= $(PROG) -DFLTD= $(ROOTETC)/default - -ROOTDFLTPROG = $(PROG:%=$(DFLTD)/%) -$(ROOTDFLTPROG) := FILEMODE = $(LIBFILEMODE) +DEFAULTFILES= init.dfl include ../Makefile.cmd @@ -48,9 +45,9 @@ CLOBBERFILES= $(STATIC) .KEEP_STATE: -all: $(ROOTFS_PROG) $(PROG).dfl +all: $(ROOTFS_PROG) -install: all $(PROG).dfl $(ROOTDFLTPROG) $(ROOTSBINPROG) +install: all $(ROOTETCDEFAULTFILES) $(ROOTSBINPROG) $(RM) $(ROOTETCPROG) $(RM) $(ROOTUSRSBINPROG) $(RM) $(ROOTETC)/telinit @@ -60,9 +57,6 @@ install: all $(PROG).dfl $(ROOTDFLTPROG) $(ROOTSBINPROG) $(RM) $(ROOTETC)/TIMEZONE cd $(ROOTETC); $(SYMLINK) default/init TIMEZONE -$(DFLTD)/% : %.dfl - $(INS.rename) - test: rtest $(PROG) diff --git a/usr/src/cmd/kbd/Makefile b/usr/src/cmd/kbd/Makefile index a56829c72a..c4aab529d3 100644 --- a/usr/src/cmd/kbd/Makefile +++ b/usr/src/cmd/kbd/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -28,6 +28,7 @@ MANIFEST = keymap.xml SVCMETHOD = keymap +DEFAULTFILES = kbd.dfl include ../Makefile.cmd @@ -39,29 +40,13 @@ PROG = kbd CFLAGS += $(CCVERBOSE) LDLIBS += -lcmd -DFLTD = $(ROOTETC)/default -DDIRS = $(DFLTD) - -ETCDFLTPROG = $(PROG:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = 0444 -$(ETCDFLTPROG) := OWNER = root -$(ETCDFLTPROG) := GROUP = sys - $(ROOTMANIFEST) := FILEMODE = 0444 -all: $(PROG) $(PROG).dfl - -install: all $(DDIRS) $(ETCDFLTPROG) $(ROOTPROG) $(ROOTMANIFEST) \ - $(ROOTSVCMETHOD) - -$(DDIRS): - $(INS.dir) +all: $(PROG) -$(DFLTD)/% : %.dfl - $(INS.rename) +install: all $(ROOTETCDEFAULTFILES) $(ROOTPROG) $(ROOTMANIFEST) $(ROOTSVCMETHOD) clean: - $(RM) $(PROG) lint: lint_PROG diff --git a/usr/src/cmd/keyserv/Makefile b/usr/src/cmd/keyserv/Makefile index d546ea6e76..1507674b69 100644 --- a/usr/src/cmd/keyserv/Makefile +++ b/usr/src/cmd/keyserv/Makefile @@ -35,8 +35,7 @@ PROG= $(SBINPROG) $(BINPROG) HDRS= key_prot.h -DFLTD = $(ROOTETC)/default -ROOTKEYSERVDFLT = $(DFLTD)/keyserv +DEFAULTFILES = keyserv.dfl KEYSERVOBJS = keyserv.o KEYLOGOUTOBJS = keylogout.o @@ -103,9 +102,6 @@ keylogin: $(KEYLOGINOBJS) $(LINK.c) $(KEYLOGINOBJS) -o $@ $(LDLIBS) $(POST_PROCESS) -$(DFLTD)/%: %.dfl - $(INS.rename) - chkey: $(CHKEYOBJS) $(CHANGE_OBJS) $(LINK.c) $(CHANGE_OBJS) $(CHKEYOBJS) -o $@ $(LDLIBS) $(POST_PROCESS) @@ -126,7 +122,7 @@ domainname: $(DOMAINNAMEOBJS) selfcheck.o: ../fs.d/nfs/lib/selfcheck.c $(COMPILE.c) ../fs.d/nfs/lib/selfcheck.c -install: all $(DIRS) $(IBINPROG) $(ISBINPROG) $(ROOTKEYSERVDFLT) \ +install: all $(DIRS) $(IBINPROG) $(ISBINPROG) $(ROOTETCDEFAULTFILES) \ $(ROOTMANIFEST) clean: diff --git a/usr/src/cmd/login/Makefile b/usr/src/cmd/login/Makefile index 50308e6f81..22b7c9a796 100644 --- a/usr/src/cmd/login/Makefile +++ b/usr/src/cmd/login/Makefile @@ -22,7 +22,7 @@ # # ident "%Z%%M% %I% %E% SMI" # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -31,17 +31,14 @@ OBJS= login.o login_audit.o SRCS= $(OBJS:%.o=%.c) ONC_SRCS=$(SRCS:%.c=%.c_onc_plus) +DEFAULTFILES= login.dfl + include ../Makefile.cmd -DFLTD= $(ROOTETC)/default -DIRS= $(DFLTD) LOGINDEVPERM= logindevperm LOGINDEVPERMSRC= $(LOGINDEVPERM).sh ROOTLOGINDEVPERM= $(LOGINDEVPERM:%=$(ROOTETC)/%) -ETCDFLTPROG = $(PROG:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = $(LIBFILEMODE) -$(ETCDFLTPROG) := GROUP = sys $(ROOTLOGINDEVPERM) := FILEMODE = 644 $(ROOTLOGINDEVPERM) := GROUP = sys FILEMODE= 4555 @@ -58,7 +55,7 @@ CFLAGS += $(CCVERBOSE) .KEEP_STATE: -all: $(PROG) $(PROG).dfl $(ROOTLOGINDEVPERM) +all: $(PROG) $(ROOTLOGINDEVPERM) $(LOGINDEVPERM): $(LOGINDEVPERMSRC) $(RM) $(LOGINDEVPERM) @@ -68,17 +65,7 @@ $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) -install: all $(DIRS) $(ROOTPROG) $(PROG).dfl $(ETCDFLTPROG) $(ROOTLOGINDEVPERM) - -$(DIRS): - $(INS.dir) - -$(DFLTD)/% : % - $(MV) $(PROG) $(PROG).save - $(LN) $(PROG).dfl $(PROG) - $(INS.file) - $(RM) $(PROG) - $(MV) $(PROG).save $(PROG) +install: all $(DIRS) $(ROOTPROG) $(ROOTETCDEFAULTFILES) $(ROOTLOGINDEVPERM) clean: $(RM) $(OBJS) diff --git a/usr/src/cmd/lvm/metassist/Makefile.targ b/usr/src/cmd/lvm/metassist/Makefile.targ index 41c91e587c..c57591037c 100644 --- a/usr/src/cmd/lvm/metassist/Makefile.targ +++ b/usr/src/cmd/lvm/metassist/Makefile.targ @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -87,15 +87,6 @@ $(ROOTXMLSTYLEFILES) := FILEMODE = 0444 $(ROOTXMLSTYLE)/%: % $(INS.file) -# Rule/definitions for /etc/default -ROOTETCDEFAULTFILES= $(DEFAULTFILES:%=$(ROOTETCDEFAULT)/%) -$(ROOTETCDEFAULTFILES) := OWNER = root -$(ROOTETCDEFAULTFILES) := GROUP = sys -$(ROOTETCDEFAULTFILES) := FILEMODE = 0644 - -$(ROOTETCDEFAULT)/%: % - $(INS.file) - # Install recursively install: all .WAIT \ ${SUBDIRS} \ diff --git a/usr/src/cmd/lvm/metassist/sysfiles/Makefile b/usr/src/cmd/lvm/metassist/sysfiles/Makefile index 13a60dcf9c..c6b297cecb 100644 --- a/usr/src/cmd/lvm/metassist/sysfiles/Makefile +++ b/usr/src/cmd/lvm/metassist/sysfiles/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -28,13 +28,13 @@ METASSIST_TOPLEVEL = .. +# Files to be copied to /etc/default +DEFAULTFILES = \ + metassist.xml.dfl + include $(METASSIST_TOPLEVEL)/../../Makefile.cmd include $(METASSIST_TOPLEVEL)/Makefile.env -# Files to be copied to /etc/defaults -DEFAULTFILES = \ - metassist.xml - # Files to be copied to /usr/share/lib/xml/dtd DTDFILES = \ volume-config.dtd \ diff --git a/usr/src/cmd/lvm/metassist/sysfiles/metassist.xml b/usr/src/cmd/lvm/metassist/sysfiles/metassist.xml.dfl index 3fae198174..3fae198174 100644 --- a/usr/src/cmd/lvm/metassist/sysfiles/metassist.xml +++ b/usr/src/cmd/lvm/metassist/sysfiles/metassist.xml.dfl diff --git a/usr/src/cmd/netfiles/Makefile b/usr/src/cmd/netfiles/Makefile index a3a610fbbc..6e7e66f805 100644 --- a/usr/src/cmd/netfiles/Makefile +++ b/usr/src/cmd/netfiles/Makefile @@ -22,18 +22,18 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 1991-2000 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # TXTS= nsswitch.conf netconfig hosts services +DEFAULTFILES= nss.dfl include ../Makefile.cmd FILES= hosts services ETCFILES= netconfig nsswitch.conf nsswitch.files nsswitch.nis nsswitch.nisplus \ nsswitch.dns nsswitch.ldap -ETCDEFAULTFILES= nss ROOTNET= $(ROOTETC)/net TICLTS= $(ROOTNET)/ticlts @@ -49,14 +49,13 @@ ROOTDIRS= \ ITICLTSFILES= $(FILES:%=$(TICLTS)/%) ITICOTSFILES= $(FILES:%=$(TICOTS)/%) ITICOTSORDFILES= $(FILES:%=$(TICOTSORD)/%) -IETCFILES= $(ETCFILES:%=$(ROOTETC)/%) -IETCDEFAULTFILES= $(ETCDEFAULTFILES:%=$(ROOTETC)/default/%) +IETCFILES= $(ETCFILES:%=$(ROOTETC)/%) FILEMODE= 0644 OWNER= root GROUP= sys -$(TICLTS)/% $(TICOTS)/% $(TICOTSORD)/% $(ROOTETC)/% $(ROOTETC)/default/%: % +$(TICLTS)/% $(TICOTS)/% $(TICOTSORD)/% $(ROOTETC)/%: % $(INS.file) .KEEP_STATE: @@ -64,7 +63,7 @@ $(TICLTS)/% $(TICOTS)/% $(TICOTSORD)/% $(ROOTETC)/% $(ROOTETC)/default/%: % all: $(TXTS) install: all $(ROOTDIRS) $(ITICLTSFILES) $(ITICOTSFILES) $(ITICOTSORDFILES) \ - $(IETCFILES) $(IETCDEFAULTFILES) + $(IETCFILES) $(ROOTETCDEFAULTFILES) $(ROOTDIRS): $(INS.dir) diff --git a/usr/src/cmd/netfiles/nss b/usr/src/cmd/netfiles/nss.dfl index 65b401c07b..65b401c07b 100644 --- a/usr/src/cmd/netfiles/nss +++ b/usr/src/cmd/netfiles/nss.dfl diff --git a/usr/src/cmd/passwd/Makefile b/usr/src/cmd/passwd/Makefile index e0d7559cc8..e3e178e8bd 100644 --- a/usr/src/cmd/passwd/Makefile +++ b/usr/src/cmd/passwd/Makefile @@ -20,21 +20,17 @@ # CDDL HEADER END # # -# Copyright 2001-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # PROG= passwd +DEFAULTFILES= passwd.dfl include ../Makefile.cmd -DFLTD= $(ROOTETC)/default -DIRS= $(DFLTD) - -ETCDFLTPROG = $(PROG:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = $(LIBFILEMODE) passwd := LDLIBS += $(ROOT)/usr/lib/passwdutil.so.1 lint := LDLIBS += -lpasswdutil LDLIBS += -lbsm -lpam -lnsl @@ -48,17 +44,7 @@ XGETFLAGS += -a -x $(PROG).xcl all: $(PROG) -install: all $(DIRS) $(ROOTPROG) $(PROG).dfl $(ETCDFLTPROG) - -$(DIRS): - $(INS.dir) - -$(DFLTD)/% : % - $(MV) $(PROG) $(PROG).save - $(LN) $(PROG).dfl $(PROG) - $(INS.file) - $(RM) $(PROG) - $(MV) $(PROG).save $(PROG) +install: all $(ROOTPROG) $(ROOTETCDEFAULTFILES) clean: diff --git a/usr/src/cmd/power/Makefile b/usr/src/cmd/power/Makefile index 36f2fd034b..e74f68c66b 100644 --- a/usr/src/cmd/power/Makefile +++ b/usr/src/cmd/power/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -42,6 +42,7 @@ SYSIDPM = sysidpm PROG = $(DAEMON) $(PMCFG) $(SYSIDPM) ETCFILES = power.conf POWERPERM = power +DEFAULTFILES = power.dfl include ../Makefile.cmd @@ -79,12 +80,8 @@ $(ROOTLIBPOWER) := FILEMODE= 755 $(ROOTLIBPOWERDAEMON) := GROUP= bin $(ROOTLIBPOWERDAEMON) := FILEMODE= 555 -ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%) -$(ROOTETCFILES) := FILEMODE= 644 - -DFLTD= $(ROOTETC)/default -ROOTDFLFILES= $(POWERPERM:%=$(DFLTD)/%) -$(ROOTDFLFILES) := FILEMODE= 444 +ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%) +$(ROOTETCFILES) := FILEMODE= 644 ROOTUSRSBINSYSIDPM= $(SYSIDPM:%=$(ROOTUSRSBIN)/%) $(ROOTUSRSBINSYSIDPM) := FILEMODE= 755 @@ -124,12 +121,9 @@ $(ROOTLIBSVCMETHOD)/svc-power := GROUP = bin $(ROOTLIBSVCMETHOD)/svc-power := FILEMODE = 0555 install: all $(ROOTUSRSBINPMCFG) $(ROOTLIBPOWERDAEMON) \ - $(ROOTETCFILES) $(ROOTUSRSBINSYSIDPM) $(ROOTDFLFILES) \ + $(ROOTETCFILES) $(ROOTUSRSBINSYSIDPM) $(ROOTETCDEFAULTFILES) \ $(ROOTMANIFEST) $(ROOTMETHOD) -$(DFLTD)/%: %.dfl - $(INS.rename) - $(ROOTLIBPOWER): $(INS.dir) diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile b/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile index 9f49a14ed9..ec4b3ac249 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile @@ -19,43 +19,28 @@ # # CDDL HEADER END # -#pragma ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # cmd/rpcsvc/nis/rpc.nisd/configs/Makefile -ETCDEFAULTFILES= rpc.nisd -VARNISFILES= NIS+LDAPmapping.template +DEFAULTFILES= rpc.nisd.dfl +VARNISFILES= NIS+LDAPmapping.template include $(SRC)/cmd/Makefile.cmd ROOTVARNIS= $(ROOT)/var/nis ROOTVARNISFILES= $(VARNISFILES:%=$(ROOTVARNIS)/%) -ROOTETCDEFAULTFILES= $(ETCDEFAULTFILES:%=$(ROOTETC)/default/%) FILEMODE= 644 OWNER= root GROUP= sys -all: FRC +all clean clobber lint: -install: all $(ROOTDIRS) $(ROOTETCDEFAULTFILES) $(ROOTVARNISFILES) - -$(ROOTDIRS): - $(INS.dir) - -clean: FRC - -clobber: FRC - -lint: FRC +install: all $(ROOTETCDEFAULTFILES) $(ROOTVARNISFILES) $(ROOTVARNIS)/NIS+LDAPmapping.template: NIS+LDAPmapping.template $(INS.file) NIS+LDAPmapping.template - -$(ROOTETC)/default/rpc.nisd: rpc.nisd - $(INS.file) rpc.nisd - -FRC: diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/rpc.nisd b/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/rpc.nisd.dfl index 7bd0c1f184..7bd0c1f184 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/rpc.nisd +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/rpc.nisd.dfl 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); \ diff --git a/usr/src/cmd/syslogd/Makefile b/usr/src/cmd/syslogd/Makefile index 577a43398e..fc546d477e 100644 --- a/usr/src/cmd/syslogd/Makefile +++ b/usr/src/cmd/syslogd/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -31,6 +31,7 @@ PROG= syslogd MANIFEST= system-log.xml SVCMETHOD= system-log +DEFAULTFILES= syslogd.dfl include ../Makefile.cmd @@ -48,11 +49,9 @@ $(ROOTMANIFEST) := FILEMODE = 0444 .KEEP_STATE: -all: $(SUBDIRS) +all clean clobber lint: $(SUBDIRS) -clean clobber lint: $(SUBDIRS) - -install: $(ROOTMANIFEST) $(ROOTSVCMETHOD) $(SUBDIRS) +install: $(ROOTMANIFEST) $(ROOTSVCMETHOD) $(ROOTETCDEFAULTFILES) $(SUBDIRS) check: $(CHKMANIFEST) diff --git a/usr/src/cmd/syslogd/Makefile.com b/usr/src/cmd/syslogd/Makefile.com index 8ef3ed5a24..275796b9b2 100644 --- a/usr/src/cmd/syslogd/Makefile.com +++ b/usr/src/cmd/syslogd/Makefile.com @@ -49,10 +49,7 @@ ROOTVARLOGD= $(ROOT)/var/log OWNER= root GROUP= sys -DFLTD= $(ROOTETC)/default - ROOTETCCONFIG= $(CONFIGFILE:%=$(ROOTETC)/%) -ROOTETCDFLT= $(PROG:%=$(DFLTD)/%) ROOTLIBROTATE= $(ROTATESCRIPT:%=$(ROOTLIB)/%) ROOTVARSYSLOG= $(VARSYSLOG:%=$(ROOTVARLOGD)/%) ROOTVARAUTHLOG= $(VARAUTHLOG:%=$(ROOTVARLOGD)/%) @@ -62,7 +59,6 @@ $(ROOTUSRLIBROTATE) := FILEMODE = 0555 $(ROOTETCCONFIG) := FILEMODE = 0644 $(ROOTVARSYSLOG) := FILEMODE = 0644 $(ROOTVARAUTHLOG) := FILEMODE = 0600 -$(ROOTETCDFLT) := FILEMODE = 0444 $(ROOTVARLOGD)/% : % $(INS.file) @@ -73,9 +69,6 @@ $(ROOTETC)/%: ../% $(ROOTLIB)/%: ../% $(INS.file) -$(DFLTD)/%: ../%.dfl - $(INS.rename) - .KEEP_STATE: .SUFFIXES: $(SUFFIXES) .ll diff --git a/usr/src/cmd/syslogd/i386/Makefile b/usr/src/cmd/syslogd/i386/Makefile index d22fbe3201..fb447ff91d 100644 --- a/usr/src/cmd/syslogd/i386/Makefile +++ b/usr/src/cmd/syslogd/i386/Makefile @@ -21,8 +21,8 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 1997, 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # # cmd/syslogd/i386/Makefile @@ -31,5 +31,4 @@ include ../Makefile.com all: $(PROG) $(VARSYSLOG) $(VARAUTHLOG) -install: all $(ROOTUSRSBINPROG) $(ROOTETCDFLT) $(ROOTETCCONFIG) \ - $(ROOTLIBROTATE) logfiles +install: all $(ROOTUSRSBINPROG) $(ROOTETCCONFIG) $(ROOTLIBROTATE) logfiles diff --git a/usr/src/cmd/syslogd/sparc/Makefile b/usr/src/cmd/syslogd/sparc/Makefile index 9b1bc3c1da..39fd2c2015 100644 --- a/usr/src/cmd/syslogd/sparc/Makefile +++ b/usr/src/cmd/syslogd/sparc/Makefile @@ -21,8 +21,8 @@ # #ident "%Z%%M% %I% %E% SMI" # -# Copyright (c) 1997, 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # # cmd/syslogd/sparc/Makefile @@ -31,5 +31,4 @@ include ../Makefile.com all: $(PROG) $(VARSYSLOG) $(VARAUTHLOG) -install: all $(ROOTUSRSBINPROG) $(ROOTETCDFLT) $(ROOTETCCONFIG) \ - $(ROOTLIBROTATE) logfiles +install: all $(ROOTUSRSBINPROG) $(ROOTETCCONFIG) $(ROOTLIBROTATE) logfiles diff --git a/usr/src/cmd/tar/Makefile b/usr/src/cmd/tar/Makefile index 18effe186d..03d0abbd72 100644 --- a/usr/src/cmd/tar/Makefile +++ b/usr/src/cmd/tar/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -28,16 +28,13 @@ # cmd/tar/Makefile PROG= tar +DEFAULTFILES= tar.dfl include ../Makefile.cmd CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../lib/libcmd/inc -SED= sed DCFILE= $(PROG).dc -DFLTD= $(ROOTETC)/default -DIRS= $(DFLTD) - LDLIBS += -lcmd -lsec CFLAGS += $(CCVERBOSE) @@ -49,34 +46,19 @@ CPPFLAGS += -DEUC ROOTSYMLINK= $(ROOTPROG) -ETCDFLTPROG = $(PROG:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = $(LIBFILEMODE) -$(ETCDFLTPROG) := OWNER = root -$(ETCDFLTPROG) := GROUP = sys - XGETFLAGS += -a -x tar.xcl .KEEP_STATE: -all: $(PROG) $(PROG).dfl +all: $(PROG) -install: all $(DIRS) $(ROOTUSRSBINPROG) $(ETCDFLTPROG) $(ROOTSYMLINK) +install: all $(ROOTUSRSBINPROG) $(ROOTETCDEFAULTFILES) $(ROOTSYMLINK) -$(RM) -r $(ROOTETCPROG) -$(SYMLINK) ../usr/sbin/$(PROG) $(ROOTETCPROG) $(ROOTSYMLINK): $(RM) $@; $(SYMLINK) ../sbin/$(PROG) $@ -$(DIRS): - $(INS.dir) - -$(DFLTD)/% : % - $(MV) $(PROG) $(PROG).save - $(LN) $(PROG).dfl $(PROG) - $(INS.file) - $(RM) $(PROG) - $(MV) $(PROG).save $(PROG) - clean: lint: lint_PROG diff --git a/usr/src/cmd/utmpd/Makefile b/usr/src/cmd/utmpd/Makefile index c5b72fd485..74b2cbe53f 100644 --- a/usr/src/cmd/utmpd/Makefile +++ b/usr/src/cmd/utmpd/Makefile @@ -20,27 +20,21 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" # PROG= utmpd +DEFAULTFILES= utmpd.dfl include ../Makefile.cmd -DFLTD= $(ROOTETC)/default -DIRS= $(DFLTD) - MANIFEST = utmp.xml ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) SVCMETHOD = svc-utmpd -ETCDFLTPROG = $(PROG:%=$(DFLTD)/%) -$(ETCDFLTPROG) := FILEMODE = $(LIBFILEMODE) -$(ETCDFLTPROG) := GROUP = sys - FILEMODE = 555 OWNER = root GROUP = bin @@ -53,16 +47,9 @@ $(ROOTMANIFEST) := GROUP = sys all: $(PROG) -install: all $(DIRS) $(ROOTLIBPROG) $(PROG).dfl $(ETCDFLTPROG) $(ROOTMANIFEST) \ +install: all $(DIRS) $(ROOTLIBPROG) $(ROOTETCDEFAULTFILES) $(ROOTMANIFEST) \ $(ROOTSVCMETHOD) -$(DFLTD)/% : % - $(MV) $(PROG) $(PROG).save - $(LN) $(PROG).dfl $(PROG) - $(INS.file) - $(RM) $(PROG) - $(MV) $(PROG).save $(PROG) - check: $(CHKMANIFEST) clean: diff --git a/usr/src/cmd/ypcmd/yppasswd/Makefile b/usr/src/cmd/ypcmd/yppasswd/Makefile index 0acfff4fc6..58e84fc30a 100644 --- a/usr/src/cmd/ypcmd/yppasswd/Makefile +++ b/usr/src/cmd/ypcmd/yppasswd/Makefile @@ -20,14 +20,14 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # NETYPPROG = rpc.yppasswdd # pwconv passmgmt -DFLTSRC = yppasswdd.dfl +DEFAULTFILES = yppasswdd.dfl PROG = $(NETYPPROG) MANIFEST = passwd.xml @@ -40,8 +40,7 @@ ROOTMANIFESTDIR = $(ROOTSVCNETWORKNIS) RPCSVC= $(ROOT)/usr/include/rpcsvc NETSVC = $(ROOTLIB)/netsvc NETYP = $(NETSVC)/yp -DFLTDIR = $(ROOTETC)/default -ROOTDIRS = $(NETSVC) $(NETYP) $(ROOTETC) $(DFLTDIR) +ROOTDIRS = $(NETSVC) $(NETYP) # include library definitions #LDLIBS += -lrpcsvc -lnsl -lcrypt -lintl -lgen @@ -55,7 +54,6 @@ CPPFLAGS += -I$(SRC)/lib/libnisdb/yptol #IHDRFILE= $(HDRFILE:%=$(RPCSVC)/%) INETYPPROG= $(NETYPPROG:%=$(NETYP)/%) -ETCDFLTFILE= $(NETYPPROG:rpc.%=$(DFLTDIR)/%) COMMONOBJ = yppasswdxdr.o yplckpwdf.o RPCYPPASSWDDOBJ = yppasswdd.o changepasswd.o @@ -93,7 +91,7 @@ rpc.yppasswdd: $(RPCYPPASSWDDOBJ) $(COMMONOBJ) $(SHAREDOBJ) $(COMMONOBJ) $(LDLIBS) $(POST_PROCESS) -install: all $(ROOTDIRS) $(IBINPROG) $(INETYPPROG) $(ETCDFLTFILE) \ +install: all $(ROOTDIRS) $(IBINPROG) $(INETYPPROG) $(ROOTETCDEFAULTFILES) \ $(ROOTMANIFEST) $(ROOTDIRS): @@ -102,9 +100,6 @@ $(ROOTDIRS): $(NETYP)/%: % $(INS.file) -$(DFLTDIR)/% : %.dfl - $(INS.rename) - clean: $(RM) $(OBJS) |