Mon Jan 3 12:10:17 2022 UTC ()
There is no point in putting a second sysinst binary into the install
image's root filesystem.


(martin)
diff -r1.20 -r1.21 src/distrib/amd64/installimage/Makefile
diff -r1.2 -r1.3 src/distrib/amd64/installimage/install.sh
diff -r1.2 -r1.3 src/distrib/amd64/installimage/spec.inst
diff -r1.4 -r1.5 src/distrib/amd64/installimage-bios/Makefile
diff -r1.1 -r1.2 src/distrib/amd64/installimage-bios/install.sh
diff -r1.1 -r1.2 src/distrib/amd64/installimage-bios/spec.inst
cvs diff -r1.20 -r1.21 src/distrib/amd64/installimage/Makefile (expand / switch to unified diff)

--- src/distrib/amd64/installimage/Makefile 2021/12/31 04:59:16 1.20
+++ src/distrib/amd64/installimage/Makefile 2022/01/03 12:10:17 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2021/12/31 04:59:16 pgoyette Exp $ 1# $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img 5INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
6 6
7INSTIMAGEMB?= 2250 # for all installation binaries 7INSTIMAGEMB?= 2250 # for all installation binaries
8 8
9PRIMARY_BOOT= bootxx_ffsv1 9PRIMARY_BOOT= bootxx_ffsv1
10SECONDARY_BOOT= boot 10SECONDARY_BOOT= boot
11SECONDARY_BOOT_ARG= # unnecessary 11SECONDARY_BOOT_ARG= # unnecessary
12EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi 12EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
13EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi 13EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
14#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi 14#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
@@ -17,28 +17,22 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32. @@ -17,28 +17,22 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
17USE_MBR= yes 17USE_MBR= yes
18USE_GPT= yes 18USE_GPT= yes
19USE_GPTMBR= yes 19USE_GPTMBR= yes
20 20
21CLEANFILES+= boot.cfg 21CLEANFILES+= boot.cfg
22 22
23prepare_md_post: 23prepare_md_post:
24 ${TOOL_SED} \ 24 ${TOOL_SED} \
25 -e "s/@@MACHINE@@/${MACHINE}/" \ 25 -e "s/@@MACHINE@@/${MACHINE}/" \
26 -e "s/@@VERSION@@/${DISTRIBVER}/" \ 26 -e "s/@@VERSION@@/${DISTRIBVER}/" \
27 < ${.CURDIR}/boot.cfg.in > boot.cfg 27 < ${.CURDIR}/boot.cfg.in > boot.cfg
28 28
29DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd 29DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
30SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} 
31 30
32SPEC_EXTRA= ${.CURDIR}/spec.inst 31SPEC_EXTRA= ${.CURDIR}/spec.inst
33IMGFILE_EXTRA= \ 32IMGFILE_EXTRA= \
34 ${.CURDIR}/etc.ttys etc/ttys \ 33 ${.CURDIR}/etc.ttys etc/ttys \
35 ${.CURDIR}/etc.rc etc/rc \ 34 ${.CURDIR}/etc.rc etc/rc \
36 ${.CURDIR}/install.sh . \ 35 ${.CURDIR}/install.sh . \
37 ${.OBJDIR}/boot.cfg . \ 36 ${.OBJDIR}/boot.cfg .
38 ${SYSINSTDIR}/sysinstmsgs.de . \ 
39 ${SYSINSTDIR}/sysinstmsgs.es . \ 
40 ${SYSINSTDIR}/sysinstmsgs.fr . \ 
41 ${SYSINSTDIR}/sysinstmsgs.pl . \ 
42 ${SYSINSTDIR}/sysinst . 
43 37
44.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage" 38.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
cvs diff -r1.2 -r1.3 src/distrib/amd64/installimage/install.sh (expand / switch to unified diff)

--- src/distrib/amd64/installimage/install.sh 2012/06/03 21:42:45 1.2
+++ src/distrib/amd64/installimage/install.sh 2022/01/03 12:10:17 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! /bin/sh -m 1#! /bin/sh -m
2# $NetBSD: install.sh,v 1.2 2012/06/03 21:42:45 joerg Exp $ 2# $NetBSD: install.sh,v 1.3 2022/01/03 12:10:17 martin Exp $
3# 3#
4# - 4# -
5# Copyright (c) 2010 The NetBSD Foundation, Inc. 5# Copyright (c) 2010 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7#  7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Martin Husemann <martin@NetBSD.org>. 9# by Martin Husemann <martin@NetBSD.org>.
10#  10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
@@ -77,27 +77,27 @@ Please select one, typical values are: @@ -77,27 +77,27 @@ Please select one, typical values are:
77 ansi 77 ansi
78 xterm 78 xterm
79 79
80EOM 80EOM
81 echo -n "Terminal type (just hit ENTER for '$TERM'): " 81 echo -n "Terminal type (just hit ENTER for '$TERM'): "
82 read ans 82 read ans
83 if [ -n "$ans" ];then 83 if [ -n "$ans" ];then
84 TERM=$ans 84 TERM=$ans
85 fi 85 fi
86fi 86fi
87 87
88# run the installation or upgrade script. 88# run the installation or upgrade script.
89cd / 89cd /
90cmd=./sysinst 90cmd=/usr/sbin/sysinst
91 91
92while [ -n "${cmd}" ] 92while [ -n "${cmd}" ]
93do 93do
94 ${cmd} 94 ${cmd}
95 if [ $? = 4 ]; then 95 if [ $? = 4 ]; then
96 echo "Oops, something went wrong - we will try again" 96 echo "Oops, something went wrong - we will try again"
97 exit 97 exit
98 else 98 else
99 if [ -n "$(jobs)" ]; then 99 if [ -n "$(jobs)" ]; then
100 tput clear 100 tput clear
101 echo "You have stopped sysinst, return to it by" \ 101 echo "You have stopped sysinst, return to it by" \
102 "typing 'exit' or ^D." 102 "typing 'exit' or ^D."
103 ${SHELL} -i 103 ${SHELL} -i
cvs diff -r1.2 -r1.3 src/distrib/amd64/installimage/spec.inst (expand / switch to unified diff)

--- src/distrib/amd64/installimage/spec.inst 2014/09/13 10:18:24 1.2
+++ src/distrib/amd64/installimage/spec.inst 2022/01/03 12:10:17 1.3
@@ -1,15 +1,10 @@ @@ -1,15 +1,10 @@
1# $NetBSD: spec.inst,v 1.2 2014/09/13 10:18:24 roy Exp $ 1# $NetBSD: spec.inst,v 1.3 2022/01/03 12:10:17 martin Exp $
2./mnt2 type=dir mode=0755 uname=root gname=wheel 2./mnt2 type=dir mode=0755 uname=root gname=wheel
3./targetroot type=dir mode=0755 uname=root gname=wheel 3./targetroot type=dir mode=0755 uname=root gname=wheel
4 4
5./install.sh type=file mode=0755 uname=root gname=wheel 5./install.sh type=file mode=0755 uname=root gname=wheel
6./sysinst type=file mode=0755 uname=root gname=wheel 
7./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel 
8./sysinstmsgs.es type=file mode=0444 uname=root gname=wheel 
9./sysinstmsgs.fr type=file mode=0444 uname=root gname=wheel 
10./sysinstmsgs.pl type=file mode=0444 uname=root gname=wheel 
11 6
12# for sysinst "install from local directory" default 7# for sysinst "install from local directory" default
13./release type=link mode=0755 uname=root gname=wheel link=. 8./release type=link mode=0755 uname=root gname=wheel link=.
14 9
15# XXX what to do for files in ${RELEASEMACHINEDIR}? 10# XXX what to do for files in ${RELEASEMACHINEDIR}?
cvs diff -r1.4 -r1.5 src/distrib/amd64/installimage-bios/Makefile (expand / switch to unified diff)

--- src/distrib/amd64/installimage-bios/Makefile 2021/12/31 04:59:15 1.4
+++ src/distrib/amd64/installimage-bios/Makefile 2022/01/03 12:10:17 1.5
@@ -1,38 +1,32 @@ @@ -1,38 +1,32 @@
1# $NetBSD: Makefile,v 1.4 2021/12/31 04:59:15 pgoyette Exp $ 1# $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img 5INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
6 6
7INSTIMAGEMB?= 2250 # for all installation binaries 7INSTIMAGEMB?= 2250 # for all installation binaries
8 8
9PRIMARY_BOOT= bootxx_ffsv1 9PRIMARY_BOOT= bootxx_ffsv1
10SECONDARY_BOOT= boot 10SECONDARY_BOOT= boot
11SECONDARY_BOOT_ARG= # unnecessary 11SECONDARY_BOOT_ARG= # unnecessary
12 12
13USE_MBR= yes 13USE_MBR= yes
14 14
15CLEANFILES+= boot.cfg 15CLEANFILES+= boot.cfg
16 16
17prepare_md_post: 17prepare_md_post:
18 ${TOOL_SED} \ 18 ${TOOL_SED} \
19 -e "s/@@MACHINE@@/${MACHINE}/" \ 19 -e "s/@@MACHINE@@/${MACHINE}/" \
20 -e "s/@@VERSION@@/${DISTRIBVER}/" \ 20 -e "s/@@VERSION@@/${DISTRIBVER}/" \
21 < ${.CURDIR}/boot.cfg.in > boot.cfg 21 < ${.CURDIR}/boot.cfg.in > boot.cfg
22 22
23DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd 23DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
24SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} 
25 24
26SPEC_EXTRA= ${.CURDIR}/spec.inst 25SPEC_EXTRA= ${.CURDIR}/spec.inst
27IMGFILE_EXTRA= \ 26IMGFILE_EXTRA= \
28 ${.CURDIR}/etc.ttys etc/ttys \ 27 ${.CURDIR}/etc.ttys etc/ttys \
29 ${.CURDIR}/etc.rc etc/rc \ 28 ${.CURDIR}/etc.rc etc/rc \
30 ${.CURDIR}/install.sh . \ 29 ${.CURDIR}/install.sh . \
31 ${.OBJDIR}/boot.cfg . \ 30 ${.OBJDIR}/boot.cfg .
32 ${SYSINSTDIR}/sysinstmsgs.de . \ 
33 ${SYSINSTDIR}/sysinstmsgs.es . \ 
34 ${SYSINSTDIR}/sysinstmsgs.fr . \ 
35 ${SYSINSTDIR}/sysinstmsgs.pl . \ 
36 ${SYSINSTDIR}/sysinst . 
37 31
38.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage" 32.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
cvs diff -r1.1 -r1.2 src/distrib/amd64/installimage-bios/install.sh (expand / switch to unified diff)

--- src/distrib/amd64/installimage-bios/install.sh 2021/10/08 20:24:06 1.1
+++ src/distrib/amd64/installimage-bios/install.sh 2022/01/03 12:10:17 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! /bin/sh -m 1#! /bin/sh -m
2# $NetBSD: install.sh,v 1.1 2021/10/08 20:24:06 maya Exp $ 2# $NetBSD: install.sh,v 1.2 2022/01/03 12:10:17 martin Exp $
3# 3#
4# - 4# -
5# Copyright (c) 2010 The NetBSD Foundation, Inc. 5# Copyright (c) 2010 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7#  7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Martin Husemann <martin@NetBSD.org>. 9# by Martin Husemann <martin@NetBSD.org>.
10#  10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
@@ -77,27 +77,27 @@ Please select one, typical values are: @@ -77,27 +77,27 @@ Please select one, typical values are:
77 ansi 77 ansi
78 xterm 78 xterm
79 79
80EOM 80EOM
81 echo -n "Terminal type (just hit ENTER for '$TERM'): " 81 echo -n "Terminal type (just hit ENTER for '$TERM'): "
82 read ans 82 read ans
83 if [ -n "$ans" ];then 83 if [ -n "$ans" ];then
84 TERM=$ans 84 TERM=$ans
85 fi 85 fi
86fi 86fi
87 87
88# run the installation or upgrade script. 88# run the installation or upgrade script.
89cd / 89cd /
90cmd=./sysinst 90cmd=/usr/sbin/sysinst
91 91
92while [ -n "${cmd}" ] 92while [ -n "${cmd}" ]
93do 93do
94 ${cmd} 94 ${cmd}
95 if [ $? = 4 ]; then 95 if [ $? = 4 ]; then
96 echo "Oops, something went wrong - we will try again" 96 echo "Oops, something went wrong - we will try again"
97 exit 97 exit
98 else 98 else
99 if [ -n "$(jobs)" ]; then 99 if [ -n "$(jobs)" ]; then
100 tput clear 100 tput clear
101 echo "You have stopped sysinst, return to it by" \ 101 echo "You have stopped sysinst, return to it by" \
102 "typing 'exit' or ^D." 102 "typing 'exit' or ^D."
103 ${SHELL} -i 103 ${SHELL} -i
cvs diff -r1.1 -r1.2 src/distrib/amd64/installimage-bios/spec.inst (expand / switch to unified diff)

--- src/distrib/amd64/installimage-bios/spec.inst 2021/10/08 20:24:06 1.1
+++ src/distrib/amd64/installimage-bios/spec.inst 2022/01/03 12:10:17 1.2
@@ -1,15 +1,10 @@ @@ -1,15 +1,10 @@
1# $NetBSD: spec.inst,v 1.1 2021/10/08 20:24:06 maya Exp $ 1# $NetBSD: spec.inst,v 1.2 2022/01/03 12:10:17 martin Exp $
2./mnt2 type=dir mode=0755 uname=root gname=wheel 2./mnt2 type=dir mode=0755 uname=root gname=wheel
3./targetroot type=dir mode=0755 uname=root gname=wheel 3./targetroot type=dir mode=0755 uname=root gname=wheel
4 4
5./install.sh type=file mode=0755 uname=root gname=wheel 5./install.sh type=file mode=0755 uname=root gname=wheel
6./sysinst type=file mode=0755 uname=root gname=wheel 
7./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel 
8./sysinstmsgs.es type=file mode=0444 uname=root gname=wheel 
9./sysinstmsgs.fr type=file mode=0444 uname=root gname=wheel 
10./sysinstmsgs.pl type=file mode=0444 uname=root gname=wheel 
11 6
12# for sysinst "install from local directory" default 7# for sysinst "install from local directory" default
13./release type=link mode=0755 uname=root gname=wheel link=. 8./release type=link mode=0755 uname=root gname=wheel link=.
14 9
15# XXX what to do for files in ${RELEASEMACHINEDIR}? 10# XXX what to do for files in ${RELEASEMACHINEDIR}?