summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShepherd <root@shepherd.shack>2011-05-25 23:54:30 +0100
committerShepherd <root@shepherd.shack>2011-05-26 00:00:06 +0100
commit54f8f1d6b9d5f7b8056cb40ed92d2b10d08415ea (patch)
tree801e1058b6d904146507c7a340fb4cbf12e08a92
parent2696820e647014f84f00234710d21621b4613886 (diff)
added cooperative infest/host-based patches
updated Makefile to handle new coop behavior added core installation files in core/ (install all the funky shit you will most likely need with the packet manager available renamed /root into /home added host-based patches added moved /infest/etc to /infest/etc_coop and etc_aggressive does the right thing now
-rw-r--r--Makefile12
-rw-r--r--core/angstrom5
-rw-r--r--home/.ssh/authorized_keys (renamed from root/.ssh/authorized_keys)0
-rw-r--r--home/.vimrc (renamed from root/.vimrc)0
-rw-r--r--host-patch/beagleboard/Makefile9
-rw-r--r--host-patch/beagleboard/profile.patch42
-rwxr-xr-xinfest/etc_aggressive (renamed from infest/etc)19
-rwxr-xr-xinfest/etc_coop20
-rwxr-xr-xinfest/home4
-rwxr-xr-xinfest/root1
10 files changed, 92 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index d31a7c9d..7e5641e3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,16 @@
.PHONY: all
all: select-target
+.PHONY: aggressive
+.PHONY: coop
.PHONY: infest
-infest:
- infest/etc
- infest/root
+infest: aggressive
+aggressive:
+ infest/etc_aggressive
+ infest/home
+coop:
+ infest/etc_coop
+ infest/home
install-debian:
[ `which git` ] || apt-get install git-core
diff --git a/core/angstrom b/core/angstrom
new file mode 100644
index 00000000..d89d5b32
--- /dev/null
+++ b/core/angstrom
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+opkg install vim vim-syntax
+opkg install git
+
diff --git a/root/.ssh/authorized_keys b/home/.ssh/authorized_keys
index 4c4c8aed..4c4c8aed 100644
--- a/root/.ssh/authorized_keys
+++ b/home/.ssh/authorized_keys
diff --git a/root/.vimrc b/home/.vimrc
index 22bbf99d..22bbf99d 100644
--- a/root/.vimrc
+++ b/home/.vimrc
diff --git a/host-patch/beagleboard/Makefile b/host-patch/beagleboard/Makefile
new file mode 100644
index 00000000..55952104
--- /dev/null
+++ b/host-patch/beagleboard/Makefile
@@ -0,0 +1,9 @@
+.PHONY: all
+all: select-target
+
+patchfile:
+ diff /krebs/etc/profile /etc/profile > profile.patch || true
+
+patch:
+ cd /;\
+ patch -p0 < /krebs/host-patch/beagleboard/profile.patch
diff --git a/host-patch/beagleboard/profile.patch b/host-patch/beagleboard/profile.patch
new file mode 100644
index 00000000..d96173d7
--- /dev/null
+++ b/host-patch/beagleboard/profile.patch
@@ -0,0 +1,42 @@
+--- /krebs/etc/profile Tue May 24 19:31:39 2011
++++ /etc/profile Tue May 24 20:15:17 2011
+@@ -11,26 +11,13 @@
+ alias la='ls -lA'
+ alias lAtr='ls -lAtr'
+ alias ll='ls -l'
+-alias ls='ls -h --color=auto --group-directories-first'
++alias ls='ls -h --color=auto'
+ alias vi='vim'
+ alias vim='vim -p'
+ alias view='vim -R'
+
+ set -o notify
+
+-if test -n "${BASH_VERSION-}" ; then
+- shopt -s checkhash
+- shopt -s histappend histreedit histverify
+- shopt -s no_empty_cmd_completion
+- complete -d cd
+-
+- function comp_sch() {
+- local cword="${COMP_WORDS[$COMP_CWORD]}"
+- COMPREPLY=( $(sch -l "$cword.*" ) )
+- }
+- complete -F comp_sch sch
+-fi
+-
+ export HISTSIZE='65536'
+ export HISTFILESIZE="$HISTSIZE"
+ export HISTCONTROL='ignoredups'
+@@ -43,10 +30,7 @@
+ PS1='\[\033[${PS1_COLOR}m\]$(PS1)\[\033[32m\]\w\[\033[39m\]${PSx-} ' # green \w
+ PS1='\[\033[32m\]\w\[\033[m\] ' # green \w
+
+-if test -n "${SSH_CLIENT-}" ; then
+- PS1='\[\033[35m\]\h'" $PS1" # prefix with magenta hostname
+- #TERM=xterm-256color xtermcontrol --bg \#292d29 --fg \#d0d0d0
+-fi
++PS1='\[\033[35m\]\h'" $PS1" # prefix with magenta hostname
+
+ export PATH="/krebs/bin:$PATH"
+
diff --git a/infest/etc b/infest/etc_aggressive
index 78ce8d06..f0003aa5 100755
--- a/infest/etc
+++ b/infest/etc_aggressive
@@ -1,22 +1,12 @@
#! /bin/sh
-cat>/etc/motd.tail<<EOF
-KREBS PAINLOAD (MORE COBRA)
- x x x x
- xx xx xx xx xx xx
- xx xx xx xx xx xx
- xxx x x xxx
- x xxxxxxxxxxxx x
- xxxxxxxxxxxxxxxx
- x xxxxxxxxxxxx x
- x x x x x x
- x x x x x x
-EOF
+#prereqs
+/krebs/infest/etc_coexistential
f=/etc/passwd
sed -ri 's^(root:[^:]+):0:0:(.*)$\1:23:23:\2' $f
sed -ri '/^krebs/d' $f
-echo 'krebs:x:0:0::/root:/bin/bash' >>$f
+echo "krebs:x:0:0::$HOME:/bin/bash" >>$f
f=/etc/shadow
@@ -29,9 +19,6 @@ sed -ri 's^(root:[^:]+):0:(.*)$\1:23:\2' $f
sed -ri '/^krebs/d' $f
echo 'krebs:x:0:' >>$f
-for i in etc/*; do
- cat $i > /$i
-done
# TMPFS for tmp and log
diff --git a/infest/etc_coop b/infest/etc_coop
new file mode 100755
index 00000000..2ee05d04
--- /dev/null
+++ b/infest/etc_coop
@@ -0,0 +1,20 @@
+#! /bin/sh
+set -x
+cat>/etc/motd.tail<<EOF
+KREBS PAINLOAD (MORE COBRA)
+ x x x x
+ xx xx xx xx xx xx
+ xx xx xx xx xx xx
+ xxx x x xxx
+ x xxxxxxxxxxxx x
+ xxxxxxxxxxxxxxxx
+ x xxxxxxxxxxxx x
+ x x x x x x
+ x x x x x x
+EOF
+
+for i in etc/*; do
+ cat $i > /$i
+done
+
+set +x
diff --git a/infest/home b/infest/home
new file mode 100755
index 00000000..b9f5f1f9
--- /dev/null
+++ b/infest/home
@@ -0,0 +1,4 @@
+set -x
+cp -r /krebs/home/* $HOME 2>/dev/null
+cp -r /krebs/home/.* $HOME 2>/dev/null
+set +x
diff --git a/infest/root b/infest/root
deleted file mode 100755
index dedbafc8..00000000
--- a/infest/root
+++ /dev/null
@@ -1 +0,0 @@
-cp -r root /