head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_9_1_0_RELEASE:1.3.2.1.4.2
	RELENG_9_1:1.3.2.1.0.4
	RELENG_9_1_BP:1.3.2.1
	RELENG_8_3_0_RELEASE:1.1.2.1.8.1
	RELENG_8_3:1.1.2.1.0.8
	RELENG_8_3_BP:1.1.2.1
	RELENG_9_0_0_RELEASE:1.3.2.1.2.1
	RELENG_9_0:1.3.2.1.0.2
	RELENG_9_0_BP:1.3.2.1
	RELENG_9:1.3.0.2
	RELENG_9_BP:1.3
	RELENG_8_2_0_RELEASE:1.1.2.1.6.1
	RELENG_8_2:1.1.2.1.0.6
	RELENG_8_2_BP:1.1.2.1
	RELENG_8_1_0_RELEASE:1.1.2.1.4.1
	RELENG_8_1:1.1.2.1.0.4
	RELENG_8_1_BP:1.1.2.1
	RELENG_8_0_0_RELEASE:1.1.2.1.2.1
	RELENG_8_0:1.1.2.1.0.2
	RELENG_8_0_BP:1.1.2.1
	RELENG_8:1.1.0.2
	RELENG_8_BP:1.1;
locks; strict;
comment	@# @;


1.4
date	2012.11.17.01.54.10;	author svnexp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2011.03.18.22.56.53;	author mr;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2010.10.01.10.34.35;	author mr;	state Exp;
branches;
next	1.1;

1.1
date	2009.02.11.12.15.35;	author mr;	state Exp;
branches
	1.1.2.1;
next	;

1.4.2.1
date	2012.11.17.01.54.10;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.05.58;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.3.2.1.2.1
	1.3.2.1.4.1;
next	1.3.2.2;

1.3.2.2
date	2012.11.17.11.37.36;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.3.2.1.2.2;

1.3.2.1.2.2
date	2012.11.17.08.37.32;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.3.2.1.4.2;

1.3.2.1.4.2
date	2012.11.17.08.48.24;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.1.2.1.2.1
	1.1.2.1.4.1
	1.1.2.1.6.1
	1.1.2.1.8.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.10.37.14;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.2.1.8.2;

1.1.2.1.8.2
date	2012.11.17.08.25.48;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Switching exporter and resync
@
text
@#
# $FreeBSD: head/tools/tools/nanobsd/rescue/common 219760 2011-03-18 22:56:53Z mr $
#
NANO_TOOLS=`pwd`
NANO_PACKAGE_DIR=`pwd`/Pkg
NANO_RAM_TMPVARSIZE=20480
NANO_PMAKE="make -j 8"
NANO_LABEL="rescue"
NANO_RAM_TMPVARSIZE=40960
#NANO_MEDIASIZE="8027712"
#NANO_MEDIASIZE="2097152"
NANO_MEDIASIZE="3932160"
NANO_SECTS="63"
NANO_HEADS="16"
NANO_IMAGES="2"
NANO_INIT_IMG2="0"
NANO_BOOT0CFG="-o packet,update,nosetdrv -s 1 -m 3"
NANO_DRIVE=da0
#NANO_MODULES=
NANO_BOOTLOADER="boot/boot0"
NANO_BOOT2CFG=""
NANO_MD_BACKING=swap

# Options to put in make.conf during buildworld only
CONF_BUILD='
'
# Options to put in make.conf during installworld only                          
CONF_INSTALL='
'
# Options to put in make.conf during both build- & installworld.                
CONF_WORLD='                                                                    
#TARGET_ARCH=i386
CFLAGS=-O -pipe                                                                
ALL_MODULES=YES
'

#customize_cmd cust_comconsole
customize_cmd cust_allow_ssh_root
customize_cmd cust_install_files

cust_ld32_cfg () (
	cd ${NANO_WORLDDIR}/libexec
	if [ \! -f ld-elf32.so.1 ]; then
	ln -s ld-elf.so.1 ld-elf32.so.1
	fi
)
customize_cmd cust_ld32_cfg

#cust_boot_cfg () (
#	cd ${NANO_WORLDDIR}
#	echo "-S115200 -h" > boot.config
#	echo "console=\"comconsole\"" > boot/loader.conf
#	echo "comconsole_speed=\"115200\"" >> boot/loader.conf
#	echo "hint.acpi.0.disabled=\"1\"" >> boot/loader.conf
#)
#customize_cmd cust_boot_cfg

customize_cmd cust_pkg

cust_etc_cfg () (
  cd ${NANO_WORLDDIR}
#  mkdir -pv scratch
	echo "hostname=\"rescue\"" > etc/rc.conf
	echo "font8x14=\"iso15-8x14\"" >> etc/rc.conf
	echo "font8x16=\"iso15-8x16\"" >> etc/rc.conf
	echo "font8x8=\"iso15-8x8\"" >> etc/rc.conf
	echo "keymap=\"german.iso\"" >> etc/rc.conf
	echo "#ifconfig_fxp0=\"AUTO\"" >> etc/rc.conf
	echo "#sshd_enable=\"YES\"" >> etc/rc.conf
	echo "/dev/ufs/${NANO_LABEL}s1a / ufs ro,noatime 0 0" > etc/fstab
	echo "tmpfs /boot/zfs tmpfs rw,size=1048576,mode=777 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
	/usr/sbin/pwd_mkdb -d etc etc/master.passwd
)
customize_cmd cust_etc_cfg

setup_nanobsd_etc ( ) (
	pprint 2 "configure nanobsd /etc"
	(
	cd ${NANO_WORLDDIR}
	# create diskless marker file
	touch etc/diskless
	# Make root filesystem R/O by default
	echo "root_rw_mount=NO" >> etc/defaults/rc.conf
	# save config file for scripts
	echo "NANO_DRIVE=${NANO_DRIVE}" > etc/nanobsd.conf
	mkdir -p cfg
	)
)
last_orders () (
	pprint 2 "last orders"
	(
	cd ${NANO_WORLDDIR}
	echo "/dev/iso9660/${NANO_LABEL} / cd9660 ro,noatime 0 0" > etc/fstab
	echo "tmpfs /boot/zfs tmpfs rw,size=1048576,mode=777 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
	rm -f conf/default/etc/remount
	touch conf/default/etc/.keepme
	touch conf/default/var/.keepme
	cd ..
	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
#}
@


1.4.2.1
log
@file common was added on branch RELENG_8_4 on 2013-03-28 13:05:58 +0000
@
text
@d1 115
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 87
#
# $FreeBSD: releng/8.4/tools/tools/nanobsd/rescue/common 188482 2009-02-11 12:15:35Z mr $
#
NANO_TOOLS=`pwd`
NANO_PACKAGE_DIR=`pwd`/Pkg
NANO_RAM_TMPVARSIZE=20480
NANO_PMAKE="make -j 8"

# Options to put in make.conf during buildworld only
CONF_BUILD='
'
# Options to put in make.conf during installworld only                          
CONF_INSTALL='
'
# Options to put in make.conf during both build- & installworld.                
CONF_WORLD='                                                                    
#TARGET_ARCH=i386
CFLAGS=-O -pipe                                                                
#MODULES_OVERRIDE=
'

#customize_cmd cust_comconsole
customize_cmd cust_allow_ssh_root
customize_cmd cust_install_files

cust_ld32_cfg () (
	cd ${NANO_WORLDDIR}/libexec
	if [ \! -f ld-elf32.so.1 ]; then
	ln -s ld-elf.so.1 ld-elf32.so.1
	fi
)
customize_cmd cust_ld32_cfg

#cust_boot_cfg () (
#	cd ${NANO_WORLDDIR}
#	echo "-S115200 -h" > boot.config
#	echo "console=\"comconsole\"" > boot/loader.conf
#	echo "comconsole_speed=\"115200\"" >> boot/loader.conf
#	echo "hint.acpi.0.disabled=\"1\"" >> boot/loader.conf
#)
#customize_cmd cust_boot_cfg

customize_cmd cust_pkg

cust_etc_cfg () (
  cd ${NANO_WORLDDIR}
#  mkdir -pv scratch
	echo "hostname=\"rescue\"" > etc/rc.conf
	echo "font8x14=\"iso15-8x14\"" >> etc/rc.conf
	echo "font8x16=\"iso15-8x16\"" >> etc/rc.conf
	echo "font8x8=\"iso15-8x8\"" >> etc/rc.conf
	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 "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
	/usr/sbin/pwd_mkdb -d etc etc/master.passwd
)
customize_cmd cust_etc_cfg

setup_nanobsd_etc ( ) (
	pprint 2 "configure nanobsd /etc"
	(
	cd ${NANO_WORLDDIR}
	# create diskless marker file
	touch etc/diskless
	# Make root filesystem R/O by default
	echo "root_rw_mount=NO" >> etc/defaults/rc.conf
	# save config file for scripts
	echo "NANO_DRIVE=${NANO_DRIVE}" > etc/nanobsd.conf
	mkdir -p cfg
	)
)
last_orders () (
	pprint 2 "last orders"
	(
	cd ${NANO_WORLDDIR}
	rm -f conf/default/etc/remount
	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/
	)
)

@


1.3
log
@SVN rev 219760 on 2011-03-18 22:56:53Z by mr

- Build disk image (for USB sticks) and iso image
- Change name to reflect this
- Install all kernel modules
- Choose image size that i386 and amd64 can be combined into one image
- Mount tmpfs over /boot/zfs for zpool imports
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.3.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/tools/tools/nanobsd/rescue/common 219760 2011-03-18 22:56:53Z mr $
@


1.3.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/tools/tools/nanobsd/rescue/common 219760 2011-03-18 22:56:53Z mr $
@


1.3.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/tools/tools/nanobsd/rescue/common 219760 2011-03-18 22:56:53Z mr $
@


1.2
log
@SVN rev 213324 on 2010-10-01 10:34:35Z by mr

- simplify by using one build script
- use label for mounting
- use GENERIC kernel
- create empty Pkg directory
@
text
@d9 14
d34 1
a34 1
#MODULES_OVERRIDE=
d70 2
a71 2
	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
d95 4
d109 7
a115 7
create_i386_diskimage () {
	#currently not used
}

create_amd64_diskimage () {
	create_i386_diskimage
}
@


1.1
log
@SVN rev 188482 on 2009-02-11 12:15:35Z by mr

Add files to build i386/amd64 bootable rescue ISO images using the
nanobsd framework.
@
text
@d8 1
d56 1
a56 1
	echo "/dev/acd0 / cd9660 ro 0 0" > etc/fstab
d85 3
a87 1
	mkisofs -quiet -r -J -no-emul-boot -b boot/cdboot -o _.disk.iso _.w/
d91 7
@


1.1.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.1.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/tools/tools/nanobsd/rescue/common 188482 2009-02-11 12:15:35Z mr $
@


1.1.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.8.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/tools/tools/nanobsd/rescue/common 188482 2009-02-11 12:15:35Z mr $
@


1.1.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


