JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fanctl: fix state directory

Browse Source
This commit is contained in:
Charles Strahan 2015-08-22 14:08:29 -04:00
parent 648973d641
commit 7408ede358
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/fanctl/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }: { stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }:
stdenv.mkDerivation rec { let stateDir = "/var/lib/fan-networking";
in stdenv.mkDerivation rec {
name = "fanctl-${version}"; name = "fanctl-${version}";
version = "0.3.0"; version = "0.3.0";
@ -17,16 +18,16 @@ stdenv.mkDerivation rec {
# if that files does not exist, dnsmasq subsequently fails, # if that files does not exist, dnsmasq subsequently fails,
# so we'll use /dev/null. # so we'll use /dev/null.
# #
# Also, make sure /var/lib/fan-networking exists before starting dnsmasq. # Also, make sure the state directory before starting dnsmasq.
buildPhase = '' buildPhase = ''
substituteInPlace fanctl \ substituteInPlace fanctl \
--replace '--conf-file= ' \ --replace '--conf-file= ' \
'--conf-file=/dev/null ' \ '--conf-file=/dev/null ' \
--replace '/var/lib/misc' \ --replace '/var/lib/misc' \
'/var/lib/ubuntu-fan' '${stateDir}'
sed -i '/dnsmasq -u/i \ sed -i '/dnsmasq -u/i \
mkdir -p /var/lib/fan-networking' fanctl mkdir -p ${stateDir}' fanctl
''; '';
installPhase = '' installPhase = ''