Merge commit 'a89b5587e2601c6a325e7a748f392fb8025df515' into dora
This commit is contained in:
commit
155ee4768e
|
@ -0,0 +1,29 @@
|
||||||
|
# set the variables DNS_SERVER, DNS_DOMAIN or DNS_SEARCH in your image file
|
||||||
|
# and require this file afterwards
|
||||||
|
|
||||||
|
DNSSERVER = "${@d.getVar('DNS_SERVER', True) or ''}"
|
||||||
|
DNSDOMAIN = "${@d.getVar('DNS_DOMAIN', True) or ''}"
|
||||||
|
DNSSEARCH = "${@d.getVar('DNS_SEARCH', True) or ''}"
|
||||||
|
|
||||||
|
ROOTFS_POSTPROCESS_COMMAND += "set_static_dns;"
|
||||||
|
|
||||||
|
set_static_dns() {
|
||||||
|
echo "#created by image-static-dns.inc" > ${IMAGE_ROOTFS}/etc/resolv.conf
|
||||||
|
if [ -n "${DNSSERVER}" ]; then
|
||||||
|
printf "setting DNS-server\n"
|
||||||
|
echo "nameserver ${DNSSERVER}" >> ${IMAGE_ROOTFS}/etc/resolv.conf
|
||||||
|
fi
|
||||||
|
if [ -n "${DNSDOMAIN}" ]; then
|
||||||
|
printf "setting DNS-domain\n"
|
||||||
|
echo "domain ${DNSDOMAIN}" >> ${IMAGE_ROOTFS}/etc/resolv.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "${DNSSEARCH}" ]; then
|
||||||
|
printf "seting DNS-search\n"
|
||||||
|
echo "search ${DNSSEARCH}" >> ${IMAGE_ROOTFS}/etc/resolv.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -w ${IMAGE_ROOTFS}/default/udhcpc ]; then
|
||||||
|
sed -i -e "s/^#.*\(STATIC_DNS\).*$/\1=yes/g" ${IMAGE_ROOTFS}/default/udhcpc
|
||||||
|
fi
|
||||||
|
}
|
|
@ -2,11 +2,7 @@
|
||||||
. /etc/syslog-startup.conf
|
. /etc/syslog-startup.conf
|
||||||
|
|
||||||
# check if we want permanent log files and prepare /var/log
|
# check if we want permanent log files and prepare /var/log
|
||||||
if [ "${DESTINATION}" = "buffer" -a ! -h /var/log ]; then
|
if [ "${DESTINATION}" = "file" -a -h "/var/log" ]; then
|
||||||
rm -rf /var/log
|
|
||||||
cd /var
|
|
||||||
ln -s volatile/log log
|
|
||||||
elif [ "${DESTINATION}" = "file" -a -h "/var/log" ]; then
|
|
||||||
rm -rf /var/log
|
rm -rf /var/log
|
||||||
mkdir /var/log
|
mkdir /var/log
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,21 +1,25 @@
|
||||||
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
|
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
|
||||||
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
|
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
|
||||||
PRINC = "26"
|
PRINC = "27"
|
||||||
|
|
||||||
SRC_URI += "file://busybox-ifplugd.sh \
|
SRC_URI += "file://busybox-ifplugd.sh \
|
||||||
file://ifplugd.sh \
|
file://ifplugd.sh \
|
||||||
file://udhcpc-ntp.sh \
|
file://udhcpc-ntp.sh \
|
||||||
file://udhcpc-ntp.default \
|
file://udhcpc-ntp.default \
|
||||||
|
file://udhcpc.default \
|
||||||
"
|
"
|
||||||
|
|
||||||
PACKAGES =+ "${PN}-ifplugd ${PN}-udhcpc-ntp"
|
PACKAGES =+ "${PN}-ifplugd ${PN}-udhcpc-ntp"
|
||||||
|
|
||||||
|
FILES_${PN}-udhcpc += "${sysconfdir}/default/udhcpc"
|
||||||
|
|
||||||
FILES_${PN}-ifplugd = "${sysconfdir}/ifplugd.sh ${sysconfdir}/init.d/busybox-ifplugd.sh"
|
FILES_${PN}-ifplugd = "${sysconfdir}/ifplugd.sh ${sysconfdir}/init.d/busybox-ifplugd.sh"
|
||||||
|
|
||||||
FILES_${PN}-udhcpc-ntp = "${sysconfdir}/udhcpc.d/60ntp \
|
FILES_${PN}-udhcpc-ntp = "${sysconfdir}/udhcpc.d/60ntp \
|
||||||
${sysconfdir}/default/udhcpc-ntp \
|
${sysconfdir}/default/udhcpc-ntp \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
CONFFILES_${PN}-udhcpc += "${sysconfdir}/default/udhcpc"
|
||||||
CONFFILES_${PN}-udhcpc-ntp = "${sysconfdir}/default/udhcpc-ntp"
|
CONFFILES_${PN}-udhcpc-ntp = "${sysconfdir}/default/udhcpc-ntp"
|
||||||
|
|
||||||
INITSCRIPT_PACKAGES += "${PN}-ifplugd"
|
INITSCRIPT_PACKAGES += "${PN}-ifplugd"
|
||||||
|
@ -30,4 +34,5 @@ do_install_append() {
|
||||||
install -m 0755 ${WORKDIR}/udhcpc-ntp.sh ${D}/${sysconfdir}/udhcpc.d/60ntp
|
install -m 0755 ${WORKDIR}/udhcpc-ntp.sh ${D}/${sysconfdir}/udhcpc.d/60ntp
|
||||||
install -d ${D}/${sysconfdir}/default
|
install -d ${D}/${sysconfdir}/default
|
||||||
install -m 0644 ${WORKDIR}/udhcpc-ntp.default ${D}/${sysconfdir}/default/udhcpc-ntp
|
install -m 0644 ${WORKDIR}/udhcpc-ntp.default ${D}/${sysconfdir}/default/udhcpc-ntp
|
||||||
|
install -m 0644 ${WORKDIR}/udhcpc.default ${D}/${sysconfdir}/default/udhcpc
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,12 @@
|
||||||
|
|
||||||
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
|
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
RESOLV_CONF="/etc/resolv.conf"
|
RESOLV_CONF="/etc/resolv.conf"
|
||||||
|
|
||||||
|
[ -r /etc/default/udhcpc ] && . /etc/default/udhcpc
|
||||||
|
|
||||||
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
||||||
[ -n "$subnet" ] && NETMASK="netmask $subnet"
|
[ -n "$subnet" ] && NETMASK="netmask $subnet"
|
||||||
|
|
||||||
|
@ -64,22 +69,23 @@ case "$1" in
|
||||||
metric=$(($metric + 1))
|
metric=$(($metric + 1))
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
if [ "$STATIC_DNS" != "yes" ]; then
|
||||||
# Update resolver configuration file
|
# Update resolver configuration file
|
||||||
R=""
|
R=""
|
||||||
[ -n "$domain" ] && R="domain $domain
|
[ -n "$domain" ] && R="domain $domain
|
||||||
"
|
"
|
||||||
for i in $dns; do
|
for i in $dns; do
|
||||||
echo "$0: Adding DNS $i"
|
echo "$0: Adding DNS $i"
|
||||||
R="${R}nameserver $i
|
R="${R}nameserver $i
|
||||||
"
|
"
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -x /sbin/resolvconf ]; then
|
if [ -x /sbin/resolvconf ]; then
|
||||||
echo -n "$R" | /sbin/resolvconf -a "${interface}.udhcpc"
|
echo -n "$R" | /sbin/resolvconf -a "${interface}.udhcpc"
|
||||||
else
|
else
|
||||||
echo -n "$R" > "$RESOLV_CONF"
|
echo -n "$R" > "$RESOLV_CONF"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Uncomment the following line, if udhcpc should not touch /etc/resolv.conf
|
||||||
|
# STATIC_DNS="yes"
|
Loading…
Reference in New Issue