From 7884c022acdce8c13eaeea8108822122b2131027 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Tue, 22 Jul 2014 15:42:23 -0400 Subject: [PATCH] Cleanup Makefile edit, add back lost cut-n-paste in init script Signed-off-by: Ted Hess --- multimedia/mjpg-streamer/Makefile | 1 - multimedia/mjpg-streamer/files/mjpg-streamer.init | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index 7323a5d649..60b56553f8 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -29,7 +29,6 @@ define Package/mjpg-streamer CATEGORY:=Multimedia TITLE:=MJPG-streamer DEPENDS:=+libpthread +libjpeg +PACKAGE_libv4l:libv4l -#$(if $(CONFIG_MJPG_STREAMER_V4L2),+libv4l) URL:=http://mjpg-streamer.wiki.sourceforge.net/ MENU:=1 endef diff --git a/multimedia/mjpg-streamer/files/mjpg-streamer.init b/multimedia/mjpg-streamer/files/mjpg-streamer.init index 550ea4d2f2..eebd4f84a7 100644 --- a/multimedia/mjpg-streamer/files/mjpg-streamer.init +++ b/multimedia/mjpg-streamer/files/mjpg-streamer.init @@ -61,6 +61,10 @@ start_instance() { config_get www "$s" 'www' [ -n "$www" ] && output_arg="${output_arg} --www $www" + + config_get username "$s" 'username' + config_get password "$s" 'password' + [ -n "$username" ] && [ -n "$password" ] && output_arg="${output_arg} --credentials $username:$password" fi if [ -z "$output_arg" ]; then