Module Name: src
Committed By: martin
Date: Thu May 28 09:51:31 UTC 2015
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom install.sh
src/distrib/i386/cdroms: Makefile.cdrom install.sh
src/distrib/sparc64/cdroms/installcd: Makefile install.sh
src/distrib/vax/cdroms/installcd: Makefile install.sh
Log Message:
Make sure to copy the language catalog files for sysinst, but do not
copy sysinst itself to / on the CD, and instead use the base version
for installation.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/install.sh
cvs rdiff -u -r1.38 -r1.39 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/cdroms/install.sh
cvs rdiff -u -r1.25 -r1.26 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/sparc64/cdroms/installcd/install.sh
cvs rdiff -u -r1.14 -r1.15 src/distrib/vax/cdroms/installcd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/vax/cdroms/installcd/install.sh
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/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.18 src/distrib/amd64/cdroms/Makefile.cdrom:1.19
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.18 Wed May 27 09:44:40 2015
+++ src/distrib/amd64/cdroms/Makefile.cdrom Thu May 28 09:51:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.18 2015/05/27 09:44:40 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.19 2015/05/28 09:51:31 martin Exp $
.include <bsd.own.mk>
@@ -19,7 +19,5 @@ image_md_pre:
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
- ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinst cdrom
- ${CHMOD} ugo+rx cdrom/sysinst
- ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+ ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
${MKDIR} cdrom/var
Index: src/distrib/amd64/cdroms/install.sh
diff -u src/distrib/amd64/cdroms/install.sh:1.3 src/distrib/amd64/cdroms/install.sh:1.4
--- src/distrib/amd64/cdroms/install.sh:1.3 Sun Jun 3 21:42:44 2012
+++ src/distrib/amd64/cdroms/install.sh Thu May 28 09:51:31 2015
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2012/06/03 21:42:44 joerg Exp $
+# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 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/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.38 src/distrib/i386/cdroms/Makefile.cdrom:1.39
--- src/distrib/i386/cdroms/Makefile.cdrom:1.38 Wed May 27 09:44:40 2015
+++ src/distrib/i386/cdroms/Makefile.cdrom Thu May 28 09:51:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.38 2015/05/27 09:44:40 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.39 2015/05/28 09:51:31 martin Exp $
.include <bsd.own.mk>
@@ -19,7 +19,5 @@ image_md_pre:
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
- ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinst cdrom
- ${CHMOD} ugo+rx cdrom/sysinst
- ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+ ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
${MKDIR} cdrom/var
Index: src/distrib/i386/cdroms/install.sh
diff -u src/distrib/i386/cdroms/install.sh:1.3 src/distrib/i386/cdroms/install.sh:1.4
--- src/distrib/i386/cdroms/install.sh:1.3 Sun Jun 3 21:42:45 2012
+++ src/distrib/i386/cdroms/install.sh Thu May 28 09:51:31 2015
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2012/06/03 21:42:45 joerg Exp $
+# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 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/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.25 src/distrib/sparc64/cdroms/installcd/Makefile:1.26
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.25 Wed May 27 09:44:40 2015
+++ src/distrib/sparc64/cdroms/installcd/Makefile Thu May 28 09:51:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/05/27 09:44:40 martin Exp $
+# $NetBSD: Makefile,v 1.26 2015/05/28 09:51:31 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd
@@ -21,10 +21,7 @@ image_md_pre:
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
- ${INSTALL} ${COPY} -m 0555 ${SYSINSTDIR}/sysinst cdrom
- for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
- ${INSTALL} ${COPY} $$f cdrom; \
- done
+ ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
image_md_post:
SUNLABEL=${TOOL_SUNLABEL:Q} \
Index: src/distrib/sparc64/cdroms/installcd/install.sh
diff -u src/distrib/sparc64/cdroms/installcd/install.sh:1.3 src/distrib/sparc64/cdroms/installcd/install.sh:1.4
--- src/distrib/sparc64/cdroms/installcd/install.sh:1.3 Sun Jun 3 21:42:45 2012
+++ src/distrib/sparc64/cdroms/installcd/install.sh Thu May 28 09:51:31 2015
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2012/06/03 21:42:45 joerg Exp $
+# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 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/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.14 src/distrib/vax/cdroms/installcd/Makefile:1.15
--- src/distrib/vax/cdroms/installcd/Makefile:1.14 Mon May 25 15:38:33 2015
+++ src/distrib/vax/cdroms/installcd/Makefile Thu May 28 09:51:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/05/25 15:38:33 martin Exp $
+# $NetBSD: Makefile,v 1.15 2015/05/28 09:51:31 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
@@ -21,10 +21,7 @@ image_md_pre:
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
- ${INSTALL} ${COPY} -m 0555 ${SYSINSTDIR}/sysinst cdrom
- for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
- ${INSTALL} ${COPY} $$f cdrom; \
- done
+ ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
${TOOL_GZIP} -d -f cdrom/netbsd.gz
# make the CD bootable
Index: src/distrib/vax/cdroms/installcd/install.sh
diff -u src/distrib/vax/cdroms/installcd/install.sh:1.1 src/distrib/vax/cdroms/installcd/install.sh:1.2
--- src/distrib/vax/cdroms/installcd/install.sh:1.1 Wed May 21 14:21:35 2014
+++ src/distrib/vax/cdroms/installcd/install.sh Thu May 28 09:51:31 2015
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.1 2014/05/21 14:21:35 martin Exp $
+# $NetBSD: install.sh,v 1.2 2015/05/28 09:51:31 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
