diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/pmacct/files | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/pmacct/files')
| -rw-r--r-- | package/pmacct/files/nfacctd.conffiles | 1 | ||||
| -rw-r--r-- | package/pmacct/files/nfacctd.init | 4 | ||||
| -rw-r--r-- | package/pmacct/files/nfacctd.postinst | 4 | ||||
| -rw-r--r-- | package/pmacct/files/pmacctd.conffiles | 1 | ||||
| -rw-r--r-- | package/pmacct/files/pmacctd.init | 4 | ||||
| -rw-r--r-- | package/pmacct/files/pmacctd.postinst | 4 |
6 files changed, 16 insertions, 2 deletions
diff --git a/package/pmacct/files/nfacctd.conffiles b/package/pmacct/files/nfacctd.conffiles new file mode 100644 index 000000000..88dba6572 --- /dev/null +++ b/package/pmacct/files/nfacctd.conffiles @@ -0,0 +1 @@ +/etc/nfacctd.conf diff --git a/package/pmacct/files/nfacctd.init b/package/pmacct/files/nfacctd.init index 2d0072bf5..3e768474d 100644 --- a/package/pmacct/files/nfacctd.init +++ b/package/pmacct/files/nfacctd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 80 +#PKG nfacctd +#INIT 80 + . /etc/rc.conf case $1 in diff --git a/package/pmacct/files/nfacctd.postinst b/package/pmacct/files/nfacctd.postinst new file mode 100644 index 000000000..0b382cf0f --- /dev/null +++ b/package/pmacct/files/nfacctd.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf nfacctd nfacctd NO +add_rcconf nfacctd_flags nfacctd_flags "-f /etc/nfacctd.conf" diff --git a/package/pmacct/files/pmacctd.conffiles b/package/pmacct/files/pmacctd.conffiles new file mode 100644 index 000000000..ce1303ff9 --- /dev/null +++ b/package/pmacct/files/pmacctd.conffiles @@ -0,0 +1 @@ +/etc/pmacctd.conf diff --git a/package/pmacct/files/pmacctd.init b/package/pmacct/files/pmacctd.init index 5cde04ba7..2e9a01dd1 100644 --- a/package/pmacct/files/pmacctd.init +++ b/package/pmacct/files/pmacctd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 80 +#PKG pmacctd +#INIT 80 + . /etc/rc.conf case $1 in diff --git a/package/pmacct/files/pmacctd.postinst b/package/pmacct/files/pmacctd.postinst new file mode 100644 index 000000000..49cde0f8e --- /dev/null +++ b/package/pmacct/files/pmacctd.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pmacctd pmacctd NO +add_rcconf pmacctd_flags pmacctd_flags "-f /etc/pmacctd.conf" |