Commit 2c1322c7 authored by Mike Hibler's avatar Mike Hibler
Browse files

A few other random freenas-related fixups.

parent c019a5ac
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2000-2015 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
......
......@@ -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
......
......@@ -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") {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment