Fix transmogrify; disable the DHCP server that runs on usb0
This commit is contained in:
parent
810c015b21
commit
75e388fec8
|
@ -22,4 +22,9 @@ mount -o rw,remount /
|
||||||
mkdir -p /run/etc/syndicate/core
|
mkdir -p /run/etc/syndicate/core
|
||||||
mkdir -p /usr/local/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
|
exec /sbin/synit-pid1
|
||||||
|
|
|
@ -6,10 +6,15 @@ set -eu
|
||||||
|
|
||||||
SUDOPASS=${SUDOPASS:-user}
|
SUDOPASS=${SUDOPASS:-user}
|
||||||
REBOOT_AFTER_TRANSMOGRIFY=${REBOOT_AFTER_TRANSMOGRIFY:-}
|
REBOOT_AFTER_TRANSMOGRIFY=${REBOOT_AFTER_TRANSMOGRIFY:-}
|
||||||
|
http_proxy=${http_proxy:-http://10.0.2.2:3128/}
|
||||||
|
|
||||||
if [ $(id -u) -ne 0 ]
|
if [ $(id -u) -ne 0 ]
|
||||||
then
|
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 $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
echo
|
echo
|
||||||
|
@ -18,7 +23,7 @@ cp synit-apk-key.pub /etc/apk/keys/.
|
||||||
. /etc/deviceinfo
|
. /etc/deviceinfo
|
||||||
ls packages/$deviceinfo_arch/
|
ls packages/$deviceinfo_arch/
|
||||||
|
|
||||||
http_proxy=http://10.0.2.2:3128/ apk add -X `pwd`/packages \
|
apk add -X `pwd`/packages \
|
||||||
preserves-tools \
|
preserves-tools \
|
||||||
squeak-cog-vm \
|
squeak-cog-vm \
|
||||||
syndicate-sh \
|
syndicate-sh \
|
||||||
|
|
Loading…
Reference in New Issue