diff options
| -rw-r--r-- | deleted_files/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c (renamed from usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/cmd/cmd-inet/usr.sbin/tname.xml (renamed from usr/src/cmd/cmd-inet/usr.sbin/tname.xml) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamd/Makefile (renamed from usr/src/pkgdefs/SUNWtnamd/Makefile) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamd/depend (renamed from usr/src/pkgdefs/SUNWtnamd/depend) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl (renamed from usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_com (renamed from usr/src/pkgdefs/SUNWtnamd/prototype_com) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_i386 (renamed from usr/src/pkgdefs/SUNWtnamd/prototype_i386) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_sparc (renamed from usr/src/pkgdefs/SUNWtnamd/prototype_sparc) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamr/Makefile (renamed from usr/src/pkgdefs/SUNWtnamr/Makefile) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl (renamed from usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_com (renamed from usr/src/pkgdefs/SUNWtnamr/prototype_com) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_i386 (renamed from usr/src/pkgdefs/SUNWtnamr/prototype_i386) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_sparc (renamed from usr/src/pkgdefs/SUNWtnamr/prototype_sparc) | 0 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.sbin/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/pkgdefs/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWcsr/postinstall | 11 | ||||
| -rw-r--r-- | usr/src/tools/scripts/bfu.sh | 1 |
17 files changed, 17 insertions, 7 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c b/deleted_files/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c index 229f33bf8f..229f33bf8f 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c +++ b/deleted_files/usr/src/cmd/cmd-inet/usr.sbin/in.tnamed.c diff --git a/usr/src/cmd/cmd-inet/usr.sbin/tname.xml b/deleted_files/usr/src/cmd/cmd-inet/usr.sbin/tname.xml index 6fb81def92..6fb81def92 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/tname.xml +++ b/deleted_files/usr/src/cmd/cmd-inet/usr.sbin/tname.xml diff --git a/usr/src/pkgdefs/SUNWtnamd/Makefile b/deleted_files/usr/src/pkgdefs/SUNWtnamd/Makefile index 647da669ec..647da669ec 100644 --- a/usr/src/pkgdefs/SUNWtnamd/Makefile +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamd/Makefile diff --git a/usr/src/pkgdefs/SUNWtnamd/depend b/deleted_files/usr/src/pkgdefs/SUNWtnamd/depend index b02f35bd15..b02f35bd15 100644 --- a/usr/src/pkgdefs/SUNWtnamd/depend +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamd/depend diff --git a/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl b/deleted_files/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl index b28c533836..b28c533836 100644 --- a/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamd/pkginfo.tmpl diff --git a/usr/src/pkgdefs/SUNWtnamd/prototype_com b/deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_com index 7c78783408..7c78783408 100644 --- a/usr/src/pkgdefs/SUNWtnamd/prototype_com +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_com diff --git a/usr/src/pkgdefs/SUNWtnamd/prototype_i386 b/deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_i386 index cb94f63159..cb94f63159 100644 --- a/usr/src/pkgdefs/SUNWtnamd/prototype_i386 +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_i386 diff --git a/usr/src/pkgdefs/SUNWtnamd/prototype_sparc b/deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_sparc index 454918b07a..454918b07a 100644 --- a/usr/src/pkgdefs/SUNWtnamd/prototype_sparc +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamd/prototype_sparc diff --git a/usr/src/pkgdefs/SUNWtnamr/Makefile b/deleted_files/usr/src/pkgdefs/SUNWtnamr/Makefile index 3244add378..3244add378 100644 --- a/usr/src/pkgdefs/SUNWtnamr/Makefile +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamr/Makefile diff --git a/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl b/deleted_files/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl index 9f6b839033..9f6b839033 100644 --- a/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamr/pkginfo.tmpl diff --git a/usr/src/pkgdefs/SUNWtnamr/prototype_com b/deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_com index 0afcaa03b7..0afcaa03b7 100644 --- a/usr/src/pkgdefs/SUNWtnamr/prototype_com +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_com diff --git a/usr/src/pkgdefs/SUNWtnamr/prototype_i386 b/deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_i386 index 24b256be40..24b256be40 100644 --- a/usr/src/pkgdefs/SUNWtnamr/prototype_i386 +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_i386 diff --git a/usr/src/pkgdefs/SUNWtnamr/prototype_sparc b/deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_sparc index e0d1c32387..e0d1c32387 100644 --- a/usr/src/pkgdefs/SUNWtnamr/prototype_sparc +++ b/deleted_files/usr/src/pkgdefs/SUNWtnamr/prototype_sparc diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile index 431d407e70..2d14d3751e 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -34,12 +34,12 @@ XMODPROG= wanbootutil PROG= 6to4relay arp gettable if_mpadm ikeadm ikecert \ in.comsat in.fingerd in.rarpd in.rexecd in.rlogind \ - in.rshd in.rwhod in.telnetd in.tftpd in.tnamed ipaddrsel \ + in.rshd in.rwhod in.telnetd in.tftpd ipaddrsel \ ipsecalgs ipsecconf ipseckey ndd $(SYNCPROG) $(DHCPPROG) \ $(XMODPROG) MANIFEST= rarp.xml telnet.xml comsat.xml finger.xml \ - login.xml shell.xml rexec.xml tname.xml + login.xml shell.xml rexec.xml ROOTFS_PROG= hostconfig route soconfig SBINLINKS= hostconfig route @@ -49,11 +49,11 @@ AUDITPROG= in.rexecd in.rlogind in.rshd in.telnetd PAMPROG= in.rexecd in.rlogind in.rshd in.telnetd SOCKETPROG= 6to4relay arp gettable hostconfig if_mpadm in.comsat \ in.fingerd in.rarpd in.rexecd in.rlogind in.rshd \ - in.rwhod in.telnetd in.tftpd in.tnamed ipaddrsel \ + in.rwhod in.telnetd in.tftpd ipaddrsel \ ipsecalgs ipsecconf ipseckey route NSLPROG= 6to4relay arp gettable hostconfig ikeadm in.comsat in.rarpd \ in.rexecd in.rlogind in.rshd in.rwhod in.telnetd \ - in.tftpd in.tnamed ipaddrsel ipsecalgs ipsecconf ipseckey route + in.tftpd ipaddrsel ipsecalgs ipsecconf ipseckey route CMDPROG= in.telnetd IPSECUTILPROG= ikeadm ipsecalgs ipsecconf ipseckey K5PROGS= in.telnetd in.rlogind in.rshd diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile index b8db5ef4c9..35d1ffee7c 100644 --- a/usr/src/pkgdefs/Makefile +++ b/usr/src/pkgdefs/Makefile @@ -359,8 +359,6 @@ COMMON_SUBDIRS= \ SUNWter \ SUNWtftpr \ SUNWtftp \ - SUNWtnamr \ - SUNWtnamd \ SUNWtnetc \ SUNWtnetr \ SUNWtnetd \ diff --git a/usr/src/pkgdefs/SUNWcsr/postinstall b/usr/src/pkgdefs/SUNWcsr/postinstall index 8faff6e48f..5bbdd97e7d 100644 --- a/usr/src/pkgdefs/SUNWcsr/postinstall +++ b/usr/src/pkgdefs/SUNWcsr/postinstall @@ -103,6 +103,17 @@ cat >> $BASEDIR/var/svc/profile/upgrade <<\_DEL_BIND8 _DEL_BIND8 # +# Get rid of obsolete DARPA trivial name server (Death to IEN-116!) +# +cat >> $BASEDIR/var/svc/profile/upgrade <<\_DEL_TNAME + svcs svc:/network/tname > /dev/null 2>&1 + if [ "$?" = 0 ]; then + svcadm disable -s svc:/network/tname + svccfg delete svc:/network/tname + fi +_DEL_TNAME + +# # Remove stale GLD services # SVCCFG_REPOSITORY=$PKG_INSTALL_ROOT/etc/svc/repository.db diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh index 3887a7e754..069b00606f 100644 --- a/usr/src/tools/scripts/bfu.sh +++ b/usr/src/tools/scripts/bfu.sh @@ -1052,6 +1052,7 @@ smf_obsolete_manifests=" var/svc/manifest/system/filesystem/volfs.xml var/svc/manifest/network/pfil.xml var/svc/manifest/platform/sun4u/mpxio-upgrade.xml + var/svc/manifest/network/tname.xml " # smf services whose manifests have been renamed |