installer: Join nrelease/root and nrelease/installer.

We don't support building installer-less ISOs out of the box so keeping
it separate doesn't make sense anymore.

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 8ceb2d4..b043d23 100644 (file)
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -97,8 +97,7 @@ OLD_PKGSRC_PACKAGES?= cdrtools-2.01.01.27nb1 \
 # their own.  They are copied into ISODIR during the `customizeiso'
 # target; each overwrites the last.
 #
-REQ_ROOTSKELS= ${.CURDIR}/root \
-               ${.CURDIR}/installer
+REQ_ROOTSKELS= ${.CURDIR}/root
 ROOTSKELS?=    ${REQ_ROOTSKELS}
 
 .if make(gui)

diff --git a/nrelease/installer/etc/issue b/nrelease/root/etc/issue
similarity index 100%
rename from nrelease/installer/etc/issue
rename to nrelease/root/etc/issue

diff --git a/nrelease/installer/etc/master.passwd b/nrelease/root/etc/master.passwd
similarity index 100%
rename from nrelease/installer/etc/master.passwd
rename to nrelease/root/etc/master.passwd

diff --git a/nrelease/installer/etc/rc.d/pfi b/nrelease/root/etc/rc.d/pfi
similarity index 99%
rename from nrelease/installer/etc/rc.d/pfi
rename to nrelease/root/etc/rc.d/pfi
index 58b5092..f3e0877 100755 (executable)
--- a/nrelease/installer/etc/rc.d/pfi
+++ b/nrelease/root/etc/rc.d/pfi
@@ -21,10 +21,10 @@ get_pfi_config()
                echo " found!"
                tr -d "\r" < $1/pfi.conf > /etc/pfi.conf
                echo "pfi_found_on_device='$2'" >> /etc/pfi.conf
-       
+
                # If the pfi.conf says to run a custom script from the pfi
                # media, run it now, so that it has access to the pfi media.
-       
+
                if [ -r /etc/defaults/pfi.conf ]; then
                        . /etc/defaults/pfi.conf
                fi

diff --git a/nrelease/installer/etc/ttys b/nrelease/root/etc/ttys
similarity index 100%
rename from nrelease/installer/etc/ttys
rename to nrelease/root/etc/ttys