Am Donnerstag, 5. August 2010, um 08:22:30 schrieb Marc Kleine-Budde:
> Stephan Linz wrote:
> > Signed-off-by: Stephan Linz <[email protected]>
>
> applied to master
>
> tnx, Marc
>
> > ---
> > generic/etc/inetd.conf.d/ftpd | 1 +
> > rules/busybox.in | 7 +++++++
> > rules/busybox.make | 4 ++++
> > 3 files changed, 12 insertions(+), 0 deletions(-)
> > create mode 100644 generic/etc/inetd.conf.d/ftpd
> >
> > diff --git a/generic/etc/inetd.conf.d/ftpd
> > b/generic/etc/inetd.conf.d/ftpd new file mode 100644
> > index 0000000..d80c851
> > --- /dev/null
> > +++ b/generic/etc/inetd.conf.d/ftpd
> > @@ -0,0 +1 @@
> > +ftp stream tcp nowait root /usr/sbin/ftpd ftpd -w -S /tmp
>
> ^^^^^^^^^^
>
> btw what's the meaning of this options?
An excerpt from [BB]/usage.src.h:
-w Allow upload
-S Log to syslog
The more I think about this options the more I think we can run into some
runtime errors. Because the -w option is optional in busybox. It would be
better to remove the -w option here in this global file, or not?
>
> > diff --git a/rules/busybox.in b/rules/busybox.in
> > index 001d4fc..0b56f56 100644
> > --- a/rules/busybox.in
> > +++ b/rules/busybox.in
> > @@ -21,6 +21,13 @@ config BUSYBOX_INETD_STARTSCRIPT
> > default y
> > prompt "install /etc/init.d/inetd"
> >
> > +config BUSYBOX_FTPD_INETD
> > + depends on BUSYBOX_FTPD
> > + bool
> > + prompt "ftpd startup type (inetd)"
> > + help
> > + start busybox ftpd server from inetd
> > +
> > choice
> > prompt "telnetd startup type"
> > depends on BUSYBOX_TELNETD
> > diff --git a/rules/busybox.make b/rules/busybox.make
> > index d06e693..38a83bf 100644
> > --- a/rules/busybox.make
> > +++ b/rules/busybox.make
> > @@ -99,6 +99,10 @@ endif
> > $(call install_link, busybox, "$${to}", "$${link}"); \
> > done
> >
> > +ifdef PTXCONF_BUSYBOX_FTPD_INETD
> > + @$(call install_alternative, busybox, 0, 0, 0644,
> > /etc/inetd.conf.d/ftpd) +endif
> > +
> > ifdef PTXCONF_BUSYBOX_TELNETD_INETD
> > @$(call install_alternative, busybox, 0, 0, 0644,
> > /etc/inetd.conf.d/telnetd) endif
--
Viele Grüße,
Stephan Linz
______________________________________________________________________________
OpenDCC: http://www.li-pro.net/opendcc.phtml
PC/M: http://www.li-pro.net/pcm.phtml
CDK4AVR: http://cdk4avr.sourceforge.net/
CDK4NIOS: http://cdk4nios.sourceforge.net/
CDK4MSP: http://cdk4msp.sourceforge.net/
CPM4L: http://download.opensuse.org/repositories/home:/rexut:/CPM4L
--
ptxdist mailing list
[email protected]
