diff options
| author | suha <none@none> | 2008-08-04 17:16:15 -0700 |
|---|---|---|
| committer | suha <none@none> | 2008-08-04 17:16:15 -0700 |
| commit | baf2c95cb7af3bdff76a3e6693e566e0b8b75bc4 (patch) | |
| tree | fe4bcc4a084150e638ef9489cb69bca4c685d4fb /usr/src/cmd/cmd-crypto | |
| parent | 0fc6d498185b06c2beaf40629f05a8ea495547a0 (diff) | |
| download | illumos-joyent-baf2c95cb7af3bdff76a3e6693e566e0b8b75bc4.tar.gz | |
backout 6449514/6686002/6686004/6700122: needs more work
Diffstat (limited to 'usr/src/cmd/cmd-crypto')
| -rw-r--r-- | usr/src/cmd/cmd-crypto/cryptoadm/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h | 4 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml | 15 |
3 files changed, 11 insertions, 12 deletions
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile index 0b2d346dc7..9ff966839b 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile +++ b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile @@ -58,9 +58,7 @@ $(PROG): $(OBJS) $(POFILE): $(POFILES) $(RM) $@; cat $(POFILES) > $@ -install: all $(ROOTSBINPROG) - $(RM) $(ROOTUSRSBINPROG) - -$(SYMLINK) ../../sbin/$(PROG) $(ROOTUSRSBINPROG) +install: all $(ROOTUSRSBINPROG) clean: $(RM) -f $(OBJS) $(PROG) diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h index d1891d4b0f..0bbf82101c 100644 --- a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h +++ b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -37,7 +37,7 @@ extern "C" { #endif #define _PATH_KCF_CONF "/etc/crypto/kcf.conf" -#define _PATH_KCFD "/lib/crypto/kcfd" +#define _PATH_KCFD "/usr/lib/crypto/kcfd" #define TMPFILE_TEMPLATE "/etc/crypto/admXXXXXX" #define ERROR_USAGE 2 diff --git a/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml b/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml index ef1b24360b..330f48033b 100644 --- a/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml +++ b/usr/src/cmd/cmd-crypto/scripts/cryptosvc.xml @@ -1,14 +1,15 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- - Copyright 2008 Sun Microsystems, Inc. All rights reserved. + Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. 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. + Common Development and Distribution License, Version 1.0 only + (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. @@ -46,7 +47,7 @@ restart_on='none' type='service'> <service_fmri - value='svc:/system/filesystem/root:default'/> + value='svc:/system/filesystem/minimal:default'/> </dependency> <dependent @@ -60,19 +61,19 @@ <exec_method type='method' name='start' - exec='/sbin/cryptoadm %m' + exec='/usr/sbin/cryptoadm %m' timeout_seconds='60' /> <exec_method type='method' name='stop' - exec='/sbin/cryptoadm %m' + exec='/usr/sbin/cryptoadm %m' timeout_seconds='60' /> <exec_method type='method' name='refresh' - exec='/sbin/cryptoadm %m' + exec='/usr/sbin/cryptoadm %m' timeout_seconds='60' /> <instance name='default' enabled='false' /> |