Mercurial > illumos > illumos-gate
changeset 10853:05b7c23148c1
6887730 'kernel/drv/usbser_edge.conf' has incorrect e/none combination of ftype/class assigned
| author | guoqing zhu - Sun Microsystems - Beijing China <Guoqing.Zhu@Sun.COM> |
|---|---|
| date | Sat, 24 Oct 2009 16:23:18 +0800 |
| parents | 51a4dcf550d9 |
| children | 5d13dd0ac710 |
| files | usr/src/pkgdefs/SUNWuedg/Makefile usr/src/pkgdefs/SUNWuedg/pkginfo.tmpl usr/src/pkgdefs/SUNWuedg/prototype_com usr/src/pkgdefs/common_files/i.edgeconf |
| diffstat | 4 files changed, 60 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/pkgdefs/SUNWuedg/Makefile Fri Oct 23 15:06:39 2009 -0700 +++ b/usr/src/pkgdefs/SUNWuedg/Makefile Sat Oct 24 16:23:18 2009 +0800 @@ -19,16 +19,17 @@ # CDDL HEADER END # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" include ../Makefile.com LICENSEFILES += $(OSBL) CDDL= +DATAFILES += i.edgeconf + .KEEP_STATE: all: $(FILES) depend postinstall preremove
--- a/usr/src/pkgdefs/SUNWuedg/pkginfo.tmpl Fri Oct 23 15:06:39 2009 -0700 +++ b/usr/src/pkgdefs/SUNWuedg/pkginfo.tmpl Sat Oct 24 16:23:18 2009 +0800 @@ -20,10 +20,9 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # # @@ -37,7 +36,7 @@ CATEGORY="system" BASEDIR=/ SUNW_PKGTYPE="root" -CLASSES="none" +CLASSES="none edgeconf" DESC="USB Digi Edgeport serial driver" SUNW_PRODNAME="SunOS" SUNW_PRODVERS="RELEASE/VERSION"
--- a/usr/src/pkgdefs/SUNWuedg/prototype_com Fri Oct 23 15:06:39 2009 -0700 +++ b/usr/src/pkgdefs/SUNWuedg/prototype_com Sat Oct 24 16:23:18 2009 +0800 @@ -42,6 +42,7 @@ i pkginfo i postinstall i preremove +i i.edgeconf d none kernel 0755 root sys d none kernel/drv 0755 root sys -e none kernel/drv/usbser_edge.conf 0644 root sys +e edgeconf kernel/drv/usbser_edge.conf 0644 root sys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/common_files/i.edgeconf Sat Oct 24 16:23:18 2009 +0800 @@ -0,0 +1,53 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# Update the usbser_edge.conf file. The distributed usbser_edge.conf consists +# only of comments, ending in a marker line. To update, the new file +# (all comments) is appended by any lines in the user's old file that +# appear after the marker. +# + +PATH="/usr/bin:/usr/sbin:${PATH}" +export PATH +TMP_FILE=/tmp/usbser_edge.$$ +export TMP_FILE + +while read src dest +do + if [ ! -f $dest ] ; then + cp $src $dest + else + # copy everything after marker line to a tmp file + MARKER="# DO NOT MODIFY OR DELETE THIS LINE -- CUSTOMIZED CONFIGURATION BELLOW #" + sed -e "1,/^$MARKER$/d" $dest > $TMP_FILE + + # combine new file with saved lines from user's old file + cat $src $TMP_FILE > $dest + rm $TMP_FILE + fi +done + +exit 0