Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-tools

jool-get-build-install.sh

@@ -8,10 +8,6 @@ version=4.0.6
 cat <<EOF
 Required for building:
 
-Devuan:
-- dkms
-- kernel headers for current kernel
-
 Alpine:
 
 apk add build-base libnl3-dev iptables-dev argp-standalone
@@ -22,6 +18,14 @@ LDFLAGS=-largp
 LDFLAGS=-largp ./configure
 LDFLAGS=-largp make
 make install
+
+Build requirements devuan:
+
+- dkms
+- kernel headers for current kernel
+
+apt install libnl-genl-3-dev libxtables-dev
+
 EOF
 
 wget -c https://github.com/NICMx/Jool/releases/download/v${version}/jool-${version}.tar.gz

rebuild-ipxe.sh

@@ -2,6 +2,9 @@
 # Nico Schottelius, 2019-09-20, Seoul, Coffebean, 23:56
 # Copying: GPLv3
 
+set -x
+set -e
+
 if [ ! -e ipxe ]; then
 	git clone git://git.ipxe.org/ipxe.git
 else
@@ -16,11 +19,12 @@ sed -i -e 's/^#undef.*NET_PROTO_IPV6/#define NET_PROTO_IPV6/' \
 	-e 's,^//#define PING_CMD,#define PING_CMD,' \
 	-e 's,^//#define NTP_CMD,#define NTP_CMD,' config/general.h
 
-set -x
-set -e
 
 mkdir -p output
 
+make bin/ipxe.iso
+cp bin/ipxe.iso output/
+
 make bin/undionly.kpxe
 cp bin/undionly.kpxe output/