diff options
| author | Sherry Moore <Sherry.Moore@Sun.COM> | 2009-03-24 14:38:50 -0700 |
|---|---|---|
| committer | Sherry Moore <Sherry.Moore@Sun.COM> | 2009-03-24 14:38:50 -0700 |
| commit | 753a6d457b330b1b29b2d3eefcd0831116ce950d (patch) | |
| tree | c18350d4e3f43265a05f156f9c9175474f3fc3e7 /usr/src/lib/libc | |
| parent | 0c59ba075fc10821b752d32ee83a714261bca290 (diff) | |
| download | illumos-joyent-753a6d457b330b1b29b2d3eefcd0831116ce950d.tar.gz | |
PSARC/2008/760 Boot configuration Service
PSARC/2009/091 Reboot to firmware
PSARC/2009/092 libgrubmgmt - library for GRUB menu management
6768468 Introducing svc:/system/boot-config service
6775160 reboot -f ignores active BE and resets zfs pool bootfs property
6760845 Add checksum verification when loading the new kernel and boot archive for fast reboot
6815215 quiesce_active should be added to MUTEX_NOT_HELD()
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/amd64/sys/uadmin.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/libc/i386/sys/uadmin.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/usr/src/lib/libc/amd64/sys/uadmin.c b/usr/src/lib/libc/amd64/sys/uadmin.c index a705ead079..1038e81bb9 100644 --- a/usr/src/lib/libc/amd64/sys/uadmin.c +++ b/usr/src/lib/libc/amd64/sys/uadmin.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -126,12 +126,11 @@ uadmin(int cmd, int fcn, uintptr_t mdep) head = bargs_scratch; newarg = strtok(bargs_scratch, " "); - if (newarg == NULL) + if (newarg == NULL || newarg[0] == '-') break; /* First argument is rootdir */ - if (newarg[0] != '-' && - strncmp(&newarg[strlen(newarg)-4], + if (strncmp(&newarg[strlen(newarg)-4], "unix", 4) != 0) { newarg = strtok(NULL, " "); off = newarg - head; diff --git a/usr/src/lib/libc/i386/sys/uadmin.c b/usr/src/lib/libc/i386/sys/uadmin.c index a705ead079..1038e81bb9 100644 --- a/usr/src/lib/libc/i386/sys/uadmin.c +++ b/usr/src/lib/libc/i386/sys/uadmin.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -126,12 +126,11 @@ uadmin(int cmd, int fcn, uintptr_t mdep) head = bargs_scratch; newarg = strtok(bargs_scratch, " "); - if (newarg == NULL) + if (newarg == NULL || newarg[0] == '-') break; /* First argument is rootdir */ - if (newarg[0] != '-' && - strncmp(&newarg[strlen(newarg)-4], + if (strncmp(&newarg[strlen(newarg)-4], "unix", 4) != 0) { newarg = strtok(NULL, " "); off = newarg - head; |