Cleanup Makefile edit, add back lost cut-n-paste in init script
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
parent
f08fd93c25
commit
7884c022ac
|
@ -29,7 +29,6 @@ define Package/mjpg-streamer
|
||||||
CATEGORY:=Multimedia
|
CATEGORY:=Multimedia
|
||||||
TITLE:=MJPG-streamer
|
TITLE:=MJPG-streamer
|
||||||
DEPENDS:=+libpthread +libjpeg +PACKAGE_libv4l:libv4l
|
DEPENDS:=+libpthread +libjpeg +PACKAGE_libv4l:libv4l
|
||||||
#$(if $(CONFIG_MJPG_STREAMER_V4L2),+libv4l)
|
|
||||||
URL:=http://mjpg-streamer.wiki.sourceforge.net/
|
URL:=http://mjpg-streamer.wiki.sourceforge.net/
|
||||||
MENU:=1
|
MENU:=1
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -61,6 +61,10 @@ start_instance() {
|
||||||
|
|
||||||
config_get www "$s" 'www'
|
config_get www "$s" 'www'
|
||||||
[ -n "$www" ] && output_arg="${output_arg} --www $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
|
fi
|
||||||
|
|
||||||
if [ -z "$output_arg" ]; then
|
if [ -z "$output_arg" ]; then
|
||||||
|
|
Loading…
Reference in New Issue