Module Name: src
Committed By: christos
Date: Fri Sep 25 14:09:27 UTC 2009
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms: Makefile.cdrom
Log Message:
Exit with 1 so that we stay in single user mode when sysinst exits with 'x'.
Otherwise things get messed up (no /dev). From Anon Ymous
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/cdroms/Makefile.cdrom
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.16 src/distrib/common/Makefile.bootcd:1.17
--- src/distrib/common/Makefile.bootcd:1.16 Tue Dec 2 05:06:00 2008
+++ src/distrib/common/Makefile.bootcd Fri Sep 25 10:09:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.16 2008/12/02 10:06:00 hubertf Exp $
+# $NetBSD: Makefile.bootcd,v 1.17 2009/09/25 14:09:27 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -67,6 +67,7 @@
RM?= rm
MKDIR?= mkdir -p
CHMOD?= chmod
+ECHO?= echo
CLEANFILES+= ${CDBASE}.iso
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.12 src/distrib/i386/cdroms/Makefile.cdrom:1.13
--- src/distrib/i386/cdroms/Makefile.cdrom:1.12 Sun Aug 30 18:30:30 2009
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Sep 25 10:09:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.12 2009/08/30 22:30:30 hubertf Exp $
+# $NetBSD: Makefile.cdrom,v 1.13 2009/09/25 14:09:27 christos Exp $
.include <bsd.own.mk>
@@ -48,6 +48,9 @@
image_md_pre:
${MKDIR} cdrom/etc
${CP} ${.CURDIR}/../../ramdisks/common/dot.profile cdrom/etc/rc
+ ${ECHO} "" >> cdrom/etc/rc
+ ${ECHO} "# exit to single user mode" >> cdrom/etc/rc
+ ${ECHO} "exit 1" >> cdrom/etc/rc
${MKDIR} cdrom/mnt2 cdrom/targetroot
${CP} ${SYSINSTDIR}/sysinst cdrom
${CHMOD} ugo+rx cdrom/sysinst
