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/pptpd/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/pptpd/files')
-rw-r--r-- | package/pptpd/files/pptpd.conffiles | 2 | ||||
-rw-r--r-- | package/pptpd/files/pptpd.init | 7 | ||||
-rw-r--r-- | package/pptpd/files/pptpd.postinst | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/package/pptpd/files/pptpd.conffiles b/package/pptpd/files/pptpd.conffiles new file mode 100644 index 000000000..c5afda91f --- /dev/null +++ b/package/pptpd/files/pptpd.conffiles @@ -0,0 +1,2 @@ +/etc/ppp/options.pptpd +/etc/pptpd.conf diff --git a/package/pptpd/files/pptpd.init b/package/pptpd/files/pptpd.init index c2b8ac032..f4f37613f 100644 --- a/package/pptpd/files/pptpd.init +++ b/package/pptpd/files/pptpd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG pptpd +#INIT 60 + . /etc/rc.conf case $1 in @@ -9,9 +11,6 @@ autostart) exec sh $0 start ;; start) - for m in arc4 sha1 slhc crc-ccitt ppp_generic ppp_async ppp_mppe_mppc; do - insmod $m >/dev/null 2>&1 - done pptpd ;; stop) diff --git a/package/pptpd/files/pptpd.postinst b/package/pptpd/files/pptpd.postinst new file mode 100644 index 000000000..05b1af001 --- /dev/null +++ b/package/pptpd/files/pptpd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pptpd pptpd NO |