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/miredo/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/miredo/files')
-rw-r--r-- | package/miredo/files/miredo-server.init | 4 | ||||
-rw-r--r-- | package/miredo/files/miredo-server.postinst | 3 | ||||
-rw-r--r-- | package/miredo/files/miredo.conffiles | 1 | ||||
-rw-r--r-- | package/miredo/files/miredo.init | 4 | ||||
-rw-r--r-- | package/miredo/files/miredo.postinst | 3 |
5 files changed, 13 insertions, 2 deletions
diff --git a/package/miredo/files/miredo-server.init b/package/miredo/files/miredo-server.init index d8282e316..6231573a4 100644 --- a/package/miredo/files/miredo-server.init +++ b/package/miredo/files/miredo-server.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG miredo-server +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/miredo/files/miredo-server.postinst b/package/miredo/files/miredo-server.postinst new file mode 100644 index 000000000..00c88c459 --- /dev/null +++ b/package/miredo/files/miredo-server.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf miredo-server miredo-server NO diff --git a/package/miredo/files/miredo.conffiles b/package/miredo/files/miredo.conffiles new file mode 100644 index 000000000..f4d3b04af --- /dev/null +++ b/package/miredo/files/miredo.conffiles @@ -0,0 +1 @@ +/etc/miredo/miredo.conf diff --git a/package/miredo/files/miredo.init b/package/miredo/files/miredo.init index bb4b3fdcd..d1e846ad7 100644 --- a/package/miredo/files/miredo.init +++ b/package/miredo/files/miredo.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG miredo +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/miredo/files/miredo.postinst b/package/miredo/files/miredo.postinst new file mode 100644 index 000000000..37667f8da --- /dev/null +++ b/package/miredo/files/miredo.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf miredo miredo NO |