Module Name: src
Committed By: martin
Date: Mon Jan 3 12:10:17 UTC 2022
Modified Files:
src/distrib/amd64/installimage: Makefile install.sh spec.inst
src/distrib/amd64/installimage-bios: Makefile install.sh spec.inst
Log Message:
There is no point in putting a second sysinst binary into the install
image's root filesystem.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/install.sh \
src/distrib/amd64/installimage/spec.inst
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/installimage-bios/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/spec.inst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.20 src/distrib/amd64/installimage/Makefile:1.21
--- src/distrib/amd64/installimage/Makefile:1.20 Fri Dec 31 04:59:16 2021
+++ src/distrib/amd64/installimage/Makefile Mon Jan 3 12:10:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/12/31 04:59:16 pgoyette Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $
.include <bsd.own.mk>
@@ -27,18 +27,12 @@ prepare_md_post:
< ${.CURDIR}/boot.cfg.in > boot.cfg
DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA= \
${.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 .
+ ${.OBJDIR}/boot.cfg .
.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage/install.sh
diff -u src/distrib/amd64/installimage/install.sh:1.2 src/distrib/amd64/installimage/install.sh:1.3
--- src/distrib/amd64/installimage/install.sh:1.2 Sun Jun 3 21:42:45 2012
+++ src/distrib/amd64/installimage/install.sh Mon Jan 3 12:10:17 2022
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.2 2012/06/03 21:42:45 joerg Exp $
+# $NetBSD: install.sh,v 1.3 2022/01/03 12:10:17 martin Exp $
#
# -
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@ fi
# run the installation or upgrade script.
cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
while [ -n "${cmd}" ]
do
Index: src/distrib/amd64/installimage/spec.inst
diff -u src/distrib/amd64/installimage/spec.inst:1.2 src/distrib/amd64/installimage/spec.inst:1.3
--- src/distrib/amd64/installimage/spec.inst:1.2 Sat Sep 13 10:18:24 2014
+++ src/distrib/amd64/installimage/spec.inst Mon Jan 3 12:10:17 2022
@@ -1,13 +1,8 @@
-# $NetBSD: spec.inst,v 1.2 2014/09/13 10:18:24 roy Exp $
+# $NetBSD: spec.inst,v 1.3 2022/01/03 12:10:17 martin Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 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
-./sysinstmsgs.es type=file mode=0444 uname=root gname=wheel
-./sysinstmsgs.fr type=file mode=0444 uname=root gname=wheel
-./sysinstmsgs.pl type=file mode=0444 uname=root gname=wheel
# for sysinst "install from local directory" default
./release type=link mode=0755 uname=root gname=wheel link=.
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.4 src/distrib/amd64/installimage-bios/Makefile:1.5
--- src/distrib/amd64/installimage-bios/Makefile:1.4 Fri Dec 31 04:59:15 2021
+++ src/distrib/amd64/installimage-bios/Makefile Mon Jan 3 12:10:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/12/31 04:59:15 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $
.include <bsd.own.mk>
@@ -21,18 +21,12 @@ prepare_md_post:
< ${.CURDIR}/boot.cfg.in > boot.cfg
DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA= \
${.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 .
+ ${.OBJDIR}/boot.cfg .
.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/install.sh
diff -u src/distrib/amd64/installimage-bios/install.sh:1.1 src/distrib/amd64/installimage-bios/install.sh:1.2
--- src/distrib/amd64/installimage-bios/install.sh:1.1 Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/install.sh Mon Jan 3 12:10:17 2022
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.1 2021/10/08 20:24:06 maya Exp $
+# $NetBSD: install.sh,v 1.2 2022/01/03 12:10:17 martin Exp $
#
# -
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@ fi
# run the installation or upgrade script.
cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
while [ -n "${cmd}" ]
do
Index: src/distrib/amd64/installimage-bios/spec.inst
diff -u src/distrib/amd64/installimage-bios/spec.inst:1.1 src/distrib/amd64/installimage-bios/spec.inst:1.2
--- src/distrib/amd64/installimage-bios/spec.inst:1.1 Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/spec.inst Mon Jan 3 12:10:17 2022
@@ -1,13 +1,8 @@
-# $NetBSD: spec.inst,v 1.1 2021/10/08 20:24:06 maya Exp $
+# $NetBSD: spec.inst,v 1.2 2022/01/03 12:10:17 martin Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 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
-./sysinstmsgs.es type=file mode=0444 uname=root gname=wheel
-./sysinstmsgs.fr type=file mode=0444 uname=root gname=wheel
-./sysinstmsgs.pl type=file mode=0444 uname=root gname=wheel
# for sysinst "install from local directory" default
./release type=link mode=0755 uname=root gname=wheel link=.
