- Add SSH key authorization

- Fix sample installation in Makefile
- Bump version to BETA3
- Change default release to 7.2

BUILD

@@ -3,7 +3,7 @@
 # mfsBSD building instructions
 # Copyright (c) 2007-2008 Martin Matuska <mm at FreeBSD.org>
 #
-# Version 1.0-BETA2
+# Version 1.0-BETA3
 
 BUILDING INSTRUCTIONS:
  1. Configuration

ChangeLog

@@ -3,6 +3,10 @@
 # mfsBSD changelog
 # Copyright (c) 2007-2008 Martin Matuska <mm at FreeBSD.org>
 #
+07.05.2009
+  - Enable authorization with ssh keys
+  - Integrate rootpw.conf into rc.conf
+
 14.04.2008
   - Add missing "make distribution" on CUSTOM install
 

INSTALL

@@ -15,7 +15,7 @@ You have a linux server without console access and want to install
 FreeBSD on this server.
 
 a) modify your configuration files (do this properly, or no ssh access)
-b) create an image file (e.g. make DIST=1 BASE=/cdrom/7.0-RELEASE)
+b) create an image file (e.g. make DIST=1 BASE=/cdrom/7.2-RELEASE)
 c) write image with dd to the bootable harddrive of the linux server
 d) reboot
 e) ssh to your machine and enjoy :)
@@ -25,7 +25,7 @@ You want a rescue CD-ROM with a minimal FreeBSD installation that doesn't
 need to remain in the tray after booting.
 
 a) modify your configuration files
-b) create an iso image file (e.g. make iso DIST=1 BASE=/cdrom/7.0-RELEASE)
+b) create an iso image file (e.g. make iso DIST=1 BASE=/cdrom/7.2-RELEASE)
 c) burn ISO image onto a writable CD
 d) boot from the CD and enjoy :)
 
@@ -34,7 +34,7 @@ You want a rescue partition on your FreeBSD system so you can re-partition
 all harddrives remotely.
 
 a) modify your configuration files
-b) create an .tar.gz file (e.g. make tar DIST=1 BASE=/cdrom/7.0-RELEASE)
+b) create an .tar.gz file (e.g. make tar DIST=1 BASE=/cdrom/7.2-RELEASE)
 c) create your slice with sysinstall or fdisk (e.g. ad0s1)
 d) auto-label the slice (e.g. bsdlabel -r -w ad0s1 auto)
 e) create a filesystem on the slice (e.g. newfs /dev/ad0s1a)

Makefile

@@ -3,7 +3,7 @@
 # mfsBSD
 # Copyright (c) 2007-2008 Martin Matuska <mm at FreeBSD.org>
 #
-# Version 1.0-BETA2
+# Version 1.0-BETA3
 #
 
 #
@@ -153,7 +153,7 @@ ${WRKDIR}/.packages_done:
 config: install ${WRKDIR}/.config_done
 ${WRKDIR}/.config_done:
 	@echo -n "Installing configuration scripts and files ..."
-	@for FILE in loader.conf rc.conf resolv.conf interfaces.conf rootpw.conf; do \
+	@for FILE in loader.conf rc.conf resolv.conf interfaces.conf; do \
 		if [ ! -f "${CFGDIR}/$${FILE}" ]; then \
 			if [ ! -f "${CFGDIR}/$${FILE}.sample" ]; then \
 				echo "Missing ${CFGDIR}/$${FILE}.sample"; \
@@ -165,10 +165,27 @@ ${WRKDIR}/.config_done:
 	done
 	@${RM} -f ${WRKDIR}/mfs/etc/motd
 	@${MKDIR} ${WRKDIR}/mfs/stand ${WRKDIR}/mfs/etc/rc.conf.d
-	@${CP} ${CFGDIR}/loader.conf ${WRKDIR}/mfs/boot/
-	@${CP} ${CFGDIR}/rc.conf ${CFGDIR}/resolv.conf ${WRKDIR}/mfs/etc/
-	@${CP} ${CFGDIR}/interfaces.conf ${WRKDIR}/mfs/etc/rc.conf.d/interfaces
-	@${CP} ${CFGDIR}/rootpw.conf ${WRKDIR}/mfs/etc/rc.conf.d/rootpw
+	@if [ -f "${CFGDIR}/loader.conf" ]; then \
+		@${CP} ${CFGDIR}/loader.conf ${WRKDIR}/mfs/boot/loader.conf; \
+	else \
+		@${CP} ${CFGDIR}/loader.conf.sample ${WRKDIR}/mfs/boot/loader.conf; \
+	fi
+	@if [ -f "${CFGDIR}/rc.conf" ]; then \
+		@${CP} ${CFGDIR}/rc.conf ${WRKDIR}/mfs/etc/rc.conf;
+	else \
+		@${CP} ${CFGDIR}/rc.conf.sample ${WRKDIR}/mfs/etc/rc.conf; \
+	fi
+	@if [ -f "${CFGDIR}/resolv.conf" ]; then \
+		@${CP} ${CFGDIR}/resolv.conf ${WRKDIR}/mfs/etc/resolv.conf; \
+	fi
+	@if [ -f "${CFGDIR}/interfaces.conf" ]; then \
+		@${CP} ${CFGDIR}/interfaces.conf ${WRKDIR}/mfs/etc/rc.conf.d/interfaces; \
+	fi
+	@if [ -f "${CFGDIR}/authorized_keys" ]; then \
+		@${MKDIR} ${WRKDIR}/mfs/root/.ssh; \
+		@${CHMOD} 700 ${WRKDIR}/mfs/root/.ssh; \
+		@${CP} ${CFGDIR}/authorized_keys ${WRKDIR}/mfs/root/.ssh/authorized_keys \
+	fi
 	@for SCRIPT in ${SCRIPTS}; do \
 		${CP} ${SCRIPTSDIR}/$${SCRIPT} ${WRKDIR}/mfs/etc/rc.d/; \
 		${CHMOD} 555 ${WRKDIR}/mfs/etc/rc.d/$${SCRIPT}; \

README

@@ -3,7 +3,7 @@
 # mfsBSD README
 # Copyright (c) 2007 Martin Matuska <mm at FreeBSD.org>
 #
-# Version 1.0-BETA1
+# Version 1.0-BETA3
 
 DESCRIPTION:
 This is a set of scripts that generates a bootable image, ISO file or boot 

conf/authorized_keys.sample

@@ -0,0 +1,2 @@
+# $Id$
+# Public SSH key(s) for root authorization

conf/rc.conf.sample

@@ -9,6 +9,11 @@
 # Set this to any desired hostname
 hostname="mfsbsd"
 #
+# Set this to your desired root password of the installation
+# As an alternative, you can add keys to the authorized_keys file.
+# If rootpw is unset or empty, you can authorize only with keys.
+#rootpw="mfsbsd"
+#
 # You need a gateway defined for a working network setup
 #defaultrouter="192.168.0.254"
 #

conf/rootpw.conf.sample

@@ -1,12 +0,0 @@
-# $Id$
-#
-# rootpw is the root password which will be set. 
-#
-# Root login will be enabled in sshd, so this allows you to login and install 
-# FreeBSD remotely.
-#
-# Make sure you only use alphanumeric characters here; other symbols may cause 
-# problems. Note that this is stored in plaintext!  Don't use an important 
-# password for this.
-#
-rootpw='mfsbsd'