From daca8e958bb6e8e6d97e0121481874100e1d281e Mon Sep 17 00:00:00 2001
From: Felix Richter <Felix.Richter@syntax-fehler.de>
Date: Sat, 14 May 2011 20:29:20 +0200
Subject: added home infest/ partially fixed noise makefile

Makefile: infest/root now included
bootstrap.sh: now only prints what you have to do after deployment
infest/root: script which copies everything in root into original root
modules/noise/Makefile: fixed when no audio is available (by || true
  command)
root/ssh/authorized_keys: now in the correct path (shame on you tv!)
---
 Makefile                 | 1 +
 bootstrap.sh             | 7 ++++---
 infest/root              | 1 +
 modules/noise/Makefile   | 8 ++++----
 root/ssh/authorized_keys | 5 +++++
 5 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 infest/root
 create mode 100644 root/ssh/authorized_keys

diff --git a/Makefile b/Makefile
index b654217d..09b68293 100644
--- a/Makefile
+++ b/Makefile
@@ -6,4 +6,5 @@ all: select-target
 .PHONY: infest
 infest:
 	infest/etc
+	infest/root
 	make -C modules/noise infest
diff --git a/bootstrap.sh b/bootstrap.sh
index 3a1de4eb..433235e9 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -13,9 +13,10 @@ pacman -Sy git || \
 
 cd /krebs || { echo "cannot change into /krebs folder:(" ; exit 1; } || exit 1
 
-read -n1 -p "infest now? [yN]"
+#read -n1 -p "infest now? [yN]"
 
-[[ $REPLY = [yY] ]] && make infest 
-echo $REPLY
+#[[ $REPLY = [yY] ]] && make infest 
+#echo $REPLY
+echo "do 'make infest' in /krebs"
 echo "have a nice day"
 
diff --git a/infest/root b/infest/root
new file mode 100644
index 00000000..dedbafc8
--- /dev/null
+++ b/infest/root
@@ -0,0 +1 @@
+cp -r root /
diff --git a/modules/noise/Makefile b/modules/noise/Makefile
index ab9709ac..ea677185 100644
--- a/modules/noise/Makefile
+++ b/modules/noise/Makefile
@@ -8,9 +8,9 @@ infest:
 	f=/usr/bin/beep; chown krebs:krebs $$f && chmod 4755 $$f
 	getent passwd noise || useradd noise
 	ln -vsnf /krebs/modules/noise/init.d/noise /etc/init.d/noise
+	## tv: TODO update-rc.d is DEBIAN ONLY, fix this
 	update-rc.d -f noise defaults
-	##
-	amixer sset 'Master' 100 unmute
-	amixer sset 'PCM' 100 unmute
+	amixer sset 'Master' 100 unmute || true
+	amixer sset 'PCM' 100 unmute || true
 	amixer sset 'PC Speaker' 100 unmute || \
-	amixer sset 'Beep' 100 unmute
+	amixer sset 'Beep' 100 unmute || true
diff --git a/root/ssh/authorized_keys b/root/ssh/authorized_keys
new file mode 100644
index 00000000..4c4c8aed
--- /dev/null
+++ b/root/ssh/authorized_keys
@@ -0,0 +1,5 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl3RTOHd5DLiVeUbUr/GSiKoRWknXQnbkIf+uNiFO+XxiqZVojPlumQUVhasY8UzDzj9tSDruUKXpjut50FhIO5UFAgsBeMJyoZbgY/+R+QKU00Q19+IiUtxeFol/9dCO+F4o937MC0OpAC10LbOXN/9SYIXueYk3pJxIycXwUqhYmyEqtDdVh9Rx32LBVqlBoXRHpNGPLiswV2qNe0b5p919IGcslzf1XoUzfE3a3yjk/XbWh/59xnl4V7Oe7+iQheFxOT6rFA30WYwEygs5As//ZYtxvnn0gA02gOnXJsNjOW9irlxOUeP7IOU6Ye3WRKFRR0+7PS+w8IJLag2xb makefu@servarch
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3SFNYGRiH0oz44G51MWx+o4cC3Fj+ez5DKO5jjtEFZ0ik8XQ5CrVj7a87WbwABA/XRdIt+3WHoInsRmuDfgcIMYgWC567v2GdOxXg2danEIAhhsOY7KiCBLCfZz7lrFO7F6eJH1RCkwrXY+59hkA+i3LNtLmZazJIb2AGwFF8Xf+b/eWmLhqjCYON+OpvqftbCm9CwhLYOUcVoR94gFAzlMYSCHR7RuBBdLV6zrkmEwFEsKghBI7fcdhwfQxuV5UGVCD58KkTQTgK/Mf2tmAg/muBM+P8s2O6wVbtixmIiiDxfc99C3QD1MYVNHqWgV1Rz9JKfmyuVvFqn7TRuuT1 tv@also
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtDhAxjiCH0SmTGNDqmlKPug9qTf+IFOVjdXfk01lAV2KMVW00CgNo2d5kl5+6pM99K7zZO7Uo7pmSFLSCAg8J6cMRI3v5OxFsnQfcJ9TeGLZt/ua7F8YsyIIr5wtqKtFbujqve31q9xJMypEpiX4np3nLiHfYwcWu7AFAUY8UHcCNl4JXm6hsmPe+9f6Mg2jICOdkfMMn0LtW+iq1KZpw1Nka2YUSiE2YuUtV+V+YaVMzdcjknkVkZNqcVk6tbJ1ZyZKM+bFEnE4VkHJYDABZfELpcgBAszfWrVG0QpEFjVCUq5atpIVHJcWWDx072r0zgdTPcBuzsHHC5PRfVBLEw== makefu@arch
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== death@Uriel
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvZvfMwszjeUcmrs5Tpd4XJDVNDNUu3Qn3ZxgJzwuoys5LXxPcMikTO++dyrXl2kyexxgSMk6SZtuh34Xg0f9JDb5pN+DJwoeYv96lqTZ5QY4dn+1F0CoP+cK692GH14Kh1wBQyiL50Wj/iWR5/QHpRzrOLsepcZim1nL9FjsW6S2l+uDnUwC4x1EhsRezqJESJlqEsiS+kbhtiPybs7KcY0U4SkpYjfNjlpFE9eLrvSouoyQOUcIVjplcGIma/SVOVYWng4wQA0d5TkCAWAU0OZb0377KynDa7F8K/wN0hRGLGZGFbs3kNDJHqR1lt+sals8M6JO7qk1VVJJj1OsUw== pfleidi@pfleidimobile
-- 
cgit v1.2.3