diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-03-10 12:27:27 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-03-10 12:27:27 +0000 |
| commit | 587f4d19484a7d9f3f732214995e34f877831d02 (patch) | |
| tree | 4135283bd079e18fdb10a5ea78597e6f9b70cac6 /usr/src/cmd/lofiadm | |
| parent | d0104768a77bae39972bdaa88afcf87231be8fe3 (diff) | |
| parent | 286ef71398fb54b1d5007d6f45aa4320a9e0ede2 (diff) | |
| download | illumos-joyent-587f4d19484a7d9f3f732214995e34f877831d02.tar.gz | |
[illumos-gate merge]
commit 286ef71398fb54b1d5007d6f45aa4320a9e0ede2
6370 ZFS send fails to transmit some holes
commit 4549a1bd3fb75b70dd34ba46715014effe21dc07
6727 lofiadm: remove "o:" from getopt argument
commit e2e882f7e139a951a52c7f4b5af447c3e6e68398
6691 V490 and V890 symlinks missing on SPARC build
commit 2f15e7adf5d6f13b15dfa8f3900a07804cadd86c
6581 cmd/format should be able label virtio BLKDEV drives
commit debed2c9e88134586f1a03761f87d8a1d599b854
6733 mh_contents rwlock is not initialised
Conflicts:
usr/src/cmd/lofiadm/main.c
Diffstat (limited to 'usr/src/cmd/lofiadm')
| -rw-r--r-- | usr/src/cmd/lofiadm/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/cmd/lofiadm/main.c b/usr/src/cmd/lofiadm/main.c index 0c32b69323..fd6513fdf8 100644 --- a/usr/src/cmd/lofiadm/main.c +++ b/usr/src/cmd/lofiadm/main.c @@ -25,6 +25,7 @@ * * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Gary Mills + * Copyright (c) 2016 Andrey Sokolov */ /* @@ -1837,7 +1838,7 @@ main(int argc, char *argv[]) (void) setlocale(LC_ALL, ""); (void) textdomain(TEXT_DOMAIN); - while ((c = getopt(argc, argv, "a:c:Cd:efk:o:rs:T:UX")) != EOF) { + while ((c = getopt(argc, argv, "a:c:Cd:efk:rs:T:UX")) != EOF) { switch (c) { case 'a': addflag = B_TRUE; |