From 4fa3e59a99b5c526c51366ca952f219f3b6a5674 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 12:32:53 +0200 Subject: fixed aggressive bug, pulled install to core updated makefile accordingly to handle core installer --- Makefile | 9 +++------ core/angstrom | 1 - core/debian | 6 ++++++ infest/etc_aggressive | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) mode change 100644 => 100755 core/angstrom create mode 100755 core/debian diff --git a/Makefile b/Makefile index 4e374372..50e94bd2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ - +DIST = debian .PHONY: all all: select-target @@ -13,11 +13,8 @@ coop: infest/etc_coop infest/home -install-debian: - [ `which git` ] || apt-get install git-core - [ `which tmux` ] || apt-get install tmux - [ `which screen` ] && apt-get remote screen - [ `which vim` ] || apt-get install vim +install-core: + core/$(DIST) noise: make -C modules/noise infest diff --git a/core/angstrom b/core/angstrom old mode 100644 new mode 100755 index d89d5b32..dafb840f --- a/core/angstrom +++ b/core/angstrom @@ -2,4 +2,3 @@ opkg install vim vim-syntax opkg install git - diff --git a/core/debian b/core/debian new file mode 100755 index 00000000..fedd1ede --- /dev/null +++ b/core/debian @@ -0,0 +1,6 @@ +#!/bin/sh +set -x +[ `which git` ] || apt-get install --yes git-core +[ `which tmux` ] || apt-get install --yes tmux +[ `which screen` ] && apt-get remote --yes screen +[ `which vim` ] || apt-get install --yes vim diff --git a/infest/etc_aggressive b/infest/etc_aggressive index f0003aa5..d4352fb7 100755 --- a/infest/etc_aggressive +++ b/infest/etc_aggressive @@ -1,7 +1,7 @@ #! /bin/sh #prereqs -/krebs/infest/etc_coexistential +/krebs/infest/coop f=/etc/passwd sed -ri 's^(root:[^:]+):0:0:(.*)$\1:23:23:\2' $f -- cgit v1.2.3