diff options
| author | Jan Huwald <jh@sotun.de> | 2012-03-30 12:10:53 (GMT) |
|---|---|---|
| committer | Jan Huwald <jh@sotun.de> | 2012-03-30 12:10:53 (GMT) |
| commit | 4a363eb470863bad2f2db2249f79da34ef78a586 (patch) | |
| tree | 311b1b997662ecc9c53001318978165008bb69b4 | |
| parent | bc8d550c1d1927f27fbaf9a3790e6f8bfd56fd6f (diff) | |
| parent | 9434457bdd500cc27e845cba5bf727b58a5c90b3 (diff) | |
Merge branch 'plugnpray' of git.freifunk-jena.de:freifunk/ffj-buildroot-v2 into plugnpray
| -rw-r--r-- | config/trunk | 2 | ||||
| -rw-r--r-- | files/common/etc/dropbear/authorized_keys | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/trunk b/config/trunk index 7577061..387d952 100644 --- a/config/trunk +++ b/config/trunk @@ -52,7 +52,7 @@ CONFIG_PACKAGE_libip6tc=y CONFIG_PACKAGE_libpthread=y CONFIG_PACKAGE_librpc=y CONFIG_PACKAGE_librt=y -CONFIG_PACKAGE_n2n=y +CONFIG_PACKAGE_n2n=m # CONFIG_PACKAGE_ppp is not set # CONFIG_PACKAGE_uboot-envtools is not set CONFIG_PACKAGE_udp-broadcast=y diff --git a/files/common/etc/dropbear/authorized_keys b/files/common/etc/dropbear/authorized_keys index fb20e88..4e6310a 100644 --- a/files/common/etc/dropbear/authorized_keys +++ b/files/common/etc/dropbear/authorized_keys @@ -5,7 +5,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAufrdEwZmNJhcdxBkBepD/cjCkrxTdM6nC7Mtommvbyri # Darkeye (Freifunk Jena) - mobile ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB7QDvtIcbm2u4bnMVrQro+iFkQEsAHC/nbk8I/V85CpZObiofVWD7xJd/UMU9zxhWJ2UG+aVThNX9vwSHfmBYMfMljFXIRG8vo94uVZmEUvgfMDXAoOE7EhLBXGAx+Z1f4/rwoTWE0b/Nb/CfnxfDTbNYQgrjx9pyMY6CtYMddqjsBmq9ZzO/w4+WUZJXIy7imWkKna7czG20AMUNuo7AvcOlU1rgZIVyi2hN31DvuJNLSDXSDCkxMwcV0iukYnNiGk7N/xReBLKHbp9aUk0/TOr+H7cBjQwkXZPheoPsq3CZfolHQiQxjMGwFQlw+ZnrURDaOGFU6u1sAWZDwj2DaFh4YFaPHH8gKJvsE0vjxzWCc3vmFctCLwGLeLoc7Ghz35q066LX9i972w9HQ1YRcrKLAGDmhkzAQqaX3dT7bsgvylTi+nvhr0iYZ9wg44TDd+KGfm+BHtXOxCmr4MzJWOooQi83gr7ZoqGL3rwK8t2dDDORA9sb6sAe+Srj0GXUxbIRWmJY99JOlIocBGRzsUQ08kulsNryQrgk5iwxqSZy0TAGVisZ2Uz5SfNSYbpKLn3IbNtl2TPvFazdMb0RfXhZpcxoPgbf6UmQBQJdI11e6ga6Evn5KIIT6GvtQQDxwdyn/CggEbnXj20nAp8== # egon0 (Freifunk Jena) - mobile -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYdPDqvxN2+oZQr1QEAgcpFgRq7QAk6lNT4f5mFiDII07tlx7KMgWGX5C3hbgHpJgVWXx9uC5aB0qQOO8h0KV0AODQDz9bu7P9SvmpZt0isXzV5jh+b/lzMfwlzZt0tmqOUxzN6JkzBfsaQjMEViSsu/bhQG0nPehiEVykrJeMVPngX9hfA6UMj04hhkUY0bG+ET1JpUCSSXKkvPJHKOfGa9gPeZewSasGnxjwzQ5M2Ikn4CtQuDCIrVnjEvb/rAH3So9TSjV31dx10O6vYY2qAnS/oviQSN9NP729CQLSCaBFv4Z5I7WJaXAxkYSRvC8fzTq62nOXWi3rWg2jfSnsbyEkqQGJ5z6ZaiDIi2tHuXfVoLlCdnaVmgPtQuhGQLamrnOvvn+PJBptPgGWl74g/H/UEsT0v60c6jgfp5jtrEk25Bgk7QITp/aykRf6uGjEfwnatZSs43D2y9TU6EPH0oy2tN0MI+XKU2PwoXme1BwAhpKPawnNY495BmLqyn0u3Fr8C1IqD2nCaLhk8OGVEW3BZAy2wdb2V1huTq0SkEMhILrDLKslZwGpO2mtMRrHwAhk6S220zSOH+B9seNK7P42pNBc0pqP6rJrVRxfjpq/+fA4wjE+ojQagQhTAHuK/SsA79gE/vTtlRGOy2nW7D5hmidaiiqptTxuTENULQ== galaxy +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmtCmochVLtVGQYc+NBVwQUPSfzth6chAAV6/LiMJ5aT80Mnrihhz49FDoXGzkGgMeJud8c09llZTpFsxpS37ExzqiNclojM3ImrtTF43k0l9tatMUXFtCBsRh4fKpJjbnWlvnv6CjdLkcaTITr4Y+ecBGKSKGoLK6qiVYssfuWmy4I3/o9nwrIAqah3bUR4yjwcoo7e7qyKzck9EjDon1H/SOJsp2UuAGqC0JX6Nwr0tTriZ9ef70F4xHMBglebq1vhsKg2+8PVeMrbYGAv45GjmRwywGEZ4n18ehep+b//++4ZwDGVtcUOzMPhVNsvK23kdNNEKYYm+Tsl8ykaRkXYBB3s38fGuoTofaZXVf5s+6a8DWeTmahqWaskHR4mBNmESu2js4bWvgH+MO9Yi+vYRz/jwgfNl30Q0C9hGtpgIu/6DglHb3Ss948vl5GGi5/iFkpDJmCiheOzs+i3xzxB2yb9cQxNFuJAgI2SNUQ63068J54IILl+WC2VZrIURR7VVaGspq3JYGDEsLSd5uOHFAx36n/CrlQBsbcy2yQYZ8ZE06rahaxAhlvz3LT1M9gUF6hy5MV3lzDkVnMER2nnS6dJZ1ViktwvuwqSSpOXmCBlXVSktSVSlT32Ym295FGyJpqUFrNd/rTwb1SX7arK0YSANRo+Q4k3O1qEEtaw== # jh ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDtvCFJeNxdBPx2GU6KYkLdCapwCFeWplMSF6gpY+zwn8c8IJT5D6Il5fkLjvlgk6r80J1xn6pJT9NURxtGI5htGSN9m0WBF1WNpom5NMiRweduAEdLDiLaIxG6XOubOEXpPVeNxOCad2L42Njw1D121Dl8Q1ec6HOaj3T99qDEulHXkxxP7EMQLzcuyBpJk5hyqYGpljIIS4DwgUn6nnMf098BOtD8hCPrCEcFVA3uutyA5FTByel3D8iBROIFi6twRBRbsVVLxToXgUF8TavBwt8LNI2FFHe2GO9WfzhCZCbaj3WvsDgA5VwFOAwbJremlSIPfHQ9JER6TwQpMkBMH1EstK8moNHe9roHpjHUArJxHLoLSzwZdhDlS3u1Qfftrh0KjVkOaCNjfhFsQbIfD/MsMl7E1lXlnoIsaPysszuvGaoV2ocWoeR9ocIldz1cpqFa5j0h/GsEuwGjl7Fd8dS4ZisqtJ2M7DbJkJrFB0Dw3dSTw9FRzDwm1gK2B9QGEc+XACTxp9Nb8bbPb87RKU07D/RwJ1ZhYyEa6l/TxkyTUsuvfexWB2I3QGCL+xhb/V/JYQzjO38AODCG10l0ulmNUXDEkv7qs7gmGjgvR362go4qRWV0vq8OkGpy+FJkl94ATlcXIbNGPNYA2wbB+/sd5s/L9ErgYBqFd+SIhQ== # jh |