svn commit: r213324 - in head/tools/tools/nanobsd/rescue: . Pkg

[Michael Reifenberger]

Author: mr
Date: Fri Oct  1 10:34:35 2010
New Revision: 213324
URL: http://svn.freebsd.org/changeset/base/213324

Log:
  - simplify by using one build script
  - use label for mounting
  - use GENERIC kernel
  - create empty Pkg directory

Added:
  head/tools/tools/nanobsd/rescue/Pkg/
  head/tools/tools/nanobsd/rescue/build.sh   (contents, props changed)
Deleted:
  head/tools/tools/nanobsd/rescue/AMD64
  head/tools/tools/nanobsd/rescue/I386
  head/tools/tools/nanobsd/rescue/isoamd64.sh
  head/tools/tools/nanobsd/rescue/isoi386.sh
Modified:
  head/tools/tools/nanobsd/rescue/common
  head/tools/tools/nanobsd/rescue/isoamd64.conf
  head/tools/tools/nanobsd/rescue/isoi386.conf

Added: head/tools/tools/nanobsd/rescue/build.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/nanobsd/rescue/build.sh	Fri Oct  1 10:34:35 2010	(r213324)
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+if [ -z "${1}" -o \! -f "${1}" ]; then
+  echo "Usage: $0 cfg_file [-bhiknw]"
+  echo "-i : skip image build"
+  echo "-w : skip buildworld step"
+  echo "-k : skip buildkernel step"
+  echo "-b : skip buildworld and buildkernel step"
+  exit
+fi
+
+CFG="${1}"
+shift;
+
+sh ../nanobsd.sh $* -c ${CFG}

Modified: head/tools/tools/nanobsd/rescue/common
==============================================================================
--- head/tools/tools/nanobsd/rescue/common	Fri Oct  1 10:32:54 2010	(r213323)
+++ head/tools/tools/nanobsd/rescue/common	Fri Oct  1 10:34:35 2010	(r213324)
@@ -5,6 +5,7 @@ NANO_TOOLS=`pwd`
 NANO_PACKAGE_DIR=`pwd`/Pkg
 NANO_RAM_TMPVARSIZE=20480
 NANO_PMAKE="make -j 8"
+NANO_LABEL="rescue"
 
 # Options to put in make.conf during buildworld only
 CONF_BUILD='
@@ -52,7 +53,7 @@ cust_etc_cfg () (
 	echo "keymap=\"german.iso\"" >> etc/rc.conf
 	echo "#ifconfig_fxp0=\"AUTO\"" >> etc/rc.conf
 	echo "#sshd_enable=\"YES\"" >> etc/rc.conf
-	echo "/dev/acd0 / cd9660 ro 0 0" > etc/fstab
+	echo "/dev/iso9660/${NANO_LABEL} / cd9660 ro,noatime 0 0" > etc/fstab
 	echo "tmpfs /tmp tmpfs rw,size=268435456,mode=1777 0 0" >> etc/fstab
 	echo "ports:/usr/ports /usr/ports nfs rw,noauto,noatime,bg,soft,intr,nfsv3 0 0" >> etc/fstab
 #	echo "/dev/ad1s1a /scratch ufs rw,noauto,noatime 0 0" >> etc/fstab
@@ -81,7 +82,16 @@ last_orders () (
 	touch conf/default/etc/.keepme
 	touch conf/default/var/.keepme
 	cd ..
-	mkisofs -quiet -r -J -no-emul-boot -b boot/cdboot -o _.disk.iso _.w/
+	mkisofs -quiet -r -J -no-emul-boot \
+	-V ${NANO_LABEL} \
+	-b boot/cdboot -o _.disk.iso _.w/
 	)
 )
 
+create_i386_diskimage () {
+	#currently not used
+}
+
+create_amd64_diskimage () {
+	create_i386_diskimage
+}

Modified: head/tools/tools/nanobsd/rescue/isoamd64.conf
==============================================================================
--- head/tools/tools/nanobsd/rescue/isoamd64.conf	Fri Oct  1 10:32:54 2010	(r213323)
+++ head/tools/tools/nanobsd/rescue/isoamd64.conf	Fri Oct  1 10:34:35 2010	(r213324)
@@ -1,7 +1,7 @@
 #
 # $FreeBSD$
 #
-NANO_KERNEL=AMD64
+NANO_KERNEL=GENERIC
 NANO_ARCH=amd64
 TARGET_ARCH=amd64; export TARGET_ARCH
 #TARGET_CPUTYPE=amd64; export TARGET_CPUTYPE

Modified: head/tools/tools/nanobsd/rescue/isoi386.conf
==============================================================================
--- head/tools/tools/nanobsd/rescue/isoi386.conf	Fri Oct  1 10:32:54 2010	(r213323)
+++ head/tools/tools/nanobsd/rescue/isoi386.conf	Fri Oct  1 10:34:35 2010	(r213324)
@@ -1,7 +1,7 @@
 #
 # $FreeBSD$
 #
-NANO_KERNEL=I386
+NANO_KERNEL=GENERIC
 NANO_ARCH=i386
 TARGET_ARCH=i386; export TARGET_ARCH
 #TARGET_CPUTYPE=i386; export TARGET_CPUTYPE