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

4 files changed, 27 insertions, 17 deletions

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 /