6742409 Patch 138048-xx replaces nxge.conf, removing existing configuration

12 files changed, 21 insertions, 33 deletions

diff --git a/usr/src/pkgdefs/SUNWnxge.u/Makefile b/usr/src/pkgdefs/SUNWnxge.u/Makefile
index 71b302a489..5cd1b848a8 100644
--- a/usr/src/pkgdefs/SUNWnxge.u/Makefile
+++ b/usr/src/pkgdefs/SUNWnxge.u/Makefile
@@ -19,15 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
-DATAFILES += depend i.renameold
+DATAFILES += depend i.renamenew
 
 .KEEP_STATE:
 
diff --git a/usr/src/pkgdefs/SUNWnxge.u/pkginfo.tmpl b/usr/src/pkgdefs/SUNWnxge.u/pkginfo.tmpl
index ea65126045..fb6631b38c 100644
--- a/usr/src/pkgdefs/SUNWnxge.u/pkginfo.tmpl
+++ b/usr/src/pkgdefs/SUNWnxge.u/pkginfo.tmpl
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -43,7 +42,7 @@ DESC="Sun NIU 10Gb/1Gb driver"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
-CLASSES="none renameold"
+CLASSES="none renamenew"
 BASEDIR=/
 SUNW_PKGVERS="1.0"
 
diff --git a/usr/src/pkgdefs/SUNWnxge.u/prototype_com b/usr/src/pkgdefs/SUNWnxge.u/prototype_com
index b432867c8d..5bbf84f152 100644
--- a/usr/src/pkgdefs/SUNWnxge.u/prototype_com
+++ b/usr/src/pkgdefs/SUNWnxge.u/prototype_com
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -40,7 +39,7 @@ i copyright
 i depend
 i postinstall
 i postremove
-i i.renameold
+i i.renamenew
 #
 # source locations relative to the prototype file
 #
diff --git a/usr/src/pkgdefs/SUNWnxge.u/prototype_sparc b/usr/src/pkgdefs/SUNWnxge.u/prototype_sparc
index 01cb0882df..1e5265e9f7 100644
--- a/usr/src/pkgdefs/SUNWnxge.u/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWnxge.u/prototype_sparc
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -53,6 +52,6 @@ d none platform 755 root sys
 d none platform/sun4u 755 root sys
 d none platform/sun4u/kernel 755 root sys
 d none platform/sun4u/kernel/drv 755 root sys
-e renameold platform/sun4u/kernel/drv/nxge.conf 0644 root sys
+e renamenew platform/sun4u/kernel/drv/nxge.conf 0644 root sys
 d none platform/sun4u/kernel/drv/sparcv9 755 root sys
 f none platform/sun4u/kernel/drv/sparcv9/nxge 755 root sys
diff --git a/usr/src/pkgdefs/SUNWnxge.v/Makefile b/usr/src/pkgdefs/SUNWnxge.v/Makefile
index 71b302a489..5cd1b848a8 100644
--- a/usr/src/pkgdefs/SUNWnxge.v/Makefile
+++ b/usr/src/pkgdefs/SUNWnxge.v/Makefile
@@ -19,15 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
-DATAFILES += depend i.renameold
+DATAFILES += depend i.renamenew
 
 .KEEP_STATE:
 
diff --git a/usr/src/pkgdefs/SUNWnxge.v/pkginfo.tmpl b/usr/src/pkgdefs/SUNWnxge.v/pkginfo.tmpl
index 80b94e3b80..c340a71738 100644
--- a/usr/src/pkgdefs/SUNWnxge.v/pkginfo.tmpl
+++ b/usr/src/pkgdefs/SUNWnxge.v/pkginfo.tmpl
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -43,7 +42,7 @@ DESC="Sun NIU leaf driver"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
-CLASSES="none renameold"
+CLASSES="none renamenew"
 BASEDIR=/
 SUNW_PKGVERS="1.0"
 
diff --git a/usr/src/pkgdefs/SUNWnxge.v/prototype_com b/usr/src/pkgdefs/SUNWnxge.v/prototype_com
index 7cf716dbc2..c038c28f06 100644
--- a/usr/src/pkgdefs/SUNWnxge.v/prototype_com
+++ b/usr/src/pkgdefs/SUNWnxge.v/prototype_com
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -40,7 +39,7 @@ i copyright
 i depend
 i postinstall
 i postremove
-i i.renameold
+i i.renamenew
 #
 # source locations relative to the prototype file
 #
diff --git a/usr/src/pkgdefs/SUNWnxge.v/prototype_sparc b/usr/src/pkgdefs/SUNWnxge.v/prototype_sparc
index f3ac73dba6..8774331ae3 100644
--- a/usr/src/pkgdefs/SUNWnxge.v/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWnxge.v/prototype_sparc
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -53,6 +52,6 @@ d none platform 755 root sys
 d none platform/sun4v 755 root sys
 d none platform/sun4v/kernel 755 root sys
 d none platform/sun4v/kernel/drv 755 root sys
-e renameold platform/sun4v/kernel/drv/nxge.conf 0644 root sys
+e renamenew platform/sun4v/kernel/drv/nxge.conf 0644 root sys
 d none platform/sun4v/kernel/drv/sparcv9 755 root sys
 f none platform/sun4v/kernel/drv/sparcv9/nxge 755 root sys
diff --git a/usr/src/pkgdefs/SUNWnxge/Makefile b/usr/src/pkgdefs/SUNWnxge/Makefile
index 896956325b..f3b121fb16 100755..100644
--- a/usr/src/pkgdefs/SUNWnxge/Makefile
+++ b/usr/src/pkgdefs/SUNWnxge/Makefile
@@ -19,15 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
-DATAFILES += depend  i.renameold
+DATAFILES += depend i.renamenew
 
 
 
diff --git a/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl b/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl
index c0be96a129..fd08984d2e 100755..100644
--- a/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl
+++ b/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -43,7 +42,7 @@ DESC="Sun NIU 10Gb/1Gb leaf driver"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
-CLASSES="none renameold"
+CLASSES="none renamenew"
 BASEDIR=/
 SUNW_PKGVERS="1.0"
 
diff --git a/usr/src/pkgdefs/SUNWnxge/prototype_com b/usr/src/pkgdefs/SUNWnxge/prototype_com
index 960b0dcdfd..7b416bb5f7 100755..100644
--- a/usr/src/pkgdefs/SUNWnxge/prototype_com
+++ b/usr/src/pkgdefs/SUNWnxge/prototype_com
@@ -22,7 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -41,7 +40,7 @@ i depend
 i preinstall
 i postinstall
 i postremove
-i i.renameold
+i i.renamenew
 #
 # source locations relative to the prototype file
 #
diff --git a/usr/src/pkgdefs/SUNWnxge/prototype_i386 b/usr/src/pkgdefs/SUNWnxge/prototype_i386
index df6bc64cc6..eacaf9003e 100755..100644
--- a/usr/src/pkgdefs/SUNWnxge/prototype_i386
+++ b/usr/src/pkgdefs/SUNWnxge/prototype_i386
@@ -22,7 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -51,6 +50,6 @@
 d none kernel			0755	root	sys
 d none kernel/drv		0755	root	sys
 f none kernel/drv/nxge		0755	root	sys
-e renameold kernel/drv/nxge.conf 0644 root sys
+e renamenew kernel/drv/nxge.conf 0644 root sys
 d none kernel/drv/amd64		0755	root	sys
 f none kernel/drv/amd64/nxge	0755	root	sys