diff options
| author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-29 15:48:47 +0200 |
|---|---|---|
| committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-29 15:48:47 +0200 |
| commit | 30b44417f91eb100fa67a38e9c1c1f88682c92ef (patch) | |
| tree | f0c6c97d76c9ac7cfe2c88bdffcaee53ff0bc3ae /zoneminder | |
| parent | 427bdf4e2093217f967384f785e3907930a74a21 (diff) | |
| parent | 12c77cdbfa4ec48d935af3ae7cf1118e38bec6e1 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'zoneminder')
| -rw-r--r-- | zoneminder/Makefile | 14 | ||||
| -rw-r--r-- | zoneminder/zmdc.pl-LD_PRELOAD.patch | 10 | ||||
| -rw-r--r-- | zoneminder/zoneminder.conf | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/zoneminder/Makefile b/zoneminder/Makefile new file mode 100644 index 00000000..27302715 --- /dev/null +++ b/zoneminder/Makefile @@ -0,0 +1,14 @@ + +.PHONY: fix it so hard +it: so +so: it hard fix + apt-get install --yes zoneminder libv4l-0 + +hard: /etc/sysctl.d/zoneminder.conf +/etc/sysctl.d/zoneminder.conf: zoneminder.conf + cp $< $@ + sysctl -p $@ + +fix: zmdc.pl-LD_PRELOAD.patch + (cd /usr/bin && patch -N) < $< || : + diff --git a/zoneminder/zmdc.pl-LD_PRELOAD.patch b/zoneminder/zmdc.pl-LD_PRELOAD.patch new file mode 100644 index 00000000..b00fc673 --- /dev/null +++ b/zoneminder/zmdc.pl-LD_PRELOAD.patch @@ -0,0 +1,10 @@ +--- /usr/bin/zmdc.pl 2011-05-23 22:28:57.505247793 +0200 ++++ /usr/bin/zmdc.pl 2011-05-23 22:29:45.597248242 +0200 +@@ -62,6 +62,7 @@ + $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL}; + delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; + ++$ENV{LD_PRELOAD} = '/usr/lib/libv4l/v4l2convert.so'; + my @daemons = ( + 'zmc', + 'zma', diff --git a/zoneminder/zoneminder.conf b/zoneminder/zoneminder.conf new file mode 100644 index 00000000..1eec6fd9 --- /dev/null +++ b/zoneminder/zoneminder.conf @@ -0,0 +1,2 @@ +kernel.shmall = 134217728 +kernel.shmmax = 134217728 |