Merge branch 'master' of https://github.com/krebscode/painload

Conflicts:
	minikrebs

6 files changed, 0 insertions, 81 deletions

diff --git a/minikrebs/profiles/instacam_yuv/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/instacam_yuv/customfiles/etc/config/mjpg-streamer
deleted file mode 100644
index 6feb6165..00000000
--- a/minikrebs/profiles/instacam_yuv/customfiles/etc/config/mjpg-streamer
+++ /dev/null
@@ -1,7 +0,0 @@
-config mjpg-streamer core
-        option enabled          "1"
-        option device           "/dev/video0"
-        option resolution       "640x480"
-        option fps              "10"
-        option www              "/www/webcam"
-        option port             "80"
diff --git a/minikrebs/profiles/instacam_yuv/customfiles/etc/config/network b/minikrebs/profiles/instacam_yuv/customfiles/etc/config/network
deleted file mode 100644
index c459c4e0..00000000
--- a/minikrebs/profiles/instacam_yuv/customfiles/etc/config/network
+++ /dev/null
@@ -1,9 +0,0 @@
-config interface 'loopback'
-        option ifname 'lo'
-        option proto 'static'
-        option ipaddr '127.0.0.1'
-        option netmask '255.0.0.0'
-
-config interface 'lan'
-        option ifname 'eth0'
-        option proto 'dhcp'
diff --git a/minikrebs/profiles/instacam_yuv/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/instacam_yuv/customfiles/etc/dropbear/authorized_keys
deleted file mode 120000
index 9c87fc52..00000000
--- a/minikrebs/profiles/instacam_yuv/customfiles/etc/dropbear/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-/root/.ssh/authorized_keys
\ No newline at end of file
diff --git a/minikrebs/profiles/instacam_yuv/customfiles/etc/init.d/mjpeg-streamer b/minikrebs/profiles/instacam_yuv/customfiles/etc/init.d/mjpeg-streamer
deleted file mode 100644
index aef12489..00000000
--- a/minikrebs/profiles/instacam_yuv/customfiles/etc/init.d/mjpeg-streamer
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2012 OpenWrt.org
-
-START=50
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-PROG=/usr/bin/mjpg_streamer
-
-error() {
-    echo "${initscript}:" "$@" 1>&2
-}
-
-section_enabled() {
-    config_get_bool enabled "$1" 'enabled' 0
-    [ $enabled -gt 0 ]
-}
-
-start_instance() {
-    local s="$1"
-
-    section_enabled "$s" || return 1
-
-    config_get device "$s" 'device'
-    config_get resolution "$s" 'resolution'
-    config_get fps "$s" 'fps'
-    config_get www "$s" 'www'
-    config_get port "$s" 'port'
-
-    [ -c "$device" ] || {
-        error "device '$device' does not exist"
-        return 1
-    }
-
-    # run in yuv (legacy) mode, impacts performance but at least something is happening
-    service_start /usr/bin/mjpg_streamer --input "input_uvc.so \
-        --device $device --fps $fps --resolution $resolution -yuv" \
-        --output "output_http.so --www $www --port $port"
-}
-
-stop_instance() {
-    local s="$1"
-
-    section_enabled "$s" || return 1
-
-    service_stop /usr/bin/mjpg_streamer
-}
-
-start() {
-    config_load 'mjpg-streamer'
-    config_foreach start_instance 'mjpg-streamer'
-}
-
-stop() {
-    config_load 'mjpg-streamer'
-    config_foreach stop_instance 'mjpg-streamer'
-}
diff --git a/minikrebs/profiles/instacam_yuv/customfiles/etc/rc.local b/minikrebs/profiles/instacam_yuv/customfiles/etc/rc.local
deleted file mode 100644
index 3e91b57c..00000000
--- a/minikrebs/profiles/instacam_yuv/customfiles/etc/rc.local
+++ /dev/null
@@ -1 +0,0 @@
-insmod uvcvideo
diff --git a/minikrebs/profiles/instacam_yuv/customfiles/etc/shadow b/minikrebs/profiles/instacam_yuv/customfiles/etc/shadow
deleted file mode 100644
index 9cc800dd..00000000
--- a/minikrebs/profiles/instacam_yuv/customfiles/etc/shadow
+++ /dev/null
@@ -1,5 +0,0 @@
-root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7:::
-daemon:*:0:0:99999:7:::
-ftp:*:0:0:99999:7:::
-network:*:0:0:99999:7:::
-nobody:*:0:0:99999:7:::