head 1.3; access; symbols netbsd-11-0-RC6:1.3 netbsd-11-0-RC5:1.3 netbsd-11-0-RC4:1.3 netbsd-11-0-RC3:1.3 netbsd-11-0-RC2:1.3 netbsd-11-0-RC1:1.3 perseant-exfatfs-base-20250801:1.3 netbsd-11:1.3.0.30 netbsd-11-base:1.3 netbsd-10-1-RELEASE:1.3 perseant-exfatfs-base-20240630:1.3 perseant-exfatfs:1.3.0.28 perseant-exfatfs-base:1.3 netbsd-8-3-RELEASE:1.3 netbsd-9-4-RELEASE:1.3 netbsd-10-0-RELEASE:1.3 netbsd-10-0-RC6:1.3 netbsd-10-0-RC5:1.3 netbsd-10-0-RC4:1.3 netbsd-10-0-RC3:1.3 netbsd-10-0-RC2:1.3 netbsd-10-0-RC1:1.3 netbsd-10:1.3.0.26 netbsd-10-base:1.3 netbsd-9-3-RELEASE:1.3 cjep_sun2x-base1:1.3 cjep_sun2x:1.3.0.24 cjep_sun2x-base:1.3 cjep_staticlib_x-base1:1.3 netbsd-9-2-RELEASE:1.3 cjep_staticlib_x:1.3.0.22 cjep_staticlib_x-base:1.3 netbsd-9-1-RELEASE:1.3 phil-wifi-20200421:1.3 phil-wifi-20200411:1.3 is-mlppp:1.3.0.20 is-mlppp-base:1.3 phil-wifi-20200406:1.3 netbsd-8-2-RELEASE:1.3 netbsd-9-0-RELEASE:1.3 netbsd-9-0-RC2:1.3 netbsd-9-0-RC1:1.3 phil-wifi-20191119:1.3 netbsd-9:1.3.0.18 netbsd-9-base:1.3 phil-wifi-20190609:1.3 netbsd-8-1-RELEASE:1.3 netbsd-8-1-RC1:1.3 pgoyette-compat-merge-20190127:1.3 pgoyette-compat-20190127:1.3 pgoyette-compat-20190118:1.3 pgoyette-compat-1226:1.3 pgoyette-compat-1126:1.3 pgoyette-compat-1020:1.3 pgoyette-compat-0930:1.3 pgoyette-compat-0906:1.3 netbsd-7-2-RELEASE:1.2.24.1 pgoyette-compat-0728:1.3 netbsd-8-0-RELEASE:1.3 phil-wifi:1.3.0.16 phil-wifi-base:1.3 pgoyette-compat-0625:1.3 netbsd-8-0-RC2:1.3 pgoyette-compat-0521:1.3 pgoyette-compat-0502:1.3 pgoyette-compat-0422:1.3 netbsd-8-0-RC1:1.3 pgoyette-compat-0415:1.3 pgoyette-compat-0407:1.3 pgoyette-compat-0330:1.3 pgoyette-compat-0322:1.3 pgoyette-compat-0315:1.3 netbsd-7-1-2-RELEASE:1.2.24.1 pgoyette-compat:1.3.0.14 pgoyette-compat-base:1.3 netbsd-7-1-1-RELEASE:1.2.24.1 matt-nb8-mediatek:1.3.0.12 matt-nb8-mediatek-base:1.3 perseant-stdc-iso10646:1.3.0.10 perseant-stdc-iso10646-base:1.3 netbsd-8:1.3.0.8 netbsd-8-base:1.3 prg-localcount2-base3:1.3 prg-localcount2-base2:1.3 prg-localcount2-base1:1.3 prg-localcount2:1.3.0.6 prg-localcount2-base:1.3 pgoyette-localcount-20170426:1.3 bouyer-socketcan-base1:1.3 pgoyette-localcount-20170320:1.3 netbsd-7-1:1.2.24.1.0.6 netbsd-7-1-RELEASE:1.2.24.1 netbsd-7-1-RC2:1.2.24.1 netbsd-7-nhusb-base-20170116:1.2.24.1 bouyer-socketcan:1.3.0.4 bouyer-socketcan-base:1.3 pgoyette-localcount-20170107:1.3 netbsd-7-1-RC1:1.2.24.1 pgoyette-localcount-20161104:1.3 netbsd-7-0-2-RELEASE:1.2.24.1 localcount-20160914:1.3 netbsd-7-nhusb:1.2.24.1.0.4 netbsd-7-nhusb-base:1.2.24.1 pgoyette-localcount-20160806:1.3 pgoyette-localcount-20160726:1.3 pgoyette-localcount:1.3.0.2 pgoyette-localcount-base:1.3 netbsd-7-0-1-RELEASE:1.2.24.1 netbsd-7-0:1.2.24.1.0.2 netbsd-7-0-RELEASE:1.2.24.1 netbsd-7-0-RC3:1.2.24.1 netbsd-7-0-RC2:1.2.24.1 netbsd-7-0-RC1:1.2.24.1 netbsd-6-0-6-RELEASE:1.2 netbsd-6-1-5-RELEASE:1.2 netbsd-7:1.2.0.24 netbsd-7-base:1.2 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 netbsd-6-1-4-RELEASE:1.2 netbsd-6-0-5-RELEASE:1.2 tls-earlyentropy:1.2.0.22 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 netbsd-6-1-3-RELEASE:1.2 netbsd-6-0-4-RELEASE:1.2 netbsd-6-1-2-RELEASE:1.2 netbsd-6-0-3-RELEASE:1.2 netbsd-6-1-1-RELEASE:1.2 riastradh-drm2-base2:1.2 riastradh-drm2-base1:1.2 riastradh-drm2:1.2.0.14 riastradh-drm2-base:1.2 netbsd-6-1:1.2.0.20 netbsd-6-0-2-RELEASE:1.2 netbsd-6-1-RELEASE:1.2 khorben-n900:1.2.0.18 netbsd-6-1-RC4:1.2 netbsd-6-1-RC3:1.2 agc-symver:1.2.0.16 agc-symver-base:1.2 netbsd-6-1-RC2:1.2 netbsd-6-1-RC1:1.2 yamt-pagecache-base8:1.2 netbsd-6-0-1-RELEASE:1.2 yamt-pagecache-base7:1.2 matt-nb6-plus-nbase:1.2 yamt-pagecache-base6:1.2 netbsd-6-0:1.2.0.12 netbsd-6-0-RELEASE:1.2 netbsd-6-0-RC2:1.2 tls-maxphys:1.2.0.10 tls-maxphys-base:1.2 matt-nb6-plus:1.2.0.8 matt-nb6-plus-base:1.2 netbsd-6-0-RC1:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-6:1.2.0.6 netbsd-6-base:1.2 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.4 yamt-pagecache-base:1.2 cherry-xenmp:1.2.0.2 cherry-xenmp-base:1.2 bouyer-quota2-nbase:1.1 bouyer-quota2:1.1.0.4 bouyer-quota2-base:1.1 matt-mips64-premerge-20101231:1.1 matt-premerge-20091211:1.1 jym-xensuspend-base:1.1 jym-xensuspend:1.1.0.2 jym-xensuspend-nbase:1.1; locks; strict; comment @# @; 1.3 date 2014.09.12.20.42.13; author roy; state Exp; branches; next 1.2; commitid buNTlIXkfqId76Qx; 1.2 date 2011.05.31.06.19.11; author christos; state Exp; branches 1.2.24.1; next 1.1; 1.1 date 2009.04.07.11.49.17; author joerg; state Exp; branches 1.1.2.1; next ; 1.2.24.1 date 2015.05.14.07.11.53; author snj; state Exp; branches; next ; commitid WUK9UR2qc9WJNnly; 1.1.2.1 date 2009.04.07.11.49.17; author jym; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2009.05.13.19.17.41; author jym; state Exp; branches; next ; desc @@ 1.3 log @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. @ text @# $NetBSD: list.dhcpcd,v 1.2 2011/05/31 06:19:11 christos Exp $ # # list file (c.f. parselist.awk) for DHCP-enabled install media. # PROG sbin/dhcpcd SPECIAL dhcpcd srcdir external/bsd/dhcpcd/sbin/dhcpcd COPY ${DESTDIR}/etc/dhcpcd.conf etc/dhcpcd.conf COPY ${DESTDIR}/libexec/dhcpcd-run-hooks libexec/dhcpcd-run-hooks 555 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 @ 1.2 log @SRCDIRS is not the way to do this; some testing would have been nice. @ text @d1 1 a1 1 # $NetBSD: list.dhcpcd,v 1.1 2009/04/07 11:49:17 joerg Exp $ d11 1 a11 2 COPY ${NETBSDSRCDIR}/distrib/common/10-resolv.conf libexec/dhcpcd-hooks/10-resolv.conf a12 1 COPY ${NETBSDSRCDIR}/distrib/common/99-print-sysinst libexec/dhcpcd-hooks/99-print-sysinst @ 1.2.24.1 log @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. @ text @d1 1 a1 1 # $NetBSD: list.dhcpcd,v 1.2 2011/05/31 06:19:11 christos Exp $ d11 2 a12 1 COPY ${DESTDIR}/libexec/dhcpcd-hooks/20-resolv.conf libexec/dhcpcd-hooks/20-resolv.conf d14 1 @ 1.1 log @Change ramdisks from dhclient to dhcpcd and add corresponding glue to sysinst. For amd64, the crunchgen binary shrinks by 150KB uncompresssed, 60KB compressed. @ text @d1 1 a1 1 # $NetBSD$ a5 1 SRCDIRS external/bsd/dhcpcd/sbin d7 1 @ 1.1.2.1 log @file list.dhcpcd was added on branch jym-xensuspend on 2009-05-13 19:17:41 +0000 @ text @d1 14 @ 1.1.2.2 log @Sync with HEAD. Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html @ text @a0 14 # $NetBSD: list.dhcpcd,v 1.1 2009/04/07 11:49:17 joerg Exp $ # # list file (c.f. parselist.awk) for DHCP-enabled install media. # SRCDIRS external/bsd/dhcpcd/sbin PROG sbin/dhcpcd 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/30-hostname libexec/dhcpcd-hooks/30-hostname COPY ${NETBSDSRCDIR}/distrib/common/99-print-sysinst libexec/dhcpcd-hooks/99-print-sysinst @