Skip to content

Commit

Permalink
There is no point in putting a second sysinst binary into the install
Browse files Browse the repository at this point in the history 
image's root filesystem.
  • Loading branch information
@MartinHusemann
MartinHusemann committed Jan 3, 2022
1 parent 17dc13c commit a32111f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 32 deletions.
10 changes: 2 additions & 8 deletions distrib/amd64/installimage-bios/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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>

Expand All @@ -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"
4 changes: 2 additions & 2 deletions distrib/amd64/installimage-bios/install.sh
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -87,7 +87,7 @@ fi

# run the installation or upgrade script.
cd /
cmd=./sysinst
cmd=/usr/sbin/sysinst

while [ -n "${cmd}" ]
do
Expand Down
7 changes: 1 addition & 6 deletions distrib/amd64/installimage-bios/spec.inst
View file
Original file line number Diff line number Diff line change
@@ -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=.
Expand Down
10 changes: 2 additions & 8 deletions distrib/amd64/installimage/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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"
4 changes: 2 additions & 2 deletions distrib/amd64/installimage/install.sh
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -87,7 +87,7 @@ fi

# run the installation or upgrade script.
cd /
cmd=./sysinst
cmd=/usr/sbin/sysinst

while [ -n "${cmd}" ]
do
Expand Down
7 changes: 1 addition & 6 deletions distrib/amd64/installimage/spec.inst
View file
Original file line number Diff line number Diff line change
@@ -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=.
Expand Down

0 comments on commit a32111f

Please sign in to comment.