head 1.23; access; symbols netbsd-11-0-RC5:1.23 netbsd-11-0-RC4:1.23 netbsd-11-0-RC3:1.23 netbsd-11-0-RC2:1.23 netbsd-11-0-RC1:1.23 perseant-exfatfs-base-20250801:1.23 netbsd-11:1.23.0.6 netbsd-11-base:1.23 netbsd-10-1-RELEASE:1.23 perseant-exfatfs-base-20240630:1.23 perseant-exfatfs:1.23.0.4 perseant-exfatfs-base:1.23 netbsd-8-3-RELEASE:1.8 netbsd-9-4-RELEASE:1.10.2.1 netbsd-10-0-RELEASE:1.23 netbsd-10-0-RC6:1.23 netbsd-10-0-RC5:1.23 netbsd-10-0-RC4:1.23 netbsd-10-0-RC3:1.23 netbsd-10-0-RC2:1.23 netbsd-10-0-RC1:1.23 netbsd-10:1.23.0.2 netbsd-10-base:1.23 netbsd-9-3-RELEASE:1.10.2.1 cjep_sun2x-base1:1.17 cjep_sun2x:1.16.0.4 cjep_sun2x-base:1.16 cjep_staticlib_x-base1:1.16 netbsd-9-2-RELEASE:1.10.2.1 cjep_staticlib_x:1.16.0.2 cjep_staticlib_x-base:1.16 netbsd-9-1-RELEASE:1.10.2.1 phil-wifi-20200421:1.10 phil-wifi-20200411:1.10 is-mlppp:1.10.0.4 is-mlppp-base:1.10 phil-wifi-20200406:1.10 netbsd-8-2-RELEASE:1.8 netbsd-9-0-RELEASE:1.10 netbsd-9-0-RC2:1.10 netbsd-9-0-RC1:1.10 phil-wifi-20191119:1.10 netbsd-9:1.10.0.2 netbsd-9-base:1.10 phil-wifi-20190609:1.10 netbsd-8-1-RELEASE:1.8 netbsd-8-1-RC1:1.8 pgoyette-compat-merge-20190127:1.9.2.1 pgoyette-compat-20190127:1.10 pgoyette-compat-20190118:1.10 pgoyette-compat-1226:1.10 pgoyette-compat-1126:1.9 pgoyette-compat-1020:1.9 pgoyette-compat-0930:1.9 pgoyette-compat-0906:1.9 netbsd-7-2-RELEASE:1.4.2.1 pgoyette-compat-0728:1.9 netbsd-8-0-RELEASE:1.8 phil-wifi:1.9.0.4 phil-wifi-base:1.9 pgoyette-compat-0625:1.9 netbsd-8-0-RC2:1.8 pgoyette-compat-0521:1.9 pgoyette-compat-0502:1.9 pgoyette-compat-0422:1.9 netbsd-8-0-RC1:1.8 pgoyette-compat-0415:1.9 pgoyette-compat-0407:1.9 pgoyette-compat-0330:1.9 pgoyette-compat-0322:1.9 pgoyette-compat-0315:1.9 netbsd-7-1-2-RELEASE:1.4.2.1 pgoyette-compat:1.9.0.2 pgoyette-compat-base:1.9 netbsd-7-1-1-RELEASE:1.4.2.1 matt-nb8-mediatek:1.8.0.6 matt-nb8-mediatek-base:1.8 perseant-stdc-iso10646:1.8.0.4 perseant-stdc-iso10646-base:1.8 netbsd-8:1.8.0.2 netbsd-8-base:1.8 prg-localcount2-base3:1.7 prg-localcount2-base2:1.6 prg-localcount2-base1:1.6 prg-localcount2:1.6.0.6 prg-localcount2-base:1.6 pgoyette-localcount-20170426:1.6 bouyer-socketcan-base1:1.6 pgoyette-localcount-20170320:1.6 netbsd-7-1:1.4.2.1.0.6 netbsd-7-1-RELEASE:1.4.2.1 netbsd-7-1-RC2:1.4.2.1 netbsd-7-nhusb-base-20170116:1.4.2.1 bouyer-socketcan:1.6.0.4 bouyer-socketcan-base:1.6 pgoyette-localcount-20170107:1.6 netbsd-7-1-RC1:1.4.2.1 pgoyette-localcount-20161104:1.6 netbsd-7-0-2-RELEASE:1.4.2.1 localcount-20160914:1.6 netbsd-7-nhusb:1.4.2.1.0.4 netbsd-7-nhusb-base:1.4.2.1 pgoyette-localcount-20160806:1.6 pgoyette-localcount-20160726:1.6 pgoyette-localcount:1.6.0.2 pgoyette-localcount-base:1.6 netbsd-7-0-1-RELEASE:1.4.2.1 netbsd-7-0:1.4.2.1.0.2 netbsd-7-0-RELEASE:1.4.2.1 netbsd-7-0-RC3:1.4.2.1 netbsd-7-0-RC2:1.4.2.1 netbsd-7-0-RC1:1.4.2.1 netbsd-6-0-6-RELEASE:1.1.2.1 netbsd-6-1-5-RELEASE:1.1.2.1 netbsd-7:1.4.0.2 netbsd-7-base:1.4 yamt-pagecache-base9:1.3 yamt-pagecache-tag8:1.1.4.4 netbsd-6-1-4-RELEASE:1.1.2.1 netbsd-6-0-5-RELEASE:1.1.2.1 tls-earlyentropy:1.3.0.8 tls-earlyentropy-base:1.4 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.3 riastradh-drm2-base3:1.3 netbsd-6-1-3-RELEASE:1.1.2.1 netbsd-6-0-4-RELEASE:1.1.2.1 netbsd-6-1-2-RELEASE:1.1.2.1 netbsd-6-0-3-RELEASE:1.1.2.1 netbsd-6-1-1-RELEASE:1.1.2.1 riastradh-drm2-base2:1.3 riastradh-drm2-base1:1.3 riastradh-drm2:1.3.0.2 riastradh-drm2-base:1.3 netbsd-6-1:1.1.2.1.0.6 netbsd-6-0-2-RELEASE:1.1.2.1 netbsd-6-1-RELEASE:1.1.2.1 khorben-n900:1.3.0.6 netbsd-6-1-RC4:1.1.2.1 netbsd-6-1-RC3:1.1.2.1 agc-symver:1.3.0.4 agc-symver-base:1.3 netbsd-6-1-RC2:1.1.2.1 netbsd-6-1-RC1:1.1.2.1 yamt-pagecache-base8:1.3 netbsd-6-0-1-RELEASE:1.1.2.1 yamt-pagecache-base7:1.3 matt-nb6-plus-nbase:1.1.2.1 yamt-pagecache-base6:1.2 netbsd-6-0:1.1.2.1.0.4 netbsd-6-0-RELEASE:1.1.2.1 netbsd-6-0-RC2:1.1.2.1 tls-maxphys:1.2.0.2 tls-maxphys-base:1.4 matt-nb6-plus:1.1.2.1.0.2 matt-nb6-plus-base:1.1.2.1 netbsd-6-0-RC1:1.1.2.1 yamt-pagecache-base5:1.1 yamt-pagecache:1.1.0.4 yamt-pagecache-base4:1.1 netbsd-6:1.1.0.2 netbsd-6-base:1.1; locks; strict; comment @# @; 1.23 date 2022.05.22.19.32.41; author jmcneill; state Exp; branches; next 1.22; commitid fabPWvHSRCIWr5FD; 1.22 date 2022.05.08.08.12.45; author mrg; state Exp; branches; next 1.21; commitid 4kYIFVDRdV7m8eDD; 1.21 date 2022.01.03.12.10.17; author martin; state Exp; branches; next 1.20; commitid UznGWyBMkfqdtbnD; 1.20 date 2021.12.31.04.59.16; author pgoyette; state Exp; branches; next 1.19; commitid lebZV2FL3oRobLmD; 1.19 date 2021.12.30.15.01.55; author pgoyette; state Exp; branches; next 1.18; commitid DlOXMxgtHUBZxGmD; 1.18 date 2021.12.26.03.07.06; author pgoyette; state Exp; branches; next 1.17; commitid hWQaa0XrU82CI6mD; 1.17 date 2021.06.02.16.07.33; author pgoyette; state Exp; branches; next 1.16; commitid CTqhz4eY1AQbHzVC; 1.16 date 2021.04.26.14.08.11; author pgoyette; state Exp; branches 1.16.4.1; next 1.15; commitid U4pXIk2RKHbGdOQC; 1.15 date 2021.03.26.21.18.29; author pgoyette; state Exp; branches; next 1.14; commitid wHPwiXv9t5puARMC; 1.14 date 2021.01.18.03.35.11; author pgoyette; state Exp; branches; next 1.13; commitid XANvriXTH9P4S9EC; 1.13 date 2021.01.15.21.14.53; author pgoyette; state Exp; branches; next 1.12; commitid Ox0XbvuhCFFnPRDC; 1.12 date 2020.05.28.15.13.21; author jmcneill; state Exp; branches; next 1.11; commitid MChr3jUEHapZh1aC; 1.11 date 2020.05.27.22.27.58; author maya; state Exp; branches; next 1.10; commitid cWiFO3sy6MINIV9C; 1.10 date 2018.12.15.18.03.16; author gson; state Exp; branches 1.10.2.1; next 1.9; commitid VnJTdkyNfhz4gV3B; 1.9 date 2017.09.18.14.42.16; author joerg; state Exp; branches 1.9.2.1 1.9.4.1; next 1.8; commitid brv8WIkmW9xbIG7A; 1.8 date 2017.05.19.15.16.12; author christos; state Exp; branches; next 1.7; commitid lsEaq80JIM57P0Sz; 1.7 date 2017.05.11.10.49.18; author martin; state Exp; branches; next 1.6; commitid rWolGeZs3BzMAXQz; 1.6 date 2016.01.24.15.30.05; author christos; state Exp; branches 1.6.6.1; next 1.5; commitid Ceo3A5sN4ydvmcSy; 1.5 date 2014.09.13.10.18.24; author roy; state Exp; branches; next 1.4; commitid f15GxbA0HcS3EaQx; 1.4 date 2014.07.26.19.34.08; author dholland; state Exp; branches 1.4.2.1; next 1.3; commitid 090ROJy6lzpliVJx; 1.3 date 2012.11.03.14.25.32; author tsutsui; state Exp; branches 1.3.8.1; next 1.2; 1.2 date 2012.08.17.16.56.34; author riz; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2012.01.22.03.53.29; author tsutsui; state Exp; branches 1.1.2.1 1.1.4.1; next ; 1.16.4.1 date 2021.06.06.20.30.44; author cjep; state Exp; branches; next ; commitid XNEGuB48YPLw17WC; 1.10.2.1 date 2020.05.31.10.21.34; author martin; state Exp; branches; next ; commitid evmB07wkPEsYznaC; 1.9.2.1 date 2018.12.26.14.01.10; author pgoyette; state Exp; branches; next ; commitid xUhK8IAeBM1azj5B; 1.9.4.1 date 2019.06.10.21.42.17; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; 1.6.6.1 date 2017.05.19.00.22.51; author pgoyette; state Exp; branches; next ; commitid QNTxgGjVagwoSVRz; 1.4.2.1 date 2015.05.14.07.11.53; author snj; state Exp; branches; next ; commitid WUK9UR2qc9WJNnly; 1.3.8.1 date 2014.08.10.06.47.49; author tls; state Exp; branches; next ; commitid m59xcsiiPxYzzMLx; 1.2.2.1 date 2012.11.20.02.57.40; author tls; state Exp; branches; next 1.2.2.2; 1.2.2.2 date 2014.08.19.23.45.37; author tls; state Exp; branches; next ; commitid jTnpym9Qu0o4R1Nx; 1.1.2.1 date 2012.08.17.20.50.50; author martin; state Exp; branches; next ; 1.1.4.1 date 2012.01.22.03.53.29; author yamt; state dead; branches; next 1.1.4.2; 1.1.4.2 date 2012.04.17.00.02.31; author yamt; state Exp; branches; next 1.1.4.3; 1.1.4.3 date 2012.10.30.18.48.28; author yamt; state Exp; branches; next 1.1.4.4; 1.1.4.4 date 2013.01.16.05.26.00; author yamt; state Exp; branches; next ; desc @@ 1.23 log @Restore Makefile.installimage include after variables are set. Makes amd64 USB install images bootable again. @ text @# $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $ .include INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img .include "installimage.mk" EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi #EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi #EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi USE_MBR= yes USE_GPT= yes USE_GPTMBR= yes .include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage" @ 1.22 log @fix building amd64 with USE_XZ_SETS=no. bump the size of images if USE_XZ_SETS != no. consolidate a lot of the code between installimage/Makefile and installimage-bios/Makefile into installimage/installimage.mk. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $ d17 2 @ 1.21 log @There is no point in putting a second sysinst binary into the install image's root filesystem. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.20 2021/12/31 04:59:16 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 2250 # for all installation binaries a8 3 PRIMARY_BOOT= bootxx_ffsv1 SECONDARY_BOOT= boot SECONDARY_BOOT_ARG= # unnecessary a16 19 CLEANFILES+= boot.cfg prepare_md_post: ${TOOL_SED} \ -e "s/@@@@MACHINE@@@@/${MACHINE}/" \ -e "s/@@@@VERSION@@@@/${DISTRIBVER}/" \ < ${.CURDIR}/boot.cfg.in > boot.cfg DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd SPEC_EXTRA= ${.CURDIR}/spec.inst IMGFILE_EXTRA= \ ${.CURDIR}/etc.ttys etc/ttys \ ${.CURDIR}/etc.rc etc/rc \ ${.CURDIR}/install.sh . \ ${.OBJDIR}/boot.cfg . .include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage" @ 1.20 log @Still not big enough - bump some more. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.19 2021/12/30 15:01:55 pgoyette Exp $ a29 1 SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} d36 1 a36 6 ${.OBJDIR}/boot.cfg . \ ${SYSINSTDIR}/sysinstmsgs.de . \ ${SYSINSTDIR}/sysinstmsgs.es . \ ${SYSINSTDIR}/sysinstmsgs.fr . \ ${SYSINSTDIR}/sysinstmsgs.pl . \ ${SYSINSTDIR}/sysinst . @ 1.19 log @With recent changees to debug kernel stuff from Christos we are once again pushing the size limit. Bump it again. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.18 2021/12/26 03:07:06 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 2180 # for all installation binaries @ 1.18 log @Once again things have grown, so the install image allocation size needs to be bumped. XXX There's gotta be a better way to maintain this! :-) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2021/06/02 16:07:33 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 2150 # for all installation binaries @ 1.17 log @The install image grew again - update size @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.16 2021/04/26 14:08:11 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 1800 # for all installation binaries @ 1.16 log @The image, with all sorts of MK*DEBUG* turned on, has once again grown. This time probably as a result of the move to gcc-10. Bump size to accomodate. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 2021/03/26 21:18:29 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 1700 # for all installation binaries @ 1.16.4.1 log @sync with head @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2021/06/02 16:07:33 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 1800 # for all installation binaries @ 1.15 log @The install-image has grown a bit recently, and at least amd64 has outgrown the previous size specification when the system was built with all of MKDEBUG, MKKDEBUG, and MKDEBUGLIB set to "yes" (and also when in-tree X11 is included). So, bump the size a bit. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2021/01/18 03:35:11 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 1600 # for all installation binaries @ 1.14 log @Oooppss we need another size bump @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2021/01/15 21:14:53 pgoyette Exp $ d7 1 a7 1 INSTIMAGEMB?= 1590 # for all installation binaries @ 1.13 log @Install image built with all of MKDEBUG, MKKDEBUG, and MKDEBUGLIB all set to "yes" is a bit larger, so bump the image size accordingly. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2020/05/28 15:13:21 jmcneill Exp $ d7 1 a7 1 INSTIMAGEMB?= 1580 # for all installation binaries @ 1.12 log @Only install gptmbr.bin if USE_GPTMBR=yes @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2020/05/27 22:27:58 maya Exp $ d7 1 a7 1 INSTIMAGEMB?= 1550 # for all installation binaries @ 1.11 log @rename amd64 uefi-installimage to be just installimage. Works for both purposes, no confusing name. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2019/11/21 22:29:03 joerg Exp $ d19 1 @ 1.10 log @Use the special device name "ROOT." in /etc/fstab not just on the arm images, but also on the bootable disk images of other ports, so that they can be booted from differently named devices. Merge the i386 and amd64 -live-sd0root and -live-wd0root images into a single live image per port, bootable both from usb media and in qemu. Drop the -xx0root suffixes from image names as they are no longer meaningful. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2017/09/18 14:42:16 joerg Exp $ d7 1 a7 1 INSTIMAGEMB?= 1450 # for all installation binaries d12 4 d18 1 d43 1 a43 1 .include "${DISTRIBDIR}/common/bootimage/Makefile.installimage" @ 1.10.2.1 log @Pull up following revision(s) (requested by maya in ticket #933): distrib/amd64/uefi-installimage/spec.inst: file removal distrib/amd64/uefi-installimage/etc.rc: file removal distrib/amd64/uefi-installimage/Makefile.bootimage: file removal distrib/amd64/uefi-installimage/Makefile.installimage: file removal distrib/amd64/uefi-installimage/install.sh: file removal distrib/amd64/uefi-installimage/etc.ttys: file removal distrib/amd64/Makefile: revision 1.14 distrib/amd64/uefi-installimage/boot.cfg.in: file removal distrib/amd64/uefi-installimage/Makefile: file removal distrib/amd64/installimage/Makefile: revision 1.11 rename amd64 uefi-installimage to be just installimage. Works for both purposes, no confusing name. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $ d7 1 a7 1 INSTIMAGEMB?= 1550 # for all installation binaries a11 4 EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi #EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi #EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi a13 1 USE_GPT= yes d38 1 a38 1 .include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage" @ 1.9 log @Bump install image sizes. Clang alone adds 100MB+ for a full debug build and that pushes the full MKDEBUG build over the constraints. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2017/05/19 15:16:12 christos Exp $ a6 1 BOOTDISK= sd0 # for USB flash etc. @ 1.9.4.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $ d7 1 @ 1.9.2.1 log @Sync with HEAD, resolve a few conflicts @ text @d1 1 a1 1 # $NetBSD$ d7 1 @ 1.8 log @Bump a little to handle clang images. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2017/05/11 10:49:18 martin Exp $ d8 1 a8 1 INSTIMAGEMB?= 1400 # for all installation binaries @ 1.7 log @Try to make images big enough for debug sets @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2016/01/24 15:30:05 christos Exp $ d8 1 a8 1 INSTIMAGEMB?= 1300 # for all installation binaries @ 1.6 log @Grow! @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2014/09/13 10:18:24 roy Exp $ d8 1 a8 1 INSTIMAGEMB?= 1200 # for all installation binaries @ 1.6.6.1 log @Resolve conflicts from previous merge (all resulting from $NetBSD keywork expansion) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2017/05/11 10:49:18 martin Exp $ d8 1 a8 1 INSTIMAGEMB?= 1300 # for all installation binaries @ 1.5 log @Punt custom dhcpcd hooks in favour up upstream hooks @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $ d8 1 a8 1 INSTIMAGEMB?= 550 # for all installation binaries @ 1.4 log @Adjust for sysinst move. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ a28 2 ${DISTRIBDIR}/common/10-resolv.conf libexec/dhcpcd-hooks \ ${DISTRIBDIR}/common/99-print-sysinst libexec/dhcpcd-hooks \ @ 1.4.2.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: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $ d29 2 @ 1.3 log @Allow overriding live-image and install-image sizes by INSTIMAGEMB (for install-images), USBIMAGEMB (for x86 sd0root liveimages), and EMUIMAGEMB (for other liveimages) variables. Per discussion on current-users@@: http://mail-index.NetBSD.org/current-users/2012/10/29/msg021368.html @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2012/08/17 16:56:34 riz Exp $ d25 1 a25 1 SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} @ 1.3.8.1 log @Rebase. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $ d25 1 a25 1 SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} @ 1.2 log @Change the naming scheme of "live" images and usb install images to incorporate the OS name and version. XXX should also not hardcode ${BOOTDISK} in the name, but that would require reordering stuff and more testing than I have time for right now. Another day. As discussed on current-users@@ back in March, with some adjustments. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $ d8 1 a8 1 IMAGEMB= 550 # for all installation binaries @ 1.2.2.1 log @Resync to 2012-11-19 00:00:00 UTC @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ d8 1 a8 1 INSTIMAGEMB?= 550 # for all installation binaries @ 1.2.2.2 log @Rebase to HEAD as of a few days ago. @ text @d1 1 a1 1 # $NetBSD$ d25 1 a25 1 SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} @ 1.1 log @Add "live-image" and "install-image" target support to build.sh. "live-image" target builds pre-installed disk images that can be used on emulators or boot from USB memory sticks to try NetBSD without installation. Currently amd64, i386, pmax, sparc, sparc64, sun2, sun3, and vax (which have working emulators and don't require extra tools like preparing msdosfs or partitioning MD label structures) support this target. "install-image" target builds an bootable installation disk image that can be used as an install CD but burned into USB memory sticks etc. Current only amd64 and i386 (which would support USB boot) have this target. For more details (and known issue) see following posts on netbsd-bugs@@: http://mail-index.NetBSD.org/netbsd-bugs/2011/08/06/msg023639.html http://mail-index.NetBSD.org/netbsd-bugs/2011/09/23/msg024207.html http://mail-index.NetBSD.org/netbsd-bugs/2011/12/07/msg025166.html http://mail-index.NetBSD.org/netbsd-bugs/2011/12/08/msg025178.html No particular comments about implementation, and "go ahead" comments from mrg@@, riz@@ and christos@@. Closes PR toolchain/45153 and PR misc/45155. @ text @d1 1 a1 1 # $NetBSD$ d5 1 a5 1 INSTIMGBASE= amd64inst # gives ${IMGBASE}.img @ 1.1.2.1 log @Pull up following revision(s) (requested by riz in ticket #506): distrib/amd64/liveimage/emuimage/Makefile: revision 1.2 distrib/amd64/liveimage/usbimage/Makefile: revision 1.2 distrib/sun2/liveimage/emuimage/Makefile: revision 1.2 distrib/amd64/installimage/Makefile: revision 1.2 distrib/sun3/liveimage/emuimage/Makefile: revision 1.2 distrib/pmax/liveimage/emuimage/Makefile: revision 1.2 distrib/vax/liveimage/emuimage/Makefile: revision 1.2 distrib/sparc64/liveimage/emuimage/Makefile: revision 1.2 distrib/common/Makefile.bootcd: revision 1.20 distrib/i386/liveimage/emuimage/Makefile: revision 1.2 distrib/sparc/liveimage/emuimage/Makefile: revision 1.2 distrib/i386/installimage/Makefile: revision 1.2 distrib/i386/liveimage/usbimage/Makefile: revision 1.2 etc/Makefile: revision 1.398 Change the naming scheme of "live" images and usb install images to incorporate the OS name and version. XXX should also not hardcode ${BOOTDISK} in the name, but that would require reordering stuff and more testing than I have time for right now. Another day. As discussed on current-users@@ back in March, with some adjustments. Install fully-populated .iso images in ${RELEASEDIR}/images instead of ${RELEASEDIR}/iso, since we'll be putting non-iso images in there too. Install live images and install images into ${RELEASEDIR}/images by default, to keep all the large files (such as ISOs) together. @ text @d5 1 a5 1 INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img @ 1.1.4.1 log @file Makefile was added on branch yamt-pagecache on 2012-04-17 00:02:31 +0000 @ text @d1 41 @ 1.1.4.2 log @sync with head @ text @a0 41 # $NetBSD$ .include INSTIMGBASE= amd64inst # gives ${IMGBASE}.img BOOTDISK= sd0 # for USB flash etc. IMAGEMB= 550 # for all installation binaries PRIMARY_BOOT= bootxx_ffsv1 SECONDARY_BOOT= boot SECONDARY_BOOT_ARG= # unnecessary USE_MBR= yes CLEANFILES+= boot.cfg prepare_md_post: ${TOOL_SED} \ -e "s/@@@@MACHINE@@@@/${MACHINE}/" \ -e "s/@@@@VERSION@@@@/${DISTRIBVER}/" \ < ${.CURDIR}/boot.cfg.in > boot.cfg DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} 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 . \ ${.OBJDIR}/boot.cfg . \ ${SYSINSTDIR}/sysinstmsgs.de . \ ${SYSINSTDIR}/sysinstmsgs.es . \ ${SYSINSTDIR}/sysinstmsgs.fr . \ ${SYSINSTDIR}/sysinstmsgs.pl . \ ${SYSINSTDIR}/sysinst . .include "${DISTRIBDIR}/common/bootimage/Makefile.installimage" @ 1.1.4.3 log @sync with head @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.4.2 2012/04/17 00:02:31 yamt Exp $ d5 1 a5 1 INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img @ 1.1.4.4 log @sync with (a bit old) head @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.4.3 2012/10/30 18:48:28 yamt Exp $ d8 1 a8 1 INSTIMAGEMB?= 550 # for all installation binaries @