Skip to content

Commit

Permalink
Merge remote-tracking branch 'pr1ntf/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
EpiJunkie committed May 1, 2016
2 parents 62d05cd + 2f97c0b commit 002cfb2
Show file tree
Hide file tree
Showing 14 changed files with 1,648 additions and 1,597 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PREFIX?= /usr/local

MAN=
BINDIR=$(PREFIX)/sbin
#FILESDIR=$(PREFIX)/lib/iohyve
FILESDIR=$(PREFIX)/lib/iohyve
RCDIR=$(PREFIX)/etc/rc.d
MANDIR=$(PREFIX)/man/man8
MKDIR=mkdir
Expand All @@ -21,9 +21,9 @@ ${SCRIPTS}:
install:: all
$(MKDIR) -p $(BINDIR)
$(MKDIR) -p $(RCDIR)
# $(MKDIR) -p $(FILESDIR)
$(MKDIR) -p $(FILESDIR)
$(INSTALL) -c -m $(BINMODE) ${.OBJDIR}/$(SCRIPTS) $(BINDIR)/
# $(INSTALL) -c ${.OBJDIR}/lib/* $(FILESDIR)/
$(INSTALL) -c ${.OBJDIR}/lib/* $(FILESDIR)/
$(INSTALL) -c ${.OBJDIR}/rc.d/* $(RCDIR)/
$(INSTALL) -c $(MAN).gz $(MANDIR)/

Expand Down
66 changes: 34 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,54 +47,56 @@ If you are using [FreeNAS](http://doc.freenas.org/9.10/freenas_jails.html#using-
```
ln -s /mnt/iohyve /iohyve
```
You may also want to check out the FreeNAS [tunables](http://doc.freenas.org/9.10/freenas_system.html?highlight=persist#tunables) section of their handbook
so you can add `iohyve_enable="YES"` and `iohyve_flags="kmod=1 net=[iface]"` thus setting up the kernel modules and iohyve networking at boot time on your FreeNAS install.

**Usage**

```
iohyve
version
setup pool=[poolname] kmod=[0/1] net=[interface]
setup <pool=poolname> [kmod=0|1] [net=iface]
list [-l]
info [-vsdl]
isolist
fwlist
fetchiso [URL]
cpiso [path]
renameiso [ISO] [newname]
rmiso [ISO]
fetchfw [URL]
cpfw [path]
renamefw [firmware] [newname]
rmfw [firmware]
create [name] [size]
install [name] [ISO]
load [name] [path/to/bootdisk]
boot [name] [runmode] [pcidevices]
start [name] [-s | -a]
stop [name]
forcekill [name]
fetchiso <URL>
cpiso <path>
renameiso <ISO> <newname>
rmiso <ISO>
fetchfw <URL>
cpfw <path>
renamefw <firmware> <newname>
rmfw <firmware>
create <name> <size> [pool]
install <name> <ISO>
load <name> <path/to/bootdisk>
boot <name> [runmode] [pcidevices]
start <name> [-s | -a]
stop <name>
forcekill <name>
scram
destroy [name]
rename [name] [newname]
delete [-f] [name]
set [name] [prop1=value] [prop2=value]...
get [name] [prop]
rmpci [-f] [name] [pcidev:N]
getall [name]
add [name] [size]
remove [-f] [name] [diskN]
resize [name] [diskN] [size]
disks [name]
snap [name]@[snapshotname]
roll [name]@[snapshotname]
clone [name] [clonename]
export [name]
destroy <name>
rename <name> <newname>
delete [-f] <name>
set <name> <property=value> ...
get <name> <prop>
rmpci [-f] <name> <pcidev:N>
getall <name>
add <name> <size> [pool]
remove [-f] <name> <diskN>
resize <name> <diskN> <size>
disks <name>
snap <name>@<snap>
roll <name>@<snap>
clone [-c | -r] <name> <clonename>
export <name>
snaplist
taplist
activetaps
conlist
console [name]
console <name>
conreset
help
```
Expand Down
Loading

0 comments on commit 002cfb2

Please sign in to comment.