* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
122 lines
3.0 KiB
Bash
Executable File
122 lines
3.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# udhcpc script edited by Tim Riker <Tim@Rikers.org>
|
|
|
|
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
|
|
|
|
RESOLV_CONF="/etc/resolv.conf"
|
|
[ -e $RESOLV_CONF ] || touch $RESOLV_CONF
|
|
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
|
[ -n "$subnet" ] && NETMASK="netmask $subnet"
|
|
# Handle stateful DHCPv6 like DHCPv4
|
|
[ -n "$ipv6" ] && ip="$ipv6/128"
|
|
|
|
if [ -z "${IF_WAIT_DELAY}" ]; then
|
|
IF_WAIT_DELAY=10
|
|
fi
|
|
|
|
wait_for_ipv6_default_route() {
|
|
printf "Waiting for IPv6 default route to appear"
|
|
while [ $IF_WAIT_DELAY -gt 0 ]; do
|
|
if [ -z "$(ip -6 route list | grep default)" ]; then
|
|
printf "\n"
|
|
return
|
|
fi
|
|
sleep 1
|
|
printf "."
|
|
: $((IF_WAIT_DELAY -= 1))
|
|
done
|
|
printf " timeout!\n"
|
|
}
|
|
|
|
case "$1" in
|
|
deconfig)
|
|
/sbin/ifconfig $interface up
|
|
/sbin/ifconfig $interface 0.0.0.0
|
|
|
|
# drop info from this interface
|
|
# resolv.conf may be a symlink to /tmp/, so take care
|
|
TMPFILE=$(mktemp)
|
|
grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
|
|
cat $TMPFILE > $RESOLV_CONF
|
|
rm -f $TMPFILE
|
|
|
|
if [ -x /usr/sbin/avahi-autoipd ]; then
|
|
/usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
|
|
fi
|
|
;;
|
|
|
|
leasefail|nak)
|
|
if [ -x /usr/sbin/avahi-autoipd ]; then
|
|
/usr/sbin/avahi-autoipd -c $interface || /usr/sbin/avahi-autoipd -wD $interface --no-chroot
|
|
fi
|
|
;;
|
|
|
|
renew|bound)
|
|
if [ -x /usr/sbin/avahi-autoipd ]; then
|
|
/usr/sbin/avahi-autoipd -c $interface && /usr/sbin/avahi-autoipd -k $interface
|
|
fi
|
|
/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
|
|
if [ -n "$ipv6" ] ; then
|
|
wait_for_ipv6_default_route
|
|
fi
|
|
|
|
# RFC3442: If the DHCP server returns both a Classless
|
|
# Static Routes option and a Router option, the DHCP
|
|
# client MUST ignore the Router option.
|
|
if [ -n "$staticroutes" ]; then
|
|
echo "deleting routers"
|
|
route -n | while read dest gw mask flags metric ref use iface; do
|
|
[ "$iface" != "$interface" -o "$gw" = "0.0.0.0" ] || \
|
|
route del -net "$dest" netmask "$mask" gw "$gw" dev "$interface"
|
|
done
|
|
|
|
# format: dest1/mask gw1 ... destn/mask gwn
|
|
set -- $staticroutes
|
|
while [ -n "$1" -a -n "$2" ]; do
|
|
route add -net "$1" gw "$2" dev "$interface"
|
|
shift 2
|
|
done
|
|
elif [ -n "$router" ] ; then
|
|
echo "deleting routers"
|
|
while route del default gw 0.0.0.0 dev $interface 2> /dev/null; do
|
|
:
|
|
done
|
|
|
|
for i in $router ; do
|
|
route add default gw $i dev $interface
|
|
done
|
|
fi
|
|
|
|
# drop info from this interface
|
|
# resolv.conf may be a symlink to /tmp/, so take care
|
|
TMPFILE=$(mktemp)
|
|
grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
|
|
cat $TMPFILE > $RESOLV_CONF
|
|
rm -f $TMPFILE
|
|
|
|
# prefer rfc3397 domain search list (option 119) if available
|
|
if [ -n "$search" ]; then
|
|
search_list=$search
|
|
elif [ -n "$domain" ]; then
|
|
search_list=$domain
|
|
fi
|
|
|
|
[ -n "$search_list" ] &&
|
|
echo "search $search_list # $interface" >> $RESOLV_CONF
|
|
|
|
for i in $dns ; do
|
|
echo adding dns $i
|
|
echo "nameserver $i # $interface" >> $RESOLV_CONF
|
|
done
|
|
;;
|
|
esac
|
|
|
|
HOOK_DIR="$0.d"
|
|
for hook in "${HOOK_DIR}/"*; do
|
|
[ -f "${hook}" -a -x "${hook}" ] || continue
|
|
"${hook}" "${@}"
|
|
done
|
|
|
|
exit 0
|