Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[.joined/src/trunk]: .joined/src/distrib/amd64 There is no point in putting a...
details: https://anonhg.NetBSD.org/.joined/src/rev/93c7c062e5bf
branches: trunk
changeset: 359414:93c7c062e5bf
user: martin <martin%NetBSD.org@localhost>
date: Mon Jan 03 12:10:17 2022 +0000
description:
There is no point in putting a second sysinst binary into the install
image's root filesystem.
diffstat:
distrib/amd64/installimage-bios/Makefile | 10 ++--------
distrib/amd64/installimage-bios/install.sh | 4 ++--
distrib/amd64/installimage-bios/spec.inst | 7 +------
distrib/amd64/installimage/Makefile | 10 ++--------
distrib/amd64/installimage/install.sh | 4 ++--
distrib/amd64/installimage/spec.inst | 7 +------
6 files changed, 10 insertions(+), 32 deletions(-)
diffs (132 lines):
diff -r 05a74cfdfad9 -r 93c7c062e5bf distrib/amd64/installimage-bios/Makefile
--- a/distrib/amd64/installimage-bios/Makefile Mon Jan 03 11:44:02 2022 +0000
+++ b/distrib/amd64/installimage-bios/Makefile Mon Jan 03 12:10:17 2022 +0000
@@ -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 @@
< ${.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"
diff -r 05a74cfdfad9 -r 93c7c062e5bf distrib/amd64/installimage-bios/install.sh
--- a/distrib/amd64/installimage-bios/install.sh Mon Jan 03 11:44:02 2022 +0000
+++ b/distrib/amd64/installimage-bios/install.sh Mon Jan 03 12:10:17 2022 +0000
@@ -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 @@
# run the installation or upgrade script.
cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
while [ -n "${cmd}" ]
do
diff -r 05a74cfdfad9 -r 93c7c062e5bf distrib/amd64/installimage-bios/spec.inst
--- a/distrib/amd64/installimage-bios/spec.inst Mon Jan 03 11:44:02 2022 +0000
+++ b/distrib/amd64/installimage-bios/spec.inst Mon Jan 03 12:10:17 2022 +0000
@@ -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=.
diff -r 05a74cfdfad9 -r 93c7c062e5bf distrib/amd64/installimage/Makefile
--- a/distrib/amd64/installimage/Makefile Mon Jan 03 11:44:02 2022 +0000
+++ b/distrib/amd64/installimage/Makefile Mon Jan 03 12:10:17 2022 +0000
@@ -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 @@
< ${.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"
diff -r 05a74cfdfad9 -r 93c7c062e5bf distrib/amd64/installimage/install.sh
--- a/distrib/amd64/installimage/install.sh Mon Jan 03 11:44:02 2022 +0000
+++ b/distrib/amd64/installimage/install.sh Mon Jan 03 12:10:17 2022 +0000
@@ -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 @@
# run the installation or upgrade script.
cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
while [ -n "${cmd}" ]
do
diff -r 05a74cfdfad9 -r 93c7c062e5bf distrib/amd64/installimage/spec.inst
--- a/distrib/amd64/installimage/spec.inst Mon Jan 03 11:44:02 2022 +0000
+++ b/distrib/amd64/installimage/spec.inst Mon Jan 03 12:10:17 2022 +0000
@@ -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=.
Home |
Main Index |
Thread Index |
Old Index