Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...
details: https://anonhg.NetBSD.org/src/rev/8a7536121139
branches: netbsd-7
changeset: 799321:8a7536121139
user: snj <snj%NetBSD.org@localhost>
date: Thu May 14 07:11:53 2015 +0000
description:
Pull up following revision(s) (requested by martin in ticket #759):
distrib/amd64/cdroms/Makefile.cdrom: revision 1.12
distrib/amd64/installimage/Makefile: revision 1.5
distrib/amd64/installimage/spec.inst: revision 1.2
distrib/common/10-resolv.conf: file removal
distrib/common/99-print-sysinst: file removal
distrib/common/Makefile.dhcpcd: revision 1.2
distrib/common/list.dhcpcd: revision 1.3
distrib/i386/cdroms/Makefile.cdrom: revision 1.32
distrib/i386/installimage/Makefile: revision 1.5
distrib/i386/installimage/spec.inst: revision 1.2
distrib/sparc64/cdroms/installcd/Makefile: revision 1.20
distrib/vax/cdroms/installcd/Makefile: revision 1.10
usr.sbin/sysinst/msg.mi.de: revision 1.4
usr.sbin/sysinst/msg.mi.en: revision 1.4
usr.sbin/sysinst/msg.mi.es: revision 1.4
usr.sbin/sysinst/msg.mi.fr: revision 1.4
usr.sbin/sysinst/msg.mi.pl: revision 1.4
usr.sbin/sysinst/net.c: revisions 1.5-1.8, 1.11-1.15
The dhcpcd utilties in pkgsrc require dhcpcd to be running in master mode.
So set dhcpcd to start like so, but restrict it to the configured interface
still instead of ifconfig_foo=dhcp.
--
Use the 20-resolv.conf hook from dhcpcd rather than the minimal one.
Extract configured information from resolv.conf and hostname instead
of scraping the last dhcpcd script run.
This will allow the use of DHCPv6 and IPv6RA DNS details in the future.
--
dhcpcd will already have configured the system at this point, so
don't bother writing it manually.
--
Don't prompt for hostname or domain if obtained from DHCP.
--
Change the display order so it's protocol agnostic at the top,
then IPv4 then IPv6.
--
Strip newline from the gateway correctly.
--
Show the IP6 address instead of yes
--
Fix a bogus gcc warning: dhcp_config may be used uninitialized
--
Punt custom dhcpcd hooks in favour up upstream hooks
--
For the benefit of gcc 4.5, rename a local "nl" variable to "nline",
so it doesn't collide with the global curses nl() function.
diffstat:
distrib/amd64/cdroms/Makefile.cdrom | 5 +-
distrib/amd64/installimage/Makefile | 4 +-
distrib/amd64/installimage/spec.inst | 5 +-
distrib/common/10-resolv.conf | 22 ---
distrib/common/99-print-sysinst | 11 -
distrib/common/Makefile.dhcpcd | 3 +-
distrib/common/list.dhcpcd | 6 +-
distrib/i386/cdroms/Makefile.cdrom | 5 +-
distrib/i386/installimage/Makefile | 4 +-
distrib/i386/installimage/spec.inst | 5 +-
distrib/sparc64/cdroms/installcd/Makefile | 5 +-
distrib/vax/cdroms/installcd/Makefile | 6 +-
usr.sbin/sysinst/msg.mi.de | 17 +-
usr.sbin/sysinst/msg.mi.en | 19 +--
usr.sbin/sysinst/msg.mi.es | 17 +-
usr.sbin/sysinst/msg.mi.fr | 45 +++----
usr.sbin/sysinst/msg.mi.pl | 17 +-
usr.sbin/sysinst/net.c | 172 ++++++++++++++---------------
18 files changed, 141 insertions(+), 227 deletions(-)
diffs (truncated from 846 to 300 lines):
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom Thu May 14 06:44:57 2015 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.10.2.1 2014/08/15 10:23:22 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.10.2.2 2015/05/14 07:11:53 snj Exp $
.include <bsd.own.mk>
@@ -65,9 +65,6 @@
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${MKDIR} cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/amd64/installimage/Makefile
--- a/distrib/amd64/installimage/Makefile Thu May 14 06:44:57 2015 +0000
+++ b/distrib/amd64/installimage/Makefile Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2015/05/14 07:11:53 snj Exp $
.include <bsd.own.mk>
@@ -26,8 +26,6 @@
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA= \
- ${DISTRIBDIR}/common/10-resolv.conf libexec/dhcpcd-hooks \
- ${DISTRIBDIR}/common/99-print-sysinst libexec/dhcpcd-hooks \
${.CURDIR}/etc.ttys etc/ttys \
${.CURDIR}/etc.rc etc/rc \
${.CURDIR}/install.sh . \
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/amd64/installimage/spec.inst
--- a/distrib/amd64/installimage/spec.inst Thu May 14 06:44:57 2015 +0000
+++ b/distrib/amd64/installimage/spec.inst Thu May 14 07:11:53 2015 +0000
@@ -1,10 +1,7 @@
-# $NetBSD: spec.inst,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: spec.inst,v 1.1.22.1 2015/05/14 07:11:53 snj Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 uname=root gname=wheel
-./libexec/dhcpcd-hooks/10-resolv.conf type=file mode=0444 uname=root gname=wheel
-./libexec/dhcpcd-hooks/99-print-sysinst type=file mode=0444 uname=root gname=wheel
-
./install.sh type=file mode=0755 uname=root gname=wheel
./sysinst type=file mode=0755 uname=root gname=wheel
./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/common/10-resolv.conf
--- a/distrib/common/10-resolv.conf Thu May 14 06:44:57 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# Minimal version using shell builtins.
-
-make_resolv_conf()
-{
- if [ -z "${new_domain_name_servers}" -a \
- -z "${new_domain_name}" -a \
- -z "${new_domain_search}" ]; then
- return 0
- fi
- if [ -n "${new_domain_search}" ]; then
- echo "search ${new_domain_search}" >> /etc/resolv.conf
- elif [ -n "${new_domain_name}" ]; then
- echo "search ${new_domain_name}" >> /etc/resolv.conf
- fi
- for x in ${new_domain_name_servers}; do
- echo "nameserver ${x}" >> /etc/resolv.conf
- done
-}
-
-case "${reason}" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT) make_resolv_conf;;
-esac
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/common/99-print-sysinst
--- a/distrib/common/99-print-sysinst Thu May 14 06:44:57 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: 99-print-sysinst,v 1.1 2009/04/07 11:49:17 joerg Exp $
-
-case "${reason}" in
-BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT)
- cat > /tmp/dhcpcd-lease << EOF
-host-name=${new_host_name}
-domain-name=${new_domain_name}
-EOF
- set > /tmp/dhcpcd-lease-all
- ;;
-esac
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/common/Makefile.dhcpcd
--- a/distrib/common/Makefile.dhcpcd Thu May 14 06:44:57 2015 +0000
+++ b/distrib/common/Makefile.dhcpcd Thu May 14 07:11:53 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.dhcpcd,v 1.1 2009/04/07 11:49:17 joerg Exp $
+# $NetBSD: Makefile.dhcpcd,v 1.1.28.1 2015/05/14 07:11:53 snj Exp $
IMAGEDEPENDS+= \
${DESTDIR}/etc/dhcpcd.conf \
${DESTDIR}/libexec/dhcpcd-run-hooks \
+ ${DESTDIR}/libexec/dhcpcd-hooks/20-resolv.conf \
${DESTDIR}/libexec/dhcpcd-hooks/30-hostname
LISTS+= ${DISTRIBDIR}/common/list.dhcpcd
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/common/list.dhcpcd
--- a/distrib/common/list.dhcpcd Thu May 14 06:44:57 2015 +0000
+++ b/distrib/common/list.dhcpcd Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list.dhcpcd,v 1.2 2011/05/31 06:19:11 christos Exp $
+# $NetBSD: list.dhcpcd,v 1.2.24.1 2015/05/14 07:11:53 snj Exp $
#
# list file (c.f. parselist.awk) for DHCP-enabled install media.
#
@@ -8,7 +8,5 @@
COPY ${DESTDIR}/etc/dhcpcd.conf etc/dhcpcd.conf
COPY ${DESTDIR}/libexec/dhcpcd-run-hooks libexec/dhcpcd-run-hooks 555
-
-COPY ${NETBSDSRCDIR}/distrib/common/10-resolv.conf libexec/dhcpcd-hooks/10-resolv.conf
+COPY ${DESTDIR}/libexec/dhcpcd-hooks/20-resolv.conf libexec/dhcpcd-hooks/20-resolv.conf
COPY ${DESTDIR}/libexec/dhcpcd-hooks/30-hostname libexec/dhcpcd-hooks/30-hostname
-COPY ${NETBSDSRCDIR}/distrib/common/99-print-sysinst libexec/dhcpcd-hooks/99-print-sysinst
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom Thu May 14 06:44:57 2015 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.30.2.1 2014/08/15 10:23:22 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.30.2.2 2015/05/14 07:11:53 snj Exp $
.include <bsd.own.mk>
@@ -65,9 +65,6 @@
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${MKDIR} cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/i386/installimage/Makefile
--- a/distrib/i386/installimage/Makefile Thu May 14 06:44:57 2015 +0000
+++ b/distrib/i386/installimage/Makefile Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.2.2 2015/03/12 19:06:22 snj Exp $
+# $NetBSD: Makefile,v 1.4.2.3 2015/05/14 07:11:53 snj Exp $
.include <bsd.own.mk>
@@ -26,8 +26,6 @@
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA= \
- ${DISTRIBDIR}/common/10-resolv.conf libexec/dhcpcd-hooks \
- ${DISTRIBDIR}/common/99-print-sysinst libexec/dhcpcd-hooks \
${.CURDIR}/etc.ttys etc/ttys \
${.CURDIR}/etc.rc etc/rc \
${.CURDIR}/install.sh . \
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/i386/installimage/spec.inst
--- a/distrib/i386/installimage/spec.inst Thu May 14 06:44:57 2015 +0000
+++ b/distrib/i386/installimage/spec.inst Thu May 14 07:11:53 2015 +0000
@@ -1,10 +1,7 @@
-# $NetBSD: spec.inst,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: spec.inst,v 1.1.22.1 2015/05/14 07:11:53 snj Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 uname=root gname=wheel
-./libexec/dhcpcd-hooks/10-resolv.conf type=file mode=0444 uname=root gname=wheel
-./libexec/dhcpcd-hooks/99-print-sysinst type=file mode=0444 uname=root gname=wheel
-
./install.sh type=file mode=0755 uname=root gname=wheel
./sysinst type=file mode=0755 uname=root gname=wheel
./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Thu May 14 06:44:57 2015 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18.2.1 2014/08/15 10:23:22 martin Exp $
+# $NetBSD: Makefile,v 1.18.2.2 2015/05/14 07:11:53 snj Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -68,9 +68,6 @@
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${RM} -rf cdrom/libexec/dhcpcd-hooks/*
- ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
diff -r 2ce0dc6c6f00 -r 8a7536121139 distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile Thu May 14 06:44:57 2015 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8.2.1 2014/08/15 10:23:21 martin Exp $
+# $NetBSD: Makefile,v 1.8.2.2 2015/05/14 07:11:53 snj Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
@@ -17,10 +17,6 @@
${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot
${RM} -f bootxx.${MACHINE}
${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
- ${RM} -rf cdrom/libexec/dhcpcd-hooks/*
- ${MKDIR} -p cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
diff -r 2ce0dc6c6f00 -r 8a7536121139 usr.sbin/sysinst/msg.mi.de
--- a/usr.sbin/sysinst/msg.mi.de Thu May 14 06:44:57 2015 +0000
+++ b/usr.sbin/sysinst/msg.mi.de Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.2.4.2 2015/05/13 17:04:27 snj Exp $ */
+/* $NetBSD: msg.mi.de,v 1.2.4.3 2015/05/14 07:11:53 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -547,9 +547,6 @@
message net_mask
{IPv4-Netzmaske}
-message net_namesrv6
-{IPv6-Nameserver}
-
message net_namesrv
{IPv4-Nameserver}
@@ -564,12 +561,12 @@
DNS-Domain: %s
Hostname: %s
+Nameserver: %s
Netzwerkadapter: %s
+Verbindungstyp: %s
IP-Adresse: %s
Netzmaske: %s
-IPv4-Nameserver: %s
IPv4-Gateway: %s
-Verbindungstyp: %s
}
message netok_slip
@@ -577,19 +574,18 @@
DNS-Domain: %s
Hostname: %s
+Nameserver: %s
Netzwerkadapter: %s
+Verbindungstyp: %s
IP-Adresse: %s
IP-Adresse des Servers: %s
Netzmaske: %s
-IPv4-Nameserver: %s
IPv4-Gateway: %s
-Verbindungstyp: %s
}
message netokv6
{
IPv6-Autokonfiguration: %s
-IPv6-Nameserver: %s
}
message netok_ok
@@ -1008,8 +1004,7 @@
message File_system {Dateisystem}
message Select_DNS_server { Auswählen eines DNS Servers}
message other {andere }
-message Perform_IPv6_autoconfiguration {IPv6 automatisch konfigurieren?}
-message Perform_DHCP_autoconfiguration {Konfiguration per DHCP ermitteln?}
+message Perform_autoconfiguration {Führen Sie die automatische Konfiguration?}
message Root_shell {Root-Shell}
message User_shell {User-Shell}
message Color_scheme {Farbschema}
diff -r 2ce0dc6c6f00 -r 8a7536121139 usr.sbin/sysinst/msg.mi.en
--- a/usr.sbin/sysinst/msg.mi.en Thu May 14 06:44:57 2015 +0000
+++ b/usr.sbin/sysinst/msg.mi.en Thu May 14 07:11:53 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.2.4.5 2015/05/13 17:04:27 snj Exp $ */
+/* $NetBSD: msg.mi.en,v 1.2.4.6 2015/05/14 07:11:53 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -523,11 +523,8 @@
message net_mask
{IPv4 Netmask}
-message net_namesrv6
-{IPv6 name server}
-
message net_namesrv
-{IPv4 name server}
Home |
Main Index |
Thread Index |
Old Index