diff options
| author | makefu <root@pigstarter.de> | 2013-01-14 00:50:15 +0000 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2013-01-14 00:50:15 +0000 |
| commit | a2195f3c9f382acebcf49b3043944f34609e4550 (patch) | |
| tree | c542ab73193cd81ecd6482806c05b2fb6560cdae /minikrebs/profiles/usbbridge/customfiles/etc | |
| parent | b6144a1e1b24a82d479741edd12fa3ad7a744c58 (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'minikrebs/profiles/usbbridge/customfiles/etc')
| -rw-r--r-- | minikrebs/profiles/usbbridge/customfiles/etc/config/mjpg-streamer | 7 | ||||
| -rw-r--r-- | minikrebs/profiles/usbbridge/customfiles/etc/shadow | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/minikrebs/profiles/usbbridge/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/usbbridge/customfiles/etc/config/mjpg-streamer deleted file mode 100644 index bb4f81ec..00000000 --- a/minikrebs/profiles/usbbridge/customfiles/etc/config/mjpg-streamer +++ /dev/null @@ -1,7 +0,0 @@ -config mjpg-streamer core - option enabled "1" - option device "/dev/video0" - option resolution "1280x1024" - option fps "5" - option www "/www/webcam" - option port "80" diff --git a/minikrebs/profiles/usbbridge/customfiles/etc/shadow b/minikrebs/profiles/usbbridge/customfiles/etc/shadow index 251abaf5..9cc800dd 100644 --- a/minikrebs/profiles/usbbridge/customfiles/etc/shadow +++ b/minikrebs/profiles/usbbridge/customfiles/etc/shadow @@ -1,4 +1,4 @@ -root:$1$spkPLKf6$KEM1l1DgouvYjeBfkT2wW1:0:0:99999:7::: +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::: |