Module Name: src
Committed By: gson
Date: Sat Dec 15 18:03:18 UTC 2018
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/liveimage: Makefile Makefile.liveimage
src/distrib/amd64/liveimage/emuimage: Makefile
src/distrib/amd64/uefi-installimage: Makefile Makefile.bootimage
src/distrib/common/bootimage: Makefile.bootimage fstab.in
fstab.install.in
src/distrib/i386/installimage: Makefile
src/distrib/i386/liveimage: Makefile Makefile.liveimage
src/distrib/i386/liveimage/emuimage: Makefile
src/distrib/pmax/liveimage/emuimage: Makefile
src/distrib/sparc/liveimage/emuimage: Makefile
src/distrib/sparc64/liveimage/emuimage: Makefile
src/distrib/sun2/liveimage/emuimage: Makefile
src/distrib/sun3/liveimage/emuimage: Makefile
src/distrib/vax/liveimage/emuimage: Makefile
Removed Files:
src/distrib/amd64/liveimage/usbimage: Makefile
src/distrib/i386/liveimage/usbimage: Makefile
Log Message:
Use the special device name "ROOT." in /etc/fstab not just on the arm
images, but also on the bootable disk images of other ports, so that
they can be booted from differently named devices. Merge the i386 and
amd64 -live-sd0root and -live-wd0root images into a single live image
per port, bootable both from usb media and in qemu. Drop the -xx0root
suffixes from image names as they are no longer meaningful.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/liveimage/Makefile \
src/distrib/amd64/liveimage/Makefile.liveimage
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/amd64/liveimage/usbimage/Makefile
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.19 -r1.20 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.2 -r1.3 src/distrib/common/bootimage/fstab.in \
src/distrib/common/bootimage/fstab.install.in
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/liveimage/Makefile \
src/distrib/i386/liveimage/Makefile.liveimage
cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/i386/liveimage/usbimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/pmax/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/sparc/liveimage/emuimage/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/sparc64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/sun2/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/sun3/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/vax/liveimage/emuimage/Makefile
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.9 src/distrib/amd64/installimage/Makefile:1.10
--- src/distrib/amd64/installimage/Makefile:1.9 Mon Sep 18 14:42:16 2017
+++ src/distrib/amd64/installimage/Makefile Sat Dec 15 18:03:16 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2017/09/18 14:42:16 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $
.include <bsd.own.mk>
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-BOOTDISK= sd0 # for USB flash etc.
INSTIMAGEMB?= 1450 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
Index: src/distrib/amd64/liveimage/Makefile
diff -u src/distrib/amd64/liveimage/Makefile:1.1 src/distrib/amd64/liveimage/Makefile:1.2
--- src/distrib/amd64/liveimage/Makefile:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/liveimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/15 18:03:17 gson Exp $
SUBDIR=
SUBDIR+= emuimage
-SUBDIR+= usbimage
TARGETS+= release live_image
Index: src/distrib/amd64/liveimage/Makefile.liveimage
diff -u src/distrib/amd64/liveimage/Makefile.liveimage:1.1 src/distrib/amd64/liveimage/Makefile.liveimage:1.2
--- src/distrib/amd64/liveimage/Makefile.liveimage:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/liveimage/Makefile.liveimage Sat Dec 15 18:03:17 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.liveimage,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile.liveimage,v 1.2 2018/12/15 18:03:17 gson Exp $
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-BOOTDISK?= wd0 # for emulators
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
Index: src/distrib/amd64/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.3 src/distrib/amd64/liveimage/emuimage/Makefile:1.4
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.3 Sat Nov 3 14:25:32 2012
+++ src/distrib/amd64/liveimage/emuimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:17 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live-wd0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
-BOOTDISK= wd0 # for QEMU etc.
-.if defined(EMUIMAGEMB)
+USBIMAGEMB?= 1536 # 2GB USB flash memories aren't 2GiB
LIVEIMAGEMB= ${EMUIMAGEMB}
-.endif
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/amd64/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.5 src/distrib/amd64/uefi-installimage/Makefile:1.6
--- src/distrib/amd64/uefi-installimage/Makefile:1.5 Wed Mar 28 22:38:47 2018
+++ src/distrib/amd64/uefi-installimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2018/03/28 22:38:47 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/15 18:03:17 gson Exp $
.include <bsd.own.mk>
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
-BOOTDISK= dk1 # unused (use GUID)
INSTIMAGEMB?= 1550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.8 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.9
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.8 Mon Nov 19 20:05:37 2018
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Sat Dec 15 18:03:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.8 2018/11/19 20:05:37 aymeric Exp $
+# $NetBSD: Makefile.bootimage,v 1.9 2018/12/15 18:03:17 gson Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -34,9 +34,6 @@
# Basename of the image
#
# Optional variables:
-# BOOTDISK
-# device name of target bootable disk specified in /etc/fstab
-# (default: sd0)
# USE_MBR
# set yes if target disk image requires MBR partition
# (default: no)
@@ -158,7 +155,6 @@ RM?= rm
#
# common definitions for image
#
-BOOTDISK?= sd0
USE_MBR?= no
USE_GPT?= no
USE_SUNLABEL?= no
@@ -276,22 +272,21 @@ ${TARGETFS}: prepare_md_post pre-targetf
.if ${USE_GPT} != "no"
.if ${OMIT_SWAPIMG} == "no"
${TOOL_SED} \
- -e "s/\/dev\/@@BOOTDISK@@a/NAME=${BOOTDISK_UUID}/" \
- -e "s/\/dev\/@@BOOTDISK@@b/NAME=${SWAPDISK_UUID}/" \
+ -e "s/ROOT.a/NAME=${BOOTDISK_UUID}/" \
+ -e "s/ROOT.b/NAME=${SWAPDISK_UUID}/" \
< ${FSTAB_IN} > ${WORKFSTAB}
.else
${TOOL_SED} \
- -e "s/\/dev\/@@BOOTDISK@@a/NAME=${BOOTDISK_UUID}/" \
- -e "/@@BOOTDISK@@b/d" \
+ -e "s/ROOT.a/NAME=${BOOTDISK_UUID}/" \
+ -e "/ROOT.b/d" \
< ${FSTAB_IN} > ${WORKFSTAB}
.endif
.else # USE_GPT == "no"
.if ${OMIT_SWAPIMG} == "no"
- ${TOOL_SED} "s/@@BOOTDISK@@/${BOOTDISK}/" < ${FSTAB_IN} > ${WORKFSTAB}
+ ${TOOL_SED} < ${FSTAB_IN} > ${WORKFSTAB}
.else
${TOOL_SED} \
- -e "s/@@BOOTDISK@@/${BOOTDISK}/" \
- -e "/@@BOOTDISK@@b/d" \
+ -e "/ROOT.b/d" \
< ${FSTAB_IN} > ${WORKFSTAB}
.endif
.endif # USE_GPT != "no"
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.19 src/distrib/common/bootimage/Makefile.bootimage:1.20
--- src/distrib/common/bootimage/Makefile.bootimage:1.19 Mon Nov 19 20:05:37 2018
+++ src/distrib/common/bootimage/Makefile.bootimage Sat Dec 15 18:03:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.19 2018/11/19 20:05:37 aymeric Exp $
+# $NetBSD: Makefile.bootimage,v 1.20 2018/12/15 18:03:17 gson Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -34,9 +34,6 @@
# Basename of the image
#
# Optional variables:
-# BOOTDISK
-# device name of target bootable disk specified in /etc/fstab
-# (default: sd0)
# USE_MBR
# set yes if target disk image requires MBR partition
# (default: no)
@@ -148,7 +145,6 @@ RM?= rm
#
# common definitions for image
#
-BOOTDISK?= sd0
USE_MBR?= no
USE_SUNLABEL?= no
INSTALLBOOT_AFTER_DISKLABEL?= no
@@ -247,7 +243,7 @@ ${TARGETFS}: prepare_md_post
${INSTALL} ${COPY} -m 0644 ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
.endif
@echo Preparing /etc/fstab ...
- ${TOOL_SED} "s/@@BOOTDISK@@/${BOOTDISK}/" < ${FSTAB_IN} > ${WORKFSTAB}
+ ${TOOL_SED} < ${FSTAB_IN} > ${WORKFSTAB}
${INSTALL} ${COPY} -m 0644 ${WORKFSTAB} ${WORKDIR}/etc/fstab
@echo Setting rc_configured=YES in /etc/rc.conf ...
${TOOL_SED} "s/rc_configured=NO/rc_configured=YES/" \
Index: src/distrib/common/bootimage/fstab.in
diff -u src/distrib/common/bootimage/fstab.in:1.2 src/distrib/common/bootimage/fstab.in:1.3
--- src/distrib/common/bootimage/fstab.in:1.2 Tue Nov 20 20:16:03 2012
+++ src/distrib/common/bootimage/fstab.in Sat Dec 15 18:03:17 2018
@@ -1,5 +1,5 @@
-/dev/@@BOOTDISK@@a / ffs rw 1 1
-/dev/@@BOOTDISK@@b none none sw 0 0
+ROOT.a / ffs rw 1 1
+ROOT.b none none sw 0 0
ptyfs /dev/pts ptyfs rw 0 0
kernfs /kern kernfs rw,noauto 0 0
procfs /proc procfs rw,noauto 0 0
Index: src/distrib/common/bootimage/fstab.install.in
diff -u src/distrib/common/bootimage/fstab.install.in:1.2 src/distrib/common/bootimage/fstab.install.in:1.3
--- src/distrib/common/bootimage/fstab.install.in:1.2 Tue Nov 20 20:16:03 2012
+++ src/distrib/common/bootimage/fstab.install.in Sat Dec 15 18:03:17 2018
@@ -1,2 +1,2 @@
-/dev/@@BOOTDISK@@a / ffs rw 1 1
+ROOT.a / ffs rw 1 1
tmpfs /tmp tmpfs rw 0 0
Index: src/distrib/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.12 src/distrib/i386/installimage/Makefile:1.13
--- src/distrib/i386/installimage/Makefile:1.12 Tue Oct 30 20:18:30 2018
+++ src/distrib/i386/installimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2018/10/30 20:18:30 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/12/15 18:03:17 gson Exp $
.include <bsd.own.mk>
INSTIMGBASE= NetBSD-${DISTRIBVER}-i386-install # gives ${IMGBASE}.img
-BOOTDISK= sd0 # for USB flash etc.
INSTIMAGEMB?= 1450 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
Index: src/distrib/i386/liveimage/Makefile
diff -u src/distrib/i386/liveimage/Makefile:1.1 src/distrib/i386/liveimage/Makefile:1.2
--- src/distrib/i386/liveimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/liveimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/15 18:03:17 gson Exp $
SUBDIR=
SUBDIR+= emuimage
-SUBDIR+= usbimage
TARGETS+= release live_image
Index: src/distrib/i386/liveimage/Makefile.liveimage
diff -u src/distrib/i386/liveimage/Makefile.liveimage:1.1 src/distrib/i386/liveimage/Makefile.liveimage:1.2
--- src/distrib/i386/liveimage/Makefile.liveimage:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/liveimage/Makefile.liveimage Sat Dec 15 18:03:17 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.liveimage,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile.liveimage,v 1.2 2018/12/15 18:03:17 gson Exp $
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-BOOTDISK?= wd0 # for emulators
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
Index: src/distrib/i386/liveimage/emuimage/Makefile
diff -u src/distrib/i386/liveimage/emuimage/Makefile:1.3 src/distrib/i386/liveimage/emuimage/Makefile:1.4
--- src/distrib/i386/liveimage/emuimage/Makefile:1.3 Sat Nov 3 14:25:33 2012
+++ src/distrib/i386/liveimage/emuimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:17 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-i386-live-wd0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-i386-live # gives ${IMGBASE}.img
-BOOTDISK= wd0 # for QEMU etc.
-.if defined(EMUIMAGEMB)
+EMUIMAGEMB?= 1536 # 2GB USB flash memories aren't 2GiB
LIVEIMAGEMB= ${EMUIMAGEMB}
-.endif
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/pmax/liveimage/emuimage/Makefile
diff -u src/distrib/pmax/liveimage/emuimage/Makefile:1.3 src/distrib/pmax/liveimage/emuimage/Makefile:1.4
--- src/distrib/pmax/liveimage/emuimage/Makefile:1.3 Sat Nov 3 14:25:33 2012
+++ src/distrib/pmax/liveimage/emuimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:17 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-pmax-live-sd0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-pmax-live # gives ${IMGBASE}.img
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-BOOTDISK= sd0
.if defined(EMUIMAGEMB)
LIVEIMAGEMB= ${EMUIMAGEMB}
.endif
Index: src/distrib/sparc/liveimage/emuimage/Makefile
diff -u src/distrib/sparc/liveimage/emuimage/Makefile:1.3 src/distrib/sparc/liveimage/emuimage/Makefile:1.4
--- src/distrib/sparc/liveimage/emuimage/Makefile:1.3 Sat Nov 3 14:25:33 2012
+++ src/distrib/sparc/liveimage/emuimage/Makefile Sat Dec 15 18:03:17 2018
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:17 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc-live-sd0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc-live # gives ${IMGBASE}.img
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-BOOTDISK= sd0
.if defined(EMUIMAGEMB)
LIVEIMAGEMB= ${EMUIMAGEMB}
.endif
Index: src/distrib/sparc64/liveimage/emuimage/Makefile
diff -u src/distrib/sparc64/liveimage/emuimage/Makefile:1.4 src/distrib/sparc64/liveimage/emuimage/Makefile:1.5
--- src/distrib/sparc64/liveimage/emuimage/Makefile:1.4 Sun Mar 22 14:02:15 2015
+++ src/distrib/sparc64/liveimage/emuimage/Makefile Sat Dec 15 18:03:18 2018
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2015/03/22 14:02:15 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/15 18:03:18 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc64-live-sd0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc64-live # gives ${IMGBASE}.img
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-BOOTDISK= sd0 # for QEMU
-#BOOTDISK= wd0 # for Ultra5/10 image?
.if defined(EMUIMAGEMB)
LIVEIMAGEMB= ${EMUIMAGEMB}
.endif
Index: src/distrib/sun2/liveimage/emuimage/Makefile
diff -u src/distrib/sun2/liveimage/emuimage/Makefile:1.3 src/distrib/sun2/liveimage/emuimage/Makefile:1.4
--- src/distrib/sun2/liveimage/emuimage/Makefile:1.3 Sat Nov 3 14:25:33 2012
+++ src/distrib/sun2/liveimage/emuimage/Makefile Sat Dec 15 18:03:18 2018
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:18 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun2-live-sd0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun2-live # gives ${IMGBASE}.img
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-BOOTDISK= sd0
.if defined(EMUIMAGEMB)
LIVEIMAGEMB= ${EMUIMAGEMB}
.endif
Index: src/distrib/sun3/liveimage/emuimage/Makefile
diff -u src/distrib/sun3/liveimage/emuimage/Makefile:1.3 src/distrib/sun3/liveimage/emuimage/Makefile:1.4
--- src/distrib/sun3/liveimage/emuimage/Makefile:1.3 Sat Nov 3 14:25:33 2012
+++ src/distrib/sun3/liveimage/emuimage/Makefile Sat Dec 15 18:03:18 2018
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:18 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun3-live-sd0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun3-live # gives ${IMGBASE}.img
.include <bsd.own.mk>
KERN_SET= kern-GENERIC
-BOOTDISK= sd0
.if defined(EMUIMAGEMB)
LIVEIMAGEMB= ${EMUIMAGEMB}
.endif
Index: src/distrib/vax/liveimage/emuimage/Makefile
diff -u src/distrib/vax/liveimage/emuimage/Makefile:1.3 src/distrib/vax/liveimage/emuimage/Makefile:1.4
--- src/distrib/vax/liveimage/emuimage/Makefile:1.3 Sat Nov 3 14:25:33 2012
+++ src/distrib/vax/liveimage/emuimage/Makefile Sat Dec 15 18:03:18 2018
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:18 gson Exp $
-LIVEIMGBASE= NetBSD-${DISTRIBVER}-vax-live-ra0root # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-vax-live # gives ${IMGBASE}.img
.include <bsd.own.mk>
EMUIMAGEMB?= 1024 # ra0 can't handle 2GB image
KERN_SET= kern-GENERIC
-BOOTDISK= ra0
LIVEIMAGEMB= ${EMUIMAGEMB}
PRIMARY_BOOT= xxboot
#SECONDARY_BOOT= # boot is extracted from base.tgz
