diff options
| author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-06-02 22:56:24 +0200 |
|---|---|---|
| committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-06-02 22:56:24 +0200 |
| commit | df46dc81676c33f0998ab9e1544c27a5e5e0588b (patch) | |
| tree | 0ad29aed31397e28097aced4274b21bfa50bcf91 | |
| parent | 5ff862e21c0c9930bd6078a5514e504277cc9a94 (diff) | |
| parent | 17b5e792b9968eeb100c00996c891c38c0f5d16d (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rwxr-xr-x | infest/bin/make-patch | 14 | ||||
| -rw-r--r-- | infest/skel/home/.ssh/authorized_keys | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/infest/bin/make-patch b/infest/bin/make-patch index 6f26e745..e2ef0ca0 100755 --- a/infest/bin/make-patch +++ b/infest/bin/make-patch @@ -36,22 +36,24 @@ diff -Naur $f $t >>$p readlink=`readlink -f $0` dirname=`dirname $readlink` -if pushd $dirname/../skel >/dev/null; then - if pushd etc >/dev/null; then +echo [32m$dirname/../skel[m >&2 +ls -l $dirname/../skel +if cd $dirname/../skel; then + if cd etc; then find . -mindepth 1 -maxdepth 1 -exec diff -Naur /etc/\{\} \{\} \; >>$p - popd >/dev/null + cd .. sed -i ' s:^+++ \./:+++ /etc/: ' $p fi - if pushd home >/dev/null; then + if cd home; then find . -type f -exec diff -Naur $HOME/\{\} \{\} \; >>$p - popd >/dev/null + cd .. sed -i ' s:^+++ \./:+++ '$HOME'/: ' $p fi - popd >/dev/null + cd .. fi cat $p diff --git a/infest/skel/home/.ssh/authorized_keys b/infest/skel/home/.ssh/authorized_keys index ab09bfe5..8bd54293 100644 --- a/infest/skel/home/.ssh/authorized_keys +++ b/infest/skel/home/.ssh/authorized_keys @@ -4,3 +4,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtDhAxjiCH0SmTGNDqmlKPug9qTf+IFOVjdXfk01lAV2K 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 ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQB2G4SpJ/UYxmTidUl8ytT6bdNGTdYvv2nmhQyaFBroNit3xdDOVxKvaMEGDuR6ncRugw5BBvrv6iPMTCFluHJxjuh6lk3JrrsJ8CT22ZOGsA593hRoXZOCrs5SxcFkw9EBiCuaHHlWiS9+Dffr6/zpkhH3djTz05uGnDrvtKuV/Zmu5XHAurNn+X3C5S/zk/y0n8o62iSQHVKeNBGO2WYhVce9d65Ucek5dOvXZYVKSe1LeAOKyeHWv+VWP8QlObmfVrQ5l1Pou6WV6Wpo85KBa/mmBJIygC9rrG+gx/1LX7JxStbCu/WoUlUwkSaP2qxWaET9KaSO8+2Wrg5i34ax== samuel@localhost +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTciEeSjcXQ++lfI262rGVVwRM8AJJxrxs+6tl51VGuIGJbIkm0ErO4T338FeXabsmK2T26ZD8CB3FGzm1fKiEaXqZPQzE1hib6n5mdbk1C3HjqXrGFCHui29Nayh+SEHfGwIBFhLGTfaJl9D1cllYjZ23TNQKRMZJO0o3XzrtSgBgS8FPG50+OY4J3MA+9WYkefTDCHOi22pWnTthYLSry35EizUuRxS2T0htKTMls/Tie0M15dN6mgr5104jO0c8IrBroAm9eLBoJl6DNbobLNqflMkiTaoQE6YCaxb1s12dSj9no2XSv/hEtQri9yZR82h+V1Qoypx3Kg6J+ZXf miefda@miefda901 |