minor improvements

diff --git a/fai/config/files/etc/apt/sources.list.d/bookworm.list/BOOKWORM_FREE b/fai/config/files/etc/apt/sources.list.d/bookworm.list/BOOKWORM_FREE
new file mode 100644 (file)
index 0000000..d117ba2
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/bookworm.list/BOOKWORM_FREE
@@ -0,0 +1,11 @@
+deb http://deb.debian.org/debian bookworm main
+deb-src http://deb.debian.org/debian bookworm main
+
+deb http://security.debian.org/ bookworm-security main
+deb-src http://security.debian.org/ bookworm-security main
+
+deb http://deb.debian.org/debian bookworm-updates main
+deb-src http://deb.debian.org/debian bookworm-updates main
+
+deb http://http.debian.net/debian bookworm-backports main
+deb-src http://http.debian.net/debian bookworm-backports main

diff --git a/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_FREE b/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_FREE
index 031bddf61888326bf40f3b423e60195cca40f50a..c53dec4f4f56364ee29c5b38fc1fe431f5895e96 100644 (file)
--- a/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_FREE
+++ b/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_FREE
@@ -1,11 +1,11 @@
-deb http://http.us.debian.org/debian testing main
-deb-src http://http.us.debian.org/debian testing main
+deb http://deb.debian.org/debian testing main
+deb-src http://deb.debian.org/debian testing main
 
-deb http://security.debian.org/ testing/updates main
-deb-src http://security.debian.org/ testing/updates main
+deb http://deb.debian.org/debian-security/ testing-security main
+deb-src http://deb.debian.org/debian-security/ testing-security main
 
-deb http://http.us.debian.org/debian testing-updates main
-deb-src http://http.us.debian.org/debian testing-updates main
+deb http://deb.debian.org/debian testing-updates main
+deb-src http://deb.debian.org/debian testing-updates main
 
 deb http://http.us.debian.org/debian unstable main
 deb-src http://http.us.debian.org/debian unstable main

diff --git a/wrt-setup b/wrt-setup
index 01c270515ab868c416fd4647e0a6e6c157ed15f0..d229af1be93a58db31e642e0f04ba3deed5f1cee 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -69,8 +69,8 @@ if [[ ! $h ]]; then
 fi
 
 echo "$0: h=$h"
-
-cat ~/.ssh/home.pub | ssh $h dd of=/etc/dropbear/authorized_keys 2>/dev/null
+# todo: ecdsa key not working with dropbear
+#cat ~/.ssh/h.pub | ssh $h dd of=/etc/dropbear/authorized_keys 2>/dev/null
 scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
 # relay is built for openwrt 18.06.2, r7676-cddd7b4c77