Commit 1117eac4 authored by Mike Hibler's avatar Mike Hibler

Reflect that samba is no longer supported.

This change allows for "Windows support" but without Samba.
Maybe not a meaningful config. At the very least, more work is
probably needed to ensure that Windows experiments have the
"no NFS mounts" bit set.
parent 9704a63a
......@@ -50,7 +50,10 @@ sub Install($$$)
push(@strings, qq|nfs_server_flags="-u -t -n 16"|);
if ($WINSUPPORT) {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
if ($FBSD_MAJOR > 10) {
;
} elsif ($FBSD_MAJOR > 8 ||
($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
push(@strings, qq|samba_enable="YES"|);
push(@strings, qq|nmbd_enable="NO"|);
} else {
......
......@@ -41,6 +41,9 @@ sub Install($$$)
if (!$WINSUPPORT) {
PhaseSkip("Windows support not enabled");
}
if ($FBSD_MAJOR > 10) {
PhaseSkip("Samba no longer supported");
}
DoneIfPackageInstalled("samba");
my $pname = GetPackage("samba", $packagedir);
AddPackage($pname, $packagedir);
......
......@@ -43,6 +43,9 @@ sub Install($$$)
if (!ISFS($server)) {
PhaseSkip("Not FS Node");
}
if ($FBSD_MAJOR > 10) {
PhaseSkip("Samba no longer supported");
}
DoneIfPackageInstalled("samba");
my $pname = GetPackage("samba", $packagedir);
AddPackage($pname, $packagedir);
......
......@@ -46,7 +46,10 @@ sub Install($$$)
if (ISFS($server)) {
if ($WINSUPPORT) {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
if ($FBSD_MAJOR > 10) {
;
} elsif ($FBSD_MAJOR > 8 ||
($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
push(@adds, qq|samba_enable="YES"|);
push(@adds, qq|nmbd_enable="NO"|);
} else {
......
......@@ -16,6 +16,9 @@ sub Install($$$)
if (!$WINSUPPORT) {
PhaseSkip("Windows support not enabled");
}
if ($FBSD_MAJOR > 10) {
PhaseSkip("Samba no longer supported");
}
Phase "smb.conf", "Installing smb.conf[.head]", sub {
DoneIfIdentical("$TOP_OBJDIR/install/smb.conf.head", $SMBCONF_HEAD)
if (-e $SMBCONF_HEAD);
......
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