Date: Sun, 17 Aug 2014 21:36:10 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272572 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts others Message-ID: <201408172136.s7HLaAcc058339@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kczekirda Date: Sun Aug 17 21:36:10 2014 New Revision: 272572 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272572 Log: merge zfs preseed config and template.input Deleted: soc2014/kczekirda/pxe-fai-head/others/zfspressed Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script soc2014/kczekirda/pxe-fai-head/others/mfsbsd.ipxe soc2014/kczekirda/pxe-fai-head/others/template.input Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun Aug 17 20:06:47 2014 (r272571) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Sun Aug 17 21:36:10 2014 (r272572) @@ -189,7 +189,7 @@ rm -f $PATH_FSTAB touch $PATH_FSTAB if [ "$ZFSBOOT" = "YES" ]; then - bsdinstall zfsboot "$ZFSPRESSED" + bsdinstall zfsboot "$SCRIPT" else bsdinstall scriptedpart "$PARTITIONS" fi Modified: soc2014/kczekirda/pxe-fai-head/others/mfsbsd.ipxe ============================================================================== --- soc2014/kczekirda/pxe-fai-head/others/mfsbsd.ipxe Sun Aug 17 20:06:47 2014 (r272571) +++ soc2014/kczekirda/pxe-fai-head/others/mfsbsd.ipxe Sun Aug 17 21:36:10 2014 (r272572) @@ -113,7 +113,7 @@ goto boot :boot -kernel http://volt.iem.pw.edu.pl/~czekirdk/memdisk iso raw +kernel http://czyki.no-ip.info/memdisk iso raw initrd ${iso} boot Modified: soc2014/kczekirda/pxe-fai-head/others/template.input ============================================================================== --- soc2014/kczekirda/pxe-fai-head/others/template.input Sun Aug 17 20:06:47 2014 (r272571) +++ soc2014/kczekirda/pxe-fai-head/others/template.input Sun Aug 17 21:36:10 2014 (r272572) @@ -1,3 +1,5 @@ +#!fai + KEYMAP="pl_PL.ISO8859-2" HOSTNAME="testscriptinstall" MIRROR="ftp://ftp.pl.freebsd.org/" @@ -26,10 +28,114 @@ #DNS2V6="2001:4860:4860::8844" PARTITIONS="ada1 { auto freebsd-ufs /}" -ZFSBOOT="YES" -ZFSPRESSED="/root/zfspressed" #ROOTPWHASH='$6$Qb2inVrU65.r4Dx5$DaHdU2P1ipFMLZ8J5xJk8DDtC88rE87qo7du6CBvNgyit8RezQ2qkPe83X4KgTCTEtXGrMaMKZ1.W4xg1yz0z/' #USERS="/etc/usersconfig" +ZFSBOOT="YES" + +# Default name of the boot-pool +# +#ZFSBOOT_POOL_NAME="zroot" +# +# Default options to use when creating zroot pool +# +#ZFSBOOT_POOL_CREATE_OPTIONS="-O compress=lz4 -O atime=off" +# +# Default name for the boot environment parent dataset +# +#ZFSBOOT_BEROOT_NAME="ROOT" +# +# Default name for the primany boot environment +# +#ZFSBOOT_BOOTFS_NAME="default" +# +# Default Virtual Device (vdev) type to create +# +ZFSBOOT_VDEV_TYPE="stripe" +# +# Should we use gnop(8) to configure a transparent mapping to 4K sectors? +# +#ZFSBOOT_GNOP_4K_FORCE_ALIGN="1" +# +# Should we use geli(8) to encrypt the drives? +# NB: Automatically enables ZFSBOOT_BOOT_POOL +# +#ZFSBOOT_GELI_ENCRYPTION="" +# +# Default path to the geli(8) keyfile used in drive encryption +# +#ZFSBOOT_GELI_KEY_FILE="/boot/encryption.key" +# +# Create a separate boot pool? +# NB: Automatically set when using geli(8) or MBR +# +#ZFSBOOT_BOOT_POOL="" +# +# Options to use when creating separate boot pool (if any) +# +#ZFSBOOT_BOOT_POOL_CREATE_OPTIONS="" +# +# Default name for boot pool when enabled (e.g., geli(8) or MBR) +# +#ZFSBOOT_BOOT_POOL_NAME="bootpool" +# +# Default size for boot pool when enabled (e.g., geli(8) or MBR) +# +#ZFSBOOT_BOOT_POOL_SIZE="1g" +# +# Default disks to use (always empty unless being scripted) +# +ZFSBOOT_DISKS="ada1" +# +# Default partitioning scheme to use on disks +# +#ZFSBOOT_PARTITION_SCHEME="GPT" +# +# How much swap to put on each block device in the boot zpool +# NOTE: Value passed to gpart(8); which supports SI unit suffixes. +# +#ZFSBOOT_SWAP_SIZE="0g" +# +# Should we use geli(8) to encrypt the swap? +# +#ZFSBOOT_SWAP_ENCRYPTION="" +# +# Should we use gmirror(8) to mirror the swap? +# +#ZFSBOOT_SWAP_MIRROR="" +# Default ZFS datasets for root zpool +# +# NOTE: Requires /tmp, /var/tmp, /$ZFSBOOT_BOOTFS_NAME/$ZFSBOOT_BOOTFS_NAME +# NOTE: Anything after pound/hash character [#] is ignored as a comment. +# +#ZFSBOOT_DATASETS=" +# # DATASET>--OPTIONS (comma or space separated; or both) +# # Boot Environment [BE] root and default boot dataset +# /$ZFSBOOT_BEROOT_NAME mountpoint=none +# /$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME mountpoint=/ +# # Compress /tmp, allow exec but not setuid +# /tmp mountpoint=/tmp,exec=on,setuid=off +# # Don't mount /usr so that 'base' files go to the BEROOT +# /usr mountpoint=/usr,canmount=off +# # Home directories separated so they are common to all BEs +# /usr/home # NB: /home is a symlink to /usr/home +# # Ports tree +# /usr/ports setuid=off +# # Source tree (compressed) +# /usr/src +# # Create /var and friends +# /var mountpoint=/var +# /var/crash exec=off,setuid=off +# /var/log exec=off,setuid=off +# /var/mail atime=on +# /var/tmp setuid=off +#" +# If interactive and the user has not explicitly chosen a vdev type or disks, +# make the user confirm scripted/default choices when proceeding to install. +# +ZFSBOOT_CONFIRM_LAYOUT="" + +ZFSBOOT_PRESSED_CONFIRM="YES" + #!/bin/sh echo "Installation complete, running in host system"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408172136.s7HLaAcc058339>