Mercurial > illumos > illumos-gate

diff usr/src/cmd/dumpadm/main.c @ 12979:ab9ae749152f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC/2009/617 Software Events Notification Parameters CLI PSARC/2009/618 snmp-notify: SNMP Notification Daemon for Software Events PSARC/2009/619 smtp-notify: Email Notification Daemon for Software Events PSARC/2010/225 fmd for non-global Solaris zones PSARC/2010/226 Solaris Instance UUID PSARC/2010/227 nvlist_nvflag(3NVPAIR) PSARC/2010/228 libfmevent additions PSARC/2010/257 sysevent_evc_setpropnvl and sysevent_evc_getpropnvl PSARC/2010/265 FMRI and FMA Event Stabilty, 'ireport' category 1 event class, and the 'sw' FMRI scheme PSARC/2010/278 FMA/SMF integration: instance state transitions PSARC/2010/279 Modelling panics within FMA PSARC/2010/290 logadm.conf upgrade 6392476 fmdump needs to pretty-print 6393375 userland ereport/ireport event generation interfaces 6445732 Add email notification agent for FMA and software events 6804168 RFE: Allow an efficient means to monitor SMF services status changes 6866661 scf_values_destroy(3SCF) will segfault if is passed NULL 6884709 Add snmp notification agent for FMA and software events 6884712 Add private interface to tap into libfmd_msg macro expansion capabilities 6897919 fmd to run in a non-global zone 6897937 fmd use of non-private doors is not safe 6900081 add a UUID to Solaris kernel image for use in crashdump identification 6914884 model panic events as a defect diagnosis in FMA 6944862 fmd_case_open_uuid, fmd_case_uuisresolved, fmd_nvl_create_defect 6944866 log legacy sysevents in fmd 6944867 enumerate svc scheme in topo 6944868 software-diagnosis and software-response fmd modules 6944870 model SMF maintenance state as a defect diagnosis in FMA 6944876 savecore runs in foreground for systems with zfs root and dedicated dump 6965796 Implement notification parameters for SMF state transitions and FMA events 6968287 SUN-FM-MIB.mib needs to be updated to reflect Oracle information 6972331 logadm.conf upgrade PSARC/2010/290
author Gavin Maltby <gavin.maltby@oracle.com>
date Fri, 30 Jul 2010 17:04:17 +1000
parents eb166ea6e74e
children
line wrap: on
line diff
--- a/usr/src/cmd/dumpadm/main.c	Thu Jul 29 22:45:58 2010 -0700
+++ b/usr/src/cmd/dumpadm/main.c	Fri Jul 30 17:04:17 2010 +1000
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <sys/stat.h>
@@ -28,6 +27,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "dconf.h"
 #include "minfree.h"
@@ -37,7 +37,7 @@
 Usage: %s [-nuy] [-c kernel | curproc | all ] [-d dump-device | swap ]\n\
 	[-m min {k|m|%%} ] [-s savecore-dir] [-r root-dir] [-z on|off]\n";
 
-static const char OPTS[] = "nuyc:d:m:s:r:z:";
+static const char OPTS[] = "inuyc:d:m:s:r:z:";
 
 static const char PATH_DEVICE[] = "/dev/dump";
 static const char PATH_CONFIG[] = "/etc/dumpadm.conf";
@@ -55,6 +55,8 @@
 	int modified = 0;		/* have we modified the dump config? */
 	char *minfstr = NULL;		/* string value of -m argument */
 	dumpconf_t dc;			/* current configuration */
+	int chrooted = 0;
+	int douuid = 0;
 
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
@@ -66,7 +68,7 @@
 	 */
 	while (optind < argc) {
 		while ((c = getopt(argc, argv, OPTS)) != (int)EOF) {
-			if (c == 'r' && chroot(optarg) == -1)
+			if (c == 'r' && ++chrooted && chroot(optarg) == -1)
 				die(gettext("failed to chroot to %s"), optarg);
 			else if (c == 'u')
 				dcmode = DC_OVERRIDE;
@@ -120,6 +122,16 @@
 				modified++;
 				break;
 
+			case 'i':
+				/* undocumented option */
+				if (chrooted) {
+					warn(gettext("-i and -r cannot be "
+					    "used together\n"));
+					return (E_USAGE);
+				}
+				douuid++;
+				break;
+
 			case 'm':
 				minfstr = optarg;
 				break;
@@ -156,6 +168,9 @@
 		}
 	}
 
+	if (douuid)
+		return (dconf_write_uuid(&dc) ? E_SUCCESS : E_ERROR);
+
 	if (minfstr != NULL) {
 		if (minfree_compute(dc.dc_savdir, minfstr, &minf) == -1)
 			return (E_USAGE);