Date: Fri, 18 Mar 2011 22:56:53 +0000 (UTC) From: Michael Reifenberger <mr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r219760 - head/tools/tools/nanobsd/rescue Message-ID: <201103182256.p2IMurYl082702@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mr Date: Fri Mar 18 22:56:53 2011 New Revision: 219760 URL: http://svn.freebsd.org/changeset/base/219760 Log: - 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 Added: head/tools/tools/nanobsd/rescue/rescue_amd64.conf - copied, changed from r219753, head/tools/tools/nanobsd/rescue/isoamd64.conf head/tools/tools/nanobsd/rescue/rescue_i386.conf - copied, changed from r219753, head/tools/tools/nanobsd/rescue/isoi386.conf Deleted: head/tools/tools/nanobsd/rescue/isoamd64.conf head/tools/tools/nanobsd/rescue/isoi386.conf Modified: head/tools/tools/nanobsd/rescue/common Modified: head/tools/tools/nanobsd/rescue/common ============================================================================== --- head/tools/tools/nanobsd/rescue/common Fri Mar 18 22:55:32 2011 (r219759) +++ head/tools/tools/nanobsd/rescue/common Fri Mar 18 22:56:53 2011 (r219760) @@ -6,6 +6,20 @@ 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=' @@ -17,7 +31,7 @@ CONF_INSTALL=' CONF_WORLD=' #TARGET_ARCH=i386 CFLAGS=-O -pipe -#MODULES_OVERRIDE= +ALL_MODULES=YES ' #customize_cmd cust_comconsole @@ -53,8 +67,8 @@ 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/iso9660/${NANO_LABEL} / cd9660 ro,noatime 0 0" > etc/fstab - echo "tmpfs /tmp tmpfs rw,size=268435456,mode=1777 0 0" >> etc/fstab + 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 @@ -78,6 +92,10 @@ 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 @@ -88,10 +106,10 @@ last_orders () ( ) ) -create_i386_diskimage () { - #currently not used -} - -create_amd64_diskimage () { - create_i386_diskimage -} +#create_i386_diskimage () { +# #currently not used +#} + +#create_amd64_diskimage () { +# create_i386_diskimage +#} Copied and modified: head/tools/tools/nanobsd/rescue/rescue_amd64.conf (from r219753, head/tools/tools/nanobsd/rescue/isoamd64.conf) ============================================================================== --- head/tools/tools/nanobsd/rescue/isoamd64.conf Fri Mar 18 18:54:00 2011 (r219753, copy source) +++ head/tools/tools/nanobsd/rescue/rescue_amd64.conf Fri Mar 18 22:56:53 2011 (r219760) @@ -5,6 +5,6 @@ NANO_KERNEL=GENERIC NANO_ARCH=amd64 TARGET_ARCH=amd64; export TARGET_ARCH #TARGET_CPUTYPE=amd64; export TARGET_CPUTYPE -NANO_NAME=rescue_isoamd64 +NANO_NAME=rescue_amd64 . common Copied and modified: head/tools/tools/nanobsd/rescue/rescue_i386.conf (from r219753, head/tools/tools/nanobsd/rescue/isoi386.conf) ============================================================================== --- head/tools/tools/nanobsd/rescue/isoi386.conf Fri Mar 18 18:54:00 2011 (r219753, copy source) +++ head/tools/tools/nanobsd/rescue/rescue_i386.conf Fri Mar 18 22:56:53 2011 (r219760) @@ -5,6 +5,6 @@ NANO_KERNEL=GENERIC NANO_ARCH=i386 TARGET_ARCH=i386; export TARGET_ARCH #TARGET_CPUTYPE=i386; export TARGET_CPUTYPE -NANO_NAME=rescue_isoi386 +NANO_NAME=rescue_i386 . common
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103182256.p2IMurYl082702>