From 75e388fec81d2792505830206d90bc89a7c8a886 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Mon, 7 Feb 2022 12:14:24 +0100
Subject: [PATCH] Fix transmogrify; disable the DHCP server that runs on usb0

---
 packaging/packages/synit-config/files/sbin/synit-init.sh | 5 +++++
 transmogrify.sh                                          | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packaging/packages/synit-config/files/sbin/synit-init.sh b/packaging/packages/synit-config/files/sbin/synit-init.sh
index bf6401c..04909f7 100755
--- a/packaging/packages/synit-config/files/sbin/synit-init.sh
+++ b/packaging/packages/synit-config/files/sbin/synit-init.sh
@@ -22,4 +22,9 @@ mount -o rw,remount /
 mkdir -p /run/etc/syndicate/core
 mkdir -p /usr/local/etc/syndicate/core
 
+# This is a grody hack. We are replacing the infrastructure that sets up RNDIS, and in
+# particular we no longer want to run the DHCP server that PostmarketOS runs by default on
+# usb0. Instead we will be a DHCP client. (This was just easiest to set up.)
+killall unudhcpd || true
+
 exec /sbin/synit-pid1
diff --git a/transmogrify.sh b/transmogrify.sh
index 17d30d9..0a7cb5a 100755
--- a/transmogrify.sh
+++ b/transmogrify.sh
@@ -6,10 +6,15 @@ set -eu
 
 SUDOPASS=${SUDOPASS:-user}
 REBOOT_AFTER_TRANSMOGRIFY=${REBOOT_AFTER_TRANSMOGRIFY:-}
+http_proxy=${http_proxy:-http://10.0.2.2:3128/}
 
 if [ $(id -u) -ne 0 ]
 then
-    echo ${SUDOPASS} | sudo -S "REBOOT_AFTER_TRANSMOGRIFY=${REBOOT_AFTER_TRANSMOGRIFY}" "$0" "$@"
+    echo ${SUDOPASS} | \
+        sudo -S \
+             "http_proxy=${http_proxy}" \
+             "REBOOT_AFTER_TRANSMOGRIFY=${REBOOT_AFTER_TRANSMOGRIFY}" \
+             "$0" "$@"
     exit $?
 fi
 echo
@@ -18,7 +23,7 @@ cp synit-apk-key.pub /etc/apk/keys/.
 . /etc/deviceinfo
 ls packages/$deviceinfo_arch/
 
-http_proxy=http://10.0.2.2:3128/ apk add -X `pwd`/packages \
+apk add -X `pwd`/packages \
      preserves-tools \
      squeak-cog-vm \
      syndicate-sh \