summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile13
-rwxr-xr-xinfest/etc_aggressive8
-rwxr-xr-xmodules/streams/deepmix24
3 files changed, 18 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 50e94bd2..22b032ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,19 @@
DIST = debian
-.PHONY: all
+.PHONY: infest it all so aggressive coop
all: select-target
-.PHONY: infest aggressive coop
-
-infest: aggressive
-aggressive:
+it: so
+so: it coop
+aggressive: coop
infest/etc_aggressive
- infest/home
coop:
infest/etc_coop
infest/home
+# compatibility
+infest: aggressive
+
install-core:
core/$(DIST)
diff --git a/infest/etc_aggressive b/infest/etc_aggressive
index 8fa2a570..23d8caaa 100755
--- a/infest/etc_aggressive
+++ b/infest/etc_aggressive
@@ -1,27 +1,19 @@
#! /bin/sh
-#prereqs
-/krebs/infest/coop
-
f=/etc/passwd
sed -ri 's^(root:[^:]+):0:0:(.*)$\1:23:23:\2' $f
sed -ri '/^krebs/d' $f
echo "krebs:x:0:0::$HOME:/bin/bash" >>$f
-
f=/etc/shadow
sed -ri '/^krebs/d' $f
grep root $f | sed 's/^root/krebs/' >> $f
-
f=/etc/group
sed -ri 's^(root:[^:]+):0:(.*)$\1:23:\2' $f
sed -ri '/^krebs/d' $f
echo 'krebs:x:0:' >>$f
-
-# TMPFS for tmp and log
-
if ! grep -q 'none[ \t]*/tmp' /etc/fstab; then
echo 'none /tmp tmpfs defaults,size=50M 0 0' >>/etc/fstab
fi
diff --git a/modules/streams/deepmix b/modules/streams/deepmix
index 55f641e4..8b13bed6 100755
--- a/modules/streams/deepmix
+++ b/modules/streams/deepmix
@@ -1,20 +1,18 @@
#! /bin/bash
set -euf
-function stop()
-{
- pkill mplayer || true
+CMD="while :; do mplayer http://deepmix.ru/deepmix128.pls; done"
+function start() {
+ stop
+ tmux list-sessions &&
+ tmux new-window "$CMD" ||
+ tmux new-session "$CMD"
+}
+function stop() {
+ pkill mplayer || :
}
-
-CMD="while true; do exec mplayer http://deepmix.ru/deepmix19.pls ; sleep 1;done"
case "$1" in
start)
- stop
- if tmux list-sessions;
- then
- tmux new-window "$CMD" &
- else
- tmux new-session "$CMD" &
- fi
+ start
;;
stop)
stop
@@ -25,5 +23,5 @@ case "$1" in
;;
*)
echo "aidsballs"
- ;;
+ ;;
esac