diff options
Diffstat (limited to 'usr/src/cmd/power/conf.c')
| -rw-r--r-- | usr/src/cmd/power/conf.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/usr/src/cmd/power/conf.c b/usr/src/cmd/power/conf.c index 5bea3f08c8..d84e3cd014 100644 --- a/usr/src/cmd/power/conf.c +++ b/usr/src/cmd/power/conf.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -83,6 +82,13 @@ static int fflag, rflag; int pm_fd; uid_t ruid; int def_src; +/* + * Until we get more graphics driver support, we only enable autopm, + * S3 support and autoS3 by default on X86 systems that are on our whitelist. + */ +int whitelist_only = 1; + +int verify = 0; static void @@ -302,7 +308,10 @@ restart_powerd(void) (void) setreuid(0, 0); (void) setregid(0, 0); (void) setgroups(0, NULL); - (void) execle(powerd, powerd, NULL, NULL); + if (debug) + (void) execle(powerd, powerd, "-d", NULL, NULL); + else + (void) execle(powerd, powerd, NULL, NULL); exit(1); } else { do { @@ -503,6 +512,12 @@ main(int cnt, char **vec) case 'r': rflag = 1; break; + case 'W': + whitelist_only = 0; + break; + case 'v': + verify = 1; + break; default: usage(); break; |