Commit b98dd235 authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Thomas Petazzoni
Browse files

busybox: improve support for telnetd 



If target has connection to the network it might be pretty useful to
have telnet connection to it instead of serial console or even in
addition to serial console.

This changes makes the busybox package automatically install an init
script, and tune the securetty file to make telnetd work when
CONFIG_FEATURE_TELNETD_STANDALONE is enabled in the Busybox
configuration.

[Thomas:
  - don't create a new Buildroot Config.in option, just test if
    CONFIG_FEATURE_TELNETD_STANDALONE is enabled or not in the Busybox
    configuration
  - move the securetty tuning in busybox.mk instead of system.mk
  - use start-stop-daemon in the init script, in order to properly
    implement the stop and restart actions
  - misc other minor improvements in the init script.]
[yann.morin.1998@free.fr:
  - don't use securetty
  - drop stray variable BUSYBOX_SET_STANDALONE_TELNETD]

Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarYann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c1c7e8b7

package/busybox/S50telnet

0 → 100755
+36 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

# Start telnet....

#



start() {

      echo -n "Starting telnetd: "

      start-stop-daemon -S -q -m -b -p /var/run/telnetd.pid \

			-x /usr/sbin/telnetd -- -F

      [ $? = 0 ] && echo "OK" || echo "FAIL"

}



stop() {

	echo -n "Stopping telnetd: "

	start-stop-daemon -K -q -p /var/run/telnetd.pid \

			  -x /usr/sbin/telnetd

	[ $? = 0 ] && echo "OK" || echo "FAIL"

}



case "$1" in

    start)

	start

	;;

    stop)

	stop

	;;

    restart|reload)

	stop

	start

	;;

  *)

	echo "Usage: $0 {start|stop|restart}"

	exit 1

esac



exit $?

package/busybox/busybox.mk

+9 −0
Original line number Diff line number Diff line
@@ -168,6 +168,14 @@ endef 
BUSYBOX_DEPENDENCIES += linux-pam

endif



# Telnet support

define BUSYBOX_INSTALL_TELNET_SCRIPT

	if grep -q CONFIG_FEATURE_TELNETD_STANDALONE=y $(@D)/.config; then \

		$(INSTALL) -m 0755 -D package/busybox/S50telnet \

			$(TARGET_DIR)/etc/init.d/S50telnet ; \

	fi

endef



# Enable "noclobber" in install.sh, to prevent BusyBox from overwriting any

# full-blown versions of apps installed by other packages with sym/hard links.

define BUSYBOX_NOCLOBBER_INSTALL
@@ -205,6 +213,7 @@ define BUSYBOX_INSTALL_INIT_SYSV 
	$(BUSYBOX_INSTALL_MDEV_SCRIPT)

	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)

	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)

	$(BUSYBOX_INSTALL_TELNET_SCRIPT)

endef



$(eval $(kconfig-package))