From 25f7b33bf43e4d7a049eb1f4885d24f24ac1dca9 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 30 Dec 2013 03:55:15 +0100 Subject: partly remove infest into .graveyard moving host-patch for beaglebone --- .graveyard/infest/core/angstrom | 4 +++ .graveyard/infest/core/debian | 6 ++++ .graveyard/infest/host-patch/beagleboard/Makefile | 9 +++++ .../infest/host-patch/beagleboard/profile.patch | 42 ++++++++++++++++++++++ infest/core/angstrom | 4 --- infest/core/debian | 6 ---- infest/deploy-ssh-keys | 9 ----- infest/host-patch/beagleboard/Makefile | 9 ----- infest/host-patch/beagleboard/profile.patch | 42 ---------------------- ship/src/deploy-ssh-keys | 15 ++++++++ 10 files changed, 76 insertions(+), 70 deletions(-) create mode 100755 .graveyard/infest/core/angstrom create mode 100755 .graveyard/infest/core/debian create mode 100644 .graveyard/infest/host-patch/beagleboard/Makefile create mode 100644 .graveyard/infest/host-patch/beagleboard/profile.patch delete mode 100755 infest/core/angstrom delete mode 100755 infest/core/debian delete mode 100644 infest/deploy-ssh-keys delete mode 100644 infest/host-patch/beagleboard/Makefile delete mode 100644 infest/host-patch/beagleboard/profile.patch create mode 100644 ship/src/deploy-ssh-keys diff --git a/.graveyard/infest/core/angstrom b/.graveyard/infest/core/angstrom new file mode 100755 index 00000000..dafb840f --- /dev/null +++ b/.graveyard/infest/core/angstrom @@ -0,0 +1,4 @@ +#!/bin/sh + +opkg install vim vim-syntax +opkg install git diff --git a/.graveyard/infest/core/debian b/.graveyard/infest/core/debian new file mode 100755 index 00000000..fedd1ede --- /dev/null +++ b/.graveyard/infest/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/.graveyard/infest/host-patch/beagleboard/Makefile b/.graveyard/infest/host-patch/beagleboard/Makefile new file mode 100644 index 00000000..55952104 --- /dev/null +++ b/.graveyard/infest/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/.graveyard/infest/host-patch/beagleboard/profile.patch b/.graveyard/infest/host-patch/beagleboard/profile.patch new file mode 100644 index 00000000..d96173d7 --- /dev/null +++ b/.graveyard/infest/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/core/angstrom b/infest/core/angstrom deleted file mode 100755 index dafb840f..00000000 --- a/infest/core/angstrom +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -opkg install vim vim-syntax -opkg install git diff --git a/infest/core/debian b/infest/core/debian deleted file mode 100755 index fedd1ede..00000000 --- a/infest/core/debian +++ /dev/null @@ -1,6 +0,0 @@ -#!/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/deploy-ssh-keys b/infest/deploy-ssh-keys deleted file mode 100644 index 156e2795..00000000 --- a/infest/deploy-ssh-keys +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cd $(dirname $0) -U="${1:-$(id -u -n)}" -H="$(grep "^$U" /etc/passwd | cut -d : -f 6)" -echo "deploying for user $U to $H/.ssh" -mkdir -p $H/.ssh -cp -vr skel/home/.ssh/authorized_keys $H/.ssh -chown $U $H -chown -R $U $H/.ssh diff --git a/infest/host-patch/beagleboard/Makefile b/infest/host-patch/beagleboard/Makefile deleted file mode 100644 index 55952104..00000000 --- a/infest/host-patch/beagleboard/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -.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/infest/host-patch/beagleboard/profile.patch b/infest/host-patch/beagleboard/profile.patch deleted file mode 100644 index d96173d7..00000000 --- a/infest/host-patch/beagleboard/profile.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- /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/ship/src/deploy-ssh-keys b/ship/src/deploy-ssh-keys new file mode 100644 index 00000000..7eedb2cb --- /dev/null +++ b/ship/src/deploy-ssh-keys @@ -0,0 +1,15 @@ +#!/bin/sh +#@info +#@strict +#@include core +cd $(dirname $0) +U="${1:-$(id -u -n)}" +H="$(grep "^$U" /etc/passwd | cut -d : -f 6)" +krebsdir=${krebsdir:-/krebs} + +info "deploying for user $U to $H/.ssh" +mkdir -p $H/.ssh + +cp -vr $krebsdir/infest/skel/home/.ssh/authorized_keys $H/.ssh +chown $U $H +chown -R $U $H/.ssh -- cgit v1.2.3