mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge pull request #35121 from xeji/firehol-35114
firehol: 3.1.5: fix errors when running firehol command
This commit is contained in:
commit
4531f181d9
1 changed files with 31 additions and 2 deletions
|
@ -2,8 +2,8 @@
|
||||||
, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils
|
, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils
|
||||||
, kmod, nettools, procps, tcpdump, traceroute, utillinux, whois
|
, kmod, nettools, procps, tcpdump, traceroute, utillinux, whois
|
||||||
|
|
||||||
# Just install FireQOS without FireHOL
|
# If true, just install FireQOS without FireHOL
|
||||||
, onlyQOS ? true
|
, onlyQOS ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -52,6 +52,35 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[
|
AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[
|
||||||
'')
|
'')
|
||||||
|
|
||||||
|
# put firehol config files in /etc/firehol (not $out/etc/firehol)
|
||||||
|
# to avoid error on startup, see #35114
|
||||||
|
(pkgs.writeText "firehol-sysconfdir.patch"
|
||||||
|
''
|
||||||
|
--- a/sbin/install.config.in.in
|
||||||
|
+++ b/sbin/install.config.in.in
|
||||||
|
@@ -4 +4 @@
|
||||||
|
-SYSCONFDIR="@sysconfdir_POST@"
|
||||||
|
+SYSCONFDIR="/etc"
|
||||||
|
'')
|
||||||
|
|
||||||
|
# we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname
|
||||||
|
# will be interpreted as IFS -> error. this might be considered an upstream bug
|
||||||
|
# but only appears when there are dashes in the command path
|
||||||
|
(pkgs.writeText "firehol-uname-command.patch"
|
||||||
|
''
|
||||||
|
--- a/sbin/firehol
|
||||||
|
+++ b/sbin/firehol
|
||||||
|
@@ -10295,7 +10295,7 @@
|
||||||
|
kmaj=$1
|
||||||
|
kmin=$2
|
||||||
|
|
||||||
|
- set -- $($UNAME_CMD -r)
|
||||||
|
+ set -- $("$UNAME_CMD" -r)
|
||||||
|
eval $kmaj=\$1 $kmin=\$2
|
||||||
|
}
|
||||||
|
kernel_maj_min KERNELMAJ KERNELMIN
|
||||||
|
'')
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake ];
|
nativeBuildInputs = [ autoconf automake ];
|
||||||
|
|
Loading…
Reference in a new issue