Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-stable
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
emulab
emulab-stable
Commits
2c1322c7
Commit
2c1322c7
authored
Oct 07, 2015
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A few other random freenas-related fixups.
parent
c019a5ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
clientside/GNUmakefile.in
clientside/GNUmakefile.in
+3
-3
clientside/tmcc/freenas9/GNUmakefile.in
clientside/tmcc/freenas9/GNUmakefile.in
+3
-1
clientside/tmcc/freenas9/libfreenas.pm
clientside/tmcc/freenas9/libfreenas.pm
+2
-2
No files found.
clientside/GNUmakefile.in
View file @
2c1322c7
#
# Copyright (c) 2000-201
4
University of Utah and the Flux Group.
# Copyright (c) 2000-201
5
University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
...
...
@@ -89,8 +89,8 @@ client-mkdirs:
freenas-os-check:
@if [ "$(SYSTEM)" != "FreeBSD" -o "$(ARCH)" != "amd64" -o \
\( "$(REL)" != "9.2" -a "$(REL)" != "8.3" \) ]; then \
echo "Must run on FreeBSD 8.3 or 9.2 amd64"; \
\( "$(REL)" != "9.2" -a "$(REL)" != "
9.3" -a "$(REL)" != "
8.3" \) ]; then \
echo "Must run on FreeBSD 8.3 or 9.2
or 9.3
amd64"; \
false; \
fi
...
...
clientside/tmcc/freenas9/GNUmakefile.in
View file @
2c1322c7
...
...
@@ -80,7 +80,9 @@ install client-install: destdircheck basefbsd-install
rm -f $(ORCDIR)/rc.mkelab $(ORCDIR)/rc.motelog $(ORCDIR)/rc.trace
rm -f $(ORCDIR)/rc.inelab $(ORCDIR)/rc.healthd $(ORCDIR)/rc.nodecheck
rm -f $(ORCDIR)/rc.pgeni $(ORCDIR)/rc.tpmsetup $(ORCDIR)/rc.trafgen
rm -f $(ORCDIR)/rc.slothd
rm -f $(ORCDIR)/rc.slothd $(ORCDIR)/rc.freebsd $(ORCDIR)/rc.injail
rm -f $(ORCDIR)/rc.progagent $(ORCDIR)/rc.ipod $(ORCDIR)/rc.simulator
rm -f $(ORCDIR)/rc.linkagent $(ORCDIR)/rc.topomap
rm -f $(OBINDIR)/checknode $(OBINDIR)/checkutils.sh
rm -f $(OBINDIR)/diskcheck $(OBINDIR)/hbis.sh $(OBINDIR)/cpucheck
rm -f $(OBINDIR)/healthd.conf $(OBINDIR)/ixpboot $(OBINDIR)/memcheck
...
...
clientside/tmcc/freenas9/libfreenas.pm
View file @
2c1322c7
...
...
@@ -1263,8 +1263,8 @@ sub listPools() {
while
(
my
$line
=
<
ZFS
>
)
{
chomp
$line
;
my
(
$pname
,
$prop
,
$val
)
=
split
(
/\s+/
,
$line
);
next
if
$pname
=~
/\//
;
# filter out zvols.
next
if
$pname
eq
"
freenas-boot
";
# and the system pool
.
next
if
$pname
=~
/\//
;
# filter out zvols.
next
if
$pname
=~
/^freenas-boot/
;
# and the system pool and snapshots
.
if
(
exists
(
$poolh
->
{
$pname
}))
{
my
$pool
=
$poolh
->
{
$pname
};
if
(
$prop
eq
"
available
")
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment