Unverified Commit 91363839 authored by Audrey Dutcher's avatar Audrey Dutcher Committed by GitHub
Browse files

freebsd.{several items}: init (#497339)

parents a1b7a54e b9565b57
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index 101c69e93cde..b95fc1b93285 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -2493,7 +2493,7 @@ ltr()
 		fi
 	done
 	if [ -n "${_var}" ]; then
-		setvar "${_var}" "${_out}"
+		printf -v "${_var}" "%s" "${_out}"
 	else
 		echo "${_out}"
 	fi
+12 −0
Original line number Diff line number Diff line
diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc
index 852767aeb227..69086b4a7255 100644
--- a/cddl/usr.sbin/zfsd/case_file.cc
+++ b/cddl/usr.sbin/zfsd/case_file.cc
@@ -49,6 +49,7 @@
 #include <iomanip>
 #include <fstream>
 #include <functional>
+#include <algorithm>
 #include <sstream>
 #include <syslog.h>
 #include <unistd.h>
+13 −0
Original line number Diff line number Diff line
{
  mkDerivation,
  flex,
  byacc,
}:
mkDerivation {
  path = "usr.sbin/acpi";
  extraPaths = [ "sys/contrib/dev/acpica" ];
  extraNativeBuildInputs = [
    flex
    byacc
  ];
}
+6 −0
Original line number Diff line number Diff line
{
  mkDerivation,
}:
mkDerivation {
  path = "usr.sbin/apm";
}
+17 −0
Original line number Diff line number Diff line
{
  mkDerivation,
  flex,
}:
mkDerivation {
  path = "usr.sbin/autofs";
  extraPaths = [
    "sys/fs/autofs"
  ];
  outputs = [
    "out"
    "debug"
  ];
  extraNativeBuildInputs = [
    flex
  ];
}
Loading