From: Chris Pressey <cpressey@dragonflybsd.org>
Date: Thu, 11 Nov 2004 19:45:19 +0000 (+0000)
Subject: Update installer to 1.1.2.
X-Git-Tag: v2.0.1~9790
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/21aa02d05522e03482025877086c1c063308d2f2

Update installer to 1.1.2.

The most significant change in this update is that there are now two
seperate directories on the install medium, /etc and /etc.hdd :

- /etc contains the configuration used for booting the LiveCD only.
  It is NOT copied to the hard drive.

- /etc.hdd contains the default configuration used for booting from
  a hard drive.  It is NOT used for booting the LiveCD.  It IS copied
  to the hard drive, as /etc .

This avoids the `copy pristine files afterward' rigamarole and, in
so doing, simplifies both manual and automatic install routines.

The README file has also been updated to reflect this change.

Suggested-by: dillon (a while ago)
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 001ec5c753..3ff5c860a6 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.18 2004/10/15 02:43:48 dillon Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.19 2004/11/11 19:45:19 cpressey Exp $
 #
 
 ISODIR ?= /usr/release
@@ -48,7 +48,7 @@ realquickrel:	check clean \
 #########################################################################
 
 INSTALLER_PKGS= libaura-1.0 libdfui-2.0 libinstaller-2.0 \
-		dfuibe_installer-1.1.1 dfuife_curses-1.1 \
+		dfuibe_installer-1.1.2 dfuife_curses-1.1 \
 		thttpd-notimeout-2.24 dfuife_cgi-1.1
 INSTALLER_SKELS= installer
 
@@ -124,6 +124,7 @@ buildiso:
 	if [ ! -d ${NRLOBJDIR}/nrelease ]; then mkdir -p ${NRLOBJDIR}/nrelease; fi
 	( cd ${.CURDIR}/..; make DESTDIR=${ISOROOT} installworld )
 	( cd ${.CURDIR}/../etc; MAKEOBJDIRPREFIX=${NRLOBJDIR}/nrelease make DESTDIR=${ISOROOT} distribution )
+	cpdup ${ISOROOT}/etc ${ISOROOT}/etc.hdd
 	( cd ${.CURDIR}/..; make DESTDIR=${ISOROOT} \
 		installkernel KERNCONF=${KERNCONF} )
 	ln -s kernel ${ISOROOT}/kernel.BOOTP
@@ -136,6 +137,7 @@ customizeiso:
 	cpdup -X cpignore -o ${ROOTSKEL} ${ISOROOT}
 .endfor
 	rm -rf `find ${ISOROOT} -type d -name CVS -print`
+	rm -rf ${ISOROOT}/usr/local/share/pristine
 	pwd_mkdb -p -d ${ISOROOT}/etc ${ISOROOT}/etc/master.passwd
 
 pkgcleaniso:
diff --git a/nrelease/root/README b/nrelease/root/README
index d2fd42a93a..62fd3c0126 100644
--- a/nrelease/root/README
+++ b/nrelease/root/README
@@ -151,9 +151,14 @@
 
 	# Copy the CDRom onto the target.  cpdup won't cross mount boundaries
 	# on the source (e.g. the MFS remounts) so it takes a few commands.
+	#
+	# Note that /etc contains the config files used for booting from the
+	# CDROM itself, and /etc.hdd contains those for booting off a
+	# hard disk.  So it's the latter that you want to copy to /mnt/etc.
+	#
 	cpdup / /mnt
 	cpdup /var /mnt/var
-	cpdup /etc /mnt/etc
+	cpdup /etc.hdd /mnt/etc
 	cpdup /dev /mnt/dev
 	cpdup /usr /mnt/usr
 
@@ -171,18 +176,6 @@
 	mv /mnt/etc/fstab.example /mnt/etc/fstab
 	vi /mnt/etc/fstab
 
-	# Edit /mnt/etc/ttys, adding ttyv1 back in (it is left out on the CD
-	# so the installer has a low numbered vty to play with)
-	#
-	vi /mnt/etc/ttys
-
-	# chroot into the HD and edit the password file to remove the
-	# 'installer' user.
-	#
-	chroot /mnt /bin/csh
-	% vipw	(remove 'installer' user, :wq out)
-	% ^D	(exit the chroot)
-
 	# save out your disklabel just in case.  It's a good idea to save
 	# it to /etc so you can get at it from your backups.  You do intend
 	# to backup your system, yah? :-)  (this isn't critical but it's a
@@ -326,5 +319,5 @@
     what they are, simply cat /mnt/etc/fstab after mounting the root
     partition.
 
-$DragonFly: src/nrelease/root/README,v 1.16 2004/07/12 20:02:23 drhodus Exp $
+$DragonFly: src/nrelease/root/README,v 1.17 2004/11/11 19:45:19 cpressey Exp $