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/syslogd | |
| 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/syslogd')
| -rw-r--r-- | usr/src/cmd/syslogd/Makefile | 9 | ||||
| -rw-r--r-- | usr/src/cmd/syslogd/Makefile.com | 7 | ||||
| -rw-r--r-- | usr/src/cmd/syslogd/i386/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/cmd/syslogd/sparc/Makefile | 7 |
4 files changed, 10 insertions, 20 deletions
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 |