From owner-svn-soc-all@FreeBSD.ORG Sun Feb 22 21:54:58 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48F41EB7 for ; Sun, 22 Feb 2015 21:54:58 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 19E71B94 for ; Sun, 22 Feb 2015 21:54:58 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1MLsvfp033357 for ; Sun, 22 Feb 2015 21:54:57 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t1MLsvvD033355 for svn-soc-all@FreeBSD.org; Sun, 22 Feb 2015 21:54:57 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sun, 22 Feb 2015 21:54:57 GMT Message-Id: <201502222154.t1MLsvvD033355@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r278251 - soc2014/kczekirda/pxe-fai-head/tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2015 21:54:58 -0000 Author: kczekirda Date: Sun Feb 22 21:54:55 2015 New Revision: 278251 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278251 Log: old mfsbsd delete Deleted: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-9.3-RELEASE-fai-amd64.img soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-9.3-RELEASE-fai-amd64.iso From owner-svn-soc-all@FreeBSD.ORG Tue Feb 24 22:02:40 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CDCCD222 for ; Tue, 24 Feb 2015 22:02:40 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B73C8F49 for ; Tue, 24 Feb 2015 22:02:40 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1OM2eTa098026 for ; Tue, 24 Feb 2015 22:02:40 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t1OM2dk1098003 for svn-soc-all@FreeBSD.org; Tue, 24 Feb 2015 22:02:39 GMT (envelope-from kczekirda@FreeBSD.org) Date: Tue, 24 Feb 2015 22:02:39 GMT Message-Id: <201502242202.t1OM2dk1098003@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r278252 - in soc2014/kczekirda/pxe-fai-head: head tools/mfsbsd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2015 22:02:41 -0000 Author: kczekirda Date: Tue Feb 24 22:02:38 2015 New Revision: 278252 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278252 Log: merge mfsBSD Added: soc2014/kczekirda/pxe-fai-head/head/collect_authors_patches.sh (contents, props changed) Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile Added: soc2014/kczekirda/pxe-fai-head/head/collect_authors_patches.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/kczekirda/pxe-fai-head/head/collect_authors_patches.sh Tue Feb 24 22:02:38 2015 (r278252) @@ -0,0 +1,64 @@ +#!/bin/bash + +# Copyright 2014 by Lasse Schuirmann +# License: GPL 3 + +if [ ! $# == 2 ]; then + echo "Usage: $0 author_name output_root_directory" + echo + echo "This is a simple helper script that allows collecting all patches from" + echo "one author in a git repository. It will detect consequent ranges of" + echo "patches and ask for each range for a subdirectory so you can distinguish" + echo "the patch series'." + + exit 1 +fi + +author=$1 +output=$2 +end="" +begin="" +patchcount=1 +rangecount=1 + +for O in $(git log --pretty=format:"%h" --author="$author"); do + if ! git log --pretty=format:"%h" --author="$author" $O^^..$O^ --exit-code 1>/dev/null ; then + if [[ "$end" == "" ]]; then + end=$O + fi + begin=$O + ((rangecount++)) + else + echo + echo + if [[ "$end" == "" ]]; then + tmp=$(($patchcount - 1)) + echo "Adding one patch to $tmp existing:" + git log $O^..$O + echo "Please enter a subdirectory name for this patch (leave this empty to leave this patch out, use ./ for the root directory):" + read subdir + if [[ "$subdir" != "" ]]; then + mkdir -p $output/$subdir + git format-patch $O^..$O -o$output/$subdir #--start-number=$patchcount + ((patchcount++)) + else + echo "Omitting patch..." + fi + else + tmp=$(($patchcount - 1)) + echo "Adding $rangecount patches to $tmp existing." + git log $begin^^..$end --oneline + echo "Please enter a subdirectory name for these patches (leave this empty to leave this patch out, use ./ for the root directory):" + read subdir + if [[ "$subdir" != "" ]]; then + mkdir -p $output/$subdir + git format-patch $begin^^..$end -o$output/$subdir #--start-number=$patchcount + patchcount=$(($patchcount + $rangecount)) + else + echo "Omitting patch series..." + fi + end="" + rangecount=1 + fi + fi + done Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD Sun Feb 22 21:54:55 2015 (r278251) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD Tue Feb 24 22:02:38 2015 (r278252) @@ -15,7 +15,7 @@ If you want any packages installed, copy the .tbz files that should be automatically installed into the packages/ directory. - Add any additional files into the files/ directory. These will be copied + Add any additional files into the customfiles/ directory. These will be copied recursively into the root of the boot image. WARNING: Your image should not exceed 45MB in total, otherwise kernel panic Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile Sun Feb 22 21:54:55 2015 (r278251) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile Tue Feb 24 22:02:38 2015 (r278252) @@ -27,14 +27,12 @@ # For all of this use # -DCUSTOM -DBUILDWORLD -DBUILDKERNEL or CUSTOM=1 BUILDKERNEL=1 BUILDWORLD=1 # -# To use pkgng, specify -# -DPKGNG or PKGNG=1 # # Paths # SRC_DIR?=/usr/src -CFGDIR=conf +CFGDIR?=conf SCRIPTSDIR=scripts PACKAGESDIR?=packages CUSTOMFILESDIR=customfiles @@ -80,9 +78,16 @@ DOFS=${TOOLSDIR}/doFS.sh SCRIPTS=mdinit mfsbsd interfaces packages BOOTMODULES=acpi ahci -MFSMODULES=geom_mirror geom_nop opensolaris zfs ext2fs snp smbus ipmi ntfs nullfs tmpfs +MFSMODULES=geom_mirror geom_nop opensolaris zfs ext2fs snp smbus ipmi ntfs nullfs tmpfs \ + crypto cryptodev geom_eli # +.if defined(V) +_v= +.else +_v=@ +.endif + .if !defined(ARCH) TARGET!= ${SYSCTL} -n hw.machine_arch .else @@ -138,7 +143,6 @@ _BOOTDIR= ${_ROOTDIR}/boot .if defined(ROOTHACK) _DESTDIR= ${_ROOTDIR}/rw -WITHOUT_RESCUE=1 MFSROOT_FREE_INODES?=1% MFSROOT_FREE_BLOCKS?=1% .else @@ -154,10 +158,6 @@ WITHOUT_GAMES=1 \ WITHOUT_LIB32=1 -. if defined(WITHOUT_RESCUE) -BUILDENV+= WITHOUT_RESCUE=1 -. endif - # Environment for custom install INSTALLENV?= ${BUILDENV} \ WITHOUT_TOOLCHAIN=1 @@ -165,22 +165,22 @@ .if defined(FULLDIST) NO_PRUNE=1 -NO_RESCUE_LINKS=1 +WITH_RESCUE=1 .endif all: image destdir: ${_DESTDIR} ${_BOOTDIR} ${_DESTDIR}: - @${MKDIR} ${_DESTDIR} && ${CHOWN} root:wheel ${_DESTDIR} + ${_v}${MKDIR} ${_DESTDIR} && ${CHOWN} root:wheel ${_DESTDIR} ${_BOOTDIR}: - @${MKDIR} ${_BOOTDIR}/kernel ${_BOOTDIR}/modules && ${CHOWN} -R root:wheel ${_BOOTDIR} + ${_v}${MKDIR} ${_BOOTDIR}/kernel ${_BOOTDIR}/modules && ${CHOWN} -R root:wheel ${_BOOTDIR} extract: destdir ${WRKDIR}/.extract_done ${WRKDIR}/.extract_done: .if !defined(CUSTOM) - @if [ ! -d "${BASE}" ]; then \ + ${_v}if [ ! -d "${BASE}" ]; then \ echo "Please set the environment variable BASE to a path"; \ echo "with FreeBSD distribution files (e.g. /cdrom/9.2-RELEASE)"; \ echo "Examples:"; \ @@ -189,7 +189,7 @@ exit 1; \ fi .if !defined(FREEBSD9) - @for DIR in base kernels; do \ + ${_v}for DIR in base kernels; do \ if [ ! -d "${BASE}/$$DIR" ]; then \ echo "Cannot find directory \"${BASE}/$$DIR\""; \ exit 1; \ @@ -197,38 +197,38 @@ done .endif @echo -n "Extracting base and kernel ..." - @${CAT} ${BASEFILE} | ${TAR} --unlink -xpzf - -C ${_DESTDIR} + ${_v}${CAT} ${BASEFILE} | ${TAR} --unlink -xpzf - -C ${_DESTDIR} .if !defined(FREEBSD9) - @${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_BOOTDIR} - @${MV} ${_BOOTDIR}/${KERNCONF}/* ${_BOOTDIR}/kernel - @${RMDIR} ${_BOOTDIR}/${KERNCONF} + ${_v}${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_BOOTDIR} + ${_v}${MV} ${_BOOTDIR}/${KERNCONF}/* ${_BOOTDIR}/kernel + ${_v}${RMDIR} ${_BOOTDIR}/${KERNCONF} .else - @${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_ROOTDIR} + ${_v}${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_ROOTDIR} .endif @echo " done" .endif - @${TOUCH} ${WRKDIR}/.extract_done + ${_v}${TOUCH} ${WRKDIR}/.extract_done build: extract ${WRKDIR}/.build_done ${WRKDIR}/.build_done: .if defined(CUSTOM) . if defined(BUILDWORLD) @echo -n "Building world ..." - @cd ${SRC_DIR} && \ + ${_v}cd ${SRC_DIR} && \ ${BUILDENV} make ${_MAKEJOBS} buildworld TARGET=${TARGET} . endif . if defined(BUILDKERNEL) @echo -n "Building kernel KERNCONF=${KERNCONF} ..." - @cd ${SRC_DIR} && make buildkernel KERNCONF=${KERNCONF} TARGET=${TARGET} + ${_v}cd ${SRC_DIR} && make buildkernel KERNCONF=${KERNCONF} TARGET=${TARGET} . endif .endif - @${TOUCH} ${WRKDIR}/.build_done + ${_v}${TOUCH} ${WRKDIR}/.build_done install: destdir build ${WRKDIR}/.install_done ${WRKDIR}/.install_done: .if defined(CUSTOM) @echo -n "Installing world and kernel KERNCONF=${KERNCONF} ..." - @cd ${SRC_DIR} && \ + ${_v}cd ${SRC_DIR} && \ ${INSTALLENV} make installworld distribution DESTDIR="${_DESTDIR}" TARGET=${TARGET} && \ ${INSTALLENV} make installkernel KERNCONF=${KERNCONF} DESTDIR="${_ROOTDIR}" TARGET=${TARGET} .endif @@ -238,25 +238,25 @@ . else @echo -n "Creating base.txz and kernel.txz ..." . endif - @${MKDIR} ${_DISTDIR} + ${_v}${MKDIR} ${_DISTDIR} . if defined(ROOTHACK) - @${CP} -rp ${_BOOTDIR}/kernel ${_DESTDIR}/boot + ${_v}${CP} -rp ${_BOOTDIR}/kernel ${_DESTDIR}/boot . endif . if !defined(CUSTOM) && exists(${BASE}/base.txz) && exists(${BASE}/kernel.txz) - @${CP} ${BASE}/base.txz ${_DISTDIR}/base.txz - @${CP} ${BASE}/kernel.txz ${_DISTDIR}/kernel.txz + ${_v}${CP} ${BASE}/base.txz ${_DISTDIR}/base.txz + ${_v}${CP} ${BASE}/kernel.txz ${_DISTDIR}/kernel.txz . else - @${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} --exclude "boot/kernel/*" -f ${_DISTDIR}/base.txz . - @${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} -f ${_DISTDIR}/kernel.txz boot/kernel + ${_v}${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} --exclude "boot/kernel/*" -f ${_DISTDIR}/base.txz . + ${_v}${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} -f ${_DISTDIR}/kernel.txz boot/kernel . endif @echo " done" . if defined(ROOTHACK) - @${RM} -rf ${_DESTDIR}/boot/kernel + ${_v}${RM} -rf ${_DESTDIR}/boot/kernel . endif .endif - @${CHFLAGS} -R noschg ${_DESTDIR} > /dev/null 2> /dev/null || exit 0 -.if !defined(WITHOUT_RESCUE) || defined(NO_RESCUE_LINKS) - @cd ${_DESTDIR} && \ + ${_v}${CHFLAGS} -R noschg ${_DESTDIR} > /dev/null 2> /dev/null || exit 0 +.if !defined(WITHOUT_RESCUE) && defined(RESCUE_LINKS) + ${_v}cd ${_DESTDIR} && \ for FILE in `${FIND} rescue -type f`; do \ FILE=$${FILE##rescue/}; \ if [ -f bin/$$FILE ]; then \ @@ -275,64 +275,55 @@ done .endif .if defined(WITHOUT_RESCUE) - @cd ${_DESTDIR} && ${RM} -rf rescue + ${_v}cd ${_DESTDIR} && ${RM} -rf rescue .endif - @${TOUCH} ${WRKDIR}/.install_done + ${_v}${TOUCH} ${WRKDIR}/.install_done prune: install ${WRKDIR}/.prune_done ${WRKDIR}/.prune_done: .if !defined(NO_PRUNE) @echo -n "Removing selected files from distribution ..." - @if [ -f "${PRUNELIST}" ]; then \ + ${_v}if [ -f "${PRUNELIST}" ]; then \ for FILE in `cat ${PRUNELIST}`; do \ if [ -n "$${FILE}" ]; then \ ${RM} -rf ${_DESTDIR}/$${FILE}; \ fi; \ done; \ fi - @${TOUCH} ${WRKDIR}/.prune_done + ${_v}${TOUCH} ${WRKDIR}/.prune_done @echo " done" .endif packages: install prune ${WRKDIR}/.packages_done ${WRKDIR}/.packages_done: -.if defined(PKGNG) @echo -n "Installing pkgng ..." . if !exists(${PKG_STATIC}) @echo "pkg-static not found at: ${PKG_STATIC}" - @exit 1 + ${_v}exit 1 . endif - @mkdir -p ${_DESTDIR}/usr/local/sbin - @${INSTALL} -o root -g wheel -m 0755 ${PKG_STATIC} ${_DESTDIR}/usr/local/sbin/ - @${LN} -sf pkg-static ${_DESTDIR}/usr/local/sbin/pkg + ${_v}mkdir -p ${_DESTDIR}/usr/local/sbin + ${_v}${INSTALL} -o root -g wheel -m 0755 ${PKG_STATIC} ${_DESTDIR}/usr/local/sbin/ + ${_v}${LN} -sf pkg-static ${_DESTDIR}/usr/local/sbin/pkg @echo " done" -.endif - @if [ -d "${PACKAGESDIR}" ]; then \ + ${_v}if [ -d "${PACKAGESDIR}" ]; then \ echo -n "Copying user packages ..."; \ ${CP} -rf ${PACKAGESDIR} ${_DESTDIR}; \ echo " done"; \ fi - @if [ -d "${_DESTDIR}/packages" ]; then \ + ${_v}if [ -d "${_DESTDIR}/packages" ]; then \ echo -n "Installing user packages ..."; \ fi -.if defined(PKGNG) - @if [ -d "${_DESTDIR}/packages" ]; then \ - cd ${_DESTDIR}/packages && for FILE in *; do \ - ${PKG} -c ${_DESTDIR} add /packages/$${FILE}; \ - done; \ + ${_v}if [ -d "${_DESTDIR}/packages" ]; then \ + cd ${_DESTDIR}/packages && for _FILE in *; do \ + _FILES="$${_FILES} /packages/$${_FILE}"; \ + done; \ + ${PKG} -c ${_DESTDIR} add -M $${_FILES}; \ fi -.else - @if [ -d "${_DESTDIR}/packages" ]; then \ - cd ${_DESTDIR}/packages && for FILE in *; do \ - env PKG_PATH=/packages pkg_add -fi -C ${_DESTDIR} /packages/$${FILE} > /dev/null; \ - done; \ - fi -.endif - @if [ -d "${_DESTDIR}/packages" ]; then \ + ${_v}if [ -d "${_DESTDIR}/packages" ]; then \ ${RM} -rf ${_DESTDIR}/packages; \ echo " done"; \ fi - @${TOUCH} ${WRKDIR}/.packages_done + ${_v}${TOUCH} ${WRKDIR}/.packages_done config: install ${WRKDIR}/.config_done ${WRKDIR}/.config_done: @@ -343,29 +334,29 @@ . endif .endfor .if defined(SE) - @${INSTALL} -m 0644 ${TOOLSDIR}/motd.se ${_DESTDIR}/etc/motd - @${INSTALL} -d -m 0755 ${_DESTDIR}/cdrom + ${_v}${INSTALL} -m 0644 ${TOOLSDIR}/motd.se ${_DESTDIR}/etc/motd + ${_v}${INSTALL} -d -m 0755 ${_DESTDIR}/cdrom .else - @${INSTALL} -m 0644 ${TOOLSDIR}/motd ${_DESTDIR}/etc/motd + ${_v}${INSTALL} -m 0644 ${TOOLSDIR}/motd ${_DESTDIR}/etc/motd .endif - @${MKDIR} ${_DESTDIR}/stand ${_DESTDIR}/etc/rc.conf.d - @if [ -f "${CFGDIR}/boot.config" ]; then \ + ${_v}${MKDIR} ${_DESTDIR}/stand ${_DESTDIR}/etc/rc.conf.d + ${_v}if [ -f "${CFGDIR}/boot.config" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/boot.config ${_ROOTDIR}/boot.config; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/boot.config.sample ${_ROOTDIR}/boot.config; \ fi - @if [ -f "${CFGDIR}/loader.conf" ]; then \ + ${_v}if [ -f "${CFGDIR}/loader.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf ${_BOOTDIR}/loader.conf; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf.sample ${_BOOTDIR}/loader.conf; \ fi - @if [ -f "${CFGDIR}/rc.local" ]; then \ + ${_v}if [ -f "${CFGDIR}/rc.local" ]; then \ ${INSTALL} -m 0744 ${CFGDIR}/rc.local ${_DESTDIR}/etc/rc.local; \ else \ ${INSTALL} -m 0744 ${CFGDIR}/rc.local.sample ${_DESTDIR}/etc/rc.local; \ fi .for FILE in rc.conf ttys - @if [ -f "${CFGDIR}/${FILE}" ]; then \ + ${_v}if [ -f "${CFGDIR}/${FILE}" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/${FILE} ${_DESTDIR}/etc/${FILE}; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/${FILE}.sample ${_DESTDIR}/etc/${FILE}; \ @@ -374,58 +365,58 @@ .if defined(ROOTHACK) @echo 'root_rw_mount="NO"' >> ${_DESTDIR}/etc/rc.conf .endif - @if [ -f "${CFGDIR}/resolv.conf" ]; then \ + ${_v}if [ -f "${CFGDIR}/resolv.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/resolv.conf ${_DESTDIR}/etc/resolv.conf; \ fi - @if [ -f "${CFGDIR}/interfaces.conf" ]; then \ + ${_v}if [ -f "${CFGDIR}/interfaces.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/interfaces.conf ${_DESTDIR}/etc/rc.conf.d/interfaces; \ fi - @if [ -f "${CFGDIR}/authorized_keys" ]; then \ + ${_v}if [ -f "${CFGDIR}/authorized_keys" ]; then \ ${INSTALL} -d -m 0700 ${_DESTDIR}/root/.ssh; \ ${INSTALL} ${CFGDIR}/authorized_keys ${_DESTDIR}/root/.ssh/; \ fi - @${MKDIR} ${_DESTDIR}/root/bin - @${INSTALL} ${TOOLSDIR}/zfsinstall ${_DESTDIR}/root/bin - @${INSTALL} ${TOOLSDIR}/destroygeom ${_DESTDIR}/root/bin - @for SCRIPT in ${SCRIPTS}; do \ + ${_v}${MKDIR} ${_DESTDIR}/root/bin + ${_v}${INSTALL} ${TOOLSDIR}/zfsinstall ${_DESTDIR}/root/bin + ${_v}${INSTALL} ${TOOLSDIR}/destroygeom ${_DESTDIR}/root/bin + ${_v}for SCRIPT in ${SCRIPTS}; do \ ${INSTALL} -m 0555 ${SCRIPTSDIR}/$${SCRIPT} ${_DESTDIR}/etc/rc.d/; \ done -# @${SED} -I -E 's/\(ttyv[2-7].*\)on /\1off/g' ${_DESTDIR}/etc/ttys +# ${_v}${SED} -I -E 's/\(ttyv[2-7].*\)on /\1off/g' ${_DESTDIR}/etc/ttys .if !defined(ROOTHACK) - @echo "/dev/md0 / ufs rw 0 0" > ${_DESTDIR}/etc/fstab - @echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" >> ${_DESTDIR}/etc/fstab + ${_v}echo "/dev/md0 / ufs rw 0 0" > ${_DESTDIR}/etc/fstab + ${_v}echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" >> ${_DESTDIR}/etc/fstab .else - @${TOUCH} ${_DESTDIR}/etc/fstab + ${_v}${TOUCH} ${_DESTDIR}/etc/fstab .endif .if defined(ROOTPW) - @echo ${ROOTPW} | ${PW} -V ${_DESTDIR}/etc usermod root -h 0 + ${_v}echo ${ROOTPW} | ${PW} -V ${_DESTDIR}/etc usermod root -h 0 .endif - @echo PermitRootLogin yes >> ${_DESTDIR}/etc/ssh/sshd_config + ${_v}echo PermitRootLogin yes >> ${_DESTDIR}/etc/ssh/sshd_config .if exists(${CFGDIR}/hosts) - @${INSTALL} -m 0644 ${CFGDIR}/hosts ${_DESTDIR}/etc/hosts + ${_v}${INSTALL} -m 0644 ${CFGDIR}/hosts ${_DESTDIR}/etc/hosts .elif exists(${CFGDIR}/hosts.sample) - @${INSTALL} -m 0644 ${CFGDIR}/hosts.sample ${_DESTDIR}/etc/hosts + ${_v}${INSTALL} -m 0644 ${CFGDIR}/hosts.sample ${_DESTDIR}/etc/hosts .else @echo "Missing ${CFGDIR}/hosts.sample" && exit 1 .endif - @${TOUCH} ${WRKDIR}/.config_done + ${_v}${TOUCH} ${WRKDIR}/.config_done @echo " done" genkeys: config ${WRKDIR}/.genkeys_done ${WRKDIR}/.genkeys_done: @echo -n "Generating SSH host keys ..." - @${SSHKEYGEN} -t rsa1 -b 1024 -f ${_DESTDIR}/etc/ssh/ssh_host_key -N '' > /dev/null - @${SSHKEYGEN} -t dsa -f ${_DESTDIR}/etc/ssh/ssh_host_dsa_key -N '' > /dev/null - @${SSHKEYGEN} -t rsa -f ${_DESTDIR}/etc/ssh/ssh_host_rsa_key -N '' > /dev/null - @${TOUCH} ${WRKDIR}/.genkeys_done + ${_v}${SSHKEYGEN} -t rsa1 -b 1024 -f ${_DESTDIR}/etc/ssh/ssh_host_key -N '' > /dev/null + ${_v}${SSHKEYGEN} -t dsa -f ${_DESTDIR}/etc/ssh/ssh_host_dsa_key -N '' > /dev/null + ${_v}${SSHKEYGEN} -t rsa -f ${_DESTDIR}/etc/ssh/ssh_host_rsa_key -N '' > /dev/null + ${_v}${TOUCH} ${WRKDIR}/.genkeys_done @echo " done" customfiles: config ${WRKDIR}/.customfiles_done ${WRKDIR}/.customfiles_done: .if exists(${CUSTOMFILESDIR}) @echo "Copying user files ..." - @${CP} -afv ${CUSTOMFILESDIR}/ ${_DESTDIR}/ - @${TOUCH} ${WRKDIR}/.customfiles_done + ${_v}${CP} -afv ${CUSTOMFILESDIR}/ ${_DESTDIR}/ + ${_v}${TOUCH} ${WRKDIR}/.customfiles_done @echo " done" .endif @@ -433,71 +424,71 @@ ${WRKDIR}/.compress-usr_done: .if !defined(ROOTHACK) @echo -n "Compressing usr ..." - @${TAR} -c -J -C ${_DESTDIR} -f ${_DESTDIR}/.usr.tar.xz usr - @${RM} -rf ${_DESTDIR}/usr && ${MKDIR} ${_DESTDIR}/usr + ${_v}${TAR} -c -J -C ${_DESTDIR} -f ${_DESTDIR}/.usr.tar.xz usr + ${_v}${RM} -rf ${_DESTDIR}/usr && ${MKDIR} ${_DESTDIR}/usr .else @echo -n "Compressing root ..." - @${TAR} -c -C ${_ROOTDIR} -f - rw | \ + ${_v}${TAR} -c -C ${_ROOTDIR} -f - rw | \ ${XZ} -v -c > ${_ROOTDIR}/root.txz - @${RM} -rf ${_DESTDIR} && ${MKDIR} ${_DESTDIR} + ${_v}${RM} -rf ${_DESTDIR} && ${MKDIR} ${_DESTDIR} .endif - @${TOUCH} ${WRKDIR}/.compress-usr_done + ${_v}${TOUCH} ${WRKDIR}/.compress-usr_done @echo " done" roothack: ${WRKDIR}/roothack/roothack ${WRKDIR}/roothack/roothack: .if !defined(ROOTHACK_PREBUILT) - @${MKDIR} -p ${WRKDIR}/roothack - @cd ${TOOLSDIR}/roothack && env MAKEOBJDIR=${WRKDIR}/roothack make + ${_v}${MKDIR} -p ${WRKDIR}/roothack + ${_v}cd ${TOOLSDIR}/roothack && env MAKEOBJDIR=${WRKDIR}/roothack make .endif install-roothack: compress-usr roothack ${WRKDIR}/.install-roothack_done ${WRKDIR}/.install-roothack_done: @echo -n "Installing roothack ..." - @${MKDIR} -p ${_ROOTDIR}/dev ${_ROOTDIR}/sbin - @${INSTALL} -m 555 ${_ROOTHACK_FILE} ${_ROOTDIR}/sbin/init - @${TOUCH} ${WRKDIR}/.install-roothack_done + ${_v}${MKDIR} -p ${_ROOTDIR}/dev ${_ROOTDIR}/sbin + ${_v}${INSTALL} -m 555 ${_ROOTHACK_FILE} ${_ROOTDIR}/sbin/init + ${_v}${TOUCH} ${WRKDIR}/.install-roothack_done @echo " done" boot: install prune ${WRKDIR}/.boot_done ${WRKDIR}/.boot_done: @echo -n "Configuring boot environment ..." - @${MKDIR} ${WRKDIR}/disk/boot && ${CHOWN} root:wheel ${WRKDIR}/disk - @${RM} -f ${_BOOTDIR}/kernel/kernel.debug - @${CP} -rp ${_BOOTDIR}/kernel ${WRKDIR}/disk/boot + ${_v}${MKDIR} ${WRKDIR}/disk/boot && ${CHOWN} root:wheel ${WRKDIR}/disk + ${_v}${RM} -f ${_BOOTDIR}/kernel/kernel.debug + ${_v}${CP} -rp ${_BOOTDIR}/kernel ${WRKDIR}/disk/boot .for FILE in boot defaults loader loader.help *.rc *.4th - @${CP} -rp ${_DESTDIR}/boot/${FILE} ${WRKDIR}/disk/boot + ${_v}${CP} -rp ${_DESTDIR}/boot/${FILE} ${WRKDIR}/disk/boot .endfor - @${RM} -rf ${WRKDIR}/disk/boot/kernel/*.ko ${WRKDIR}/disk/boot/kernel/*.symbols + ${_v}${RM} -rf ${WRKDIR}/disk/boot/kernel/*.ko ${WRKDIR}/disk/boot/kernel/*.symbols .if defined(DEBUG) - @test -f ${_BOOTDIR}/kernel/kernel.symbols \ + ${_v}test -f ${_BOOTDIR}/kernel/kernel.symbols \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/kernel.symbols ${WRKDIR}/disk/boot/kernel >/dev/null 2>/dev/null || exit 0 .endif .for FILE in ${BOOTMODULES} - @test -f ${_BOOTDIR}/kernel/${FILE}.ko \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko ${WRKDIR}/disk/boot/kernel >/dev/null 2>/dev/null || exit 0 . if defined(DEBUG) - @test -f ${_BOOTDIR}/kernel/${FILE}.ko \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko.symbols ${WRKDIR}/disk/boot/kernel >/dev/null 2>/dev/null || exit 0 . endif .endfor - @${MKDIR} -p ${_DESTDIR}/boot/modules + ${_v}${MKDIR} -p ${_DESTDIR}/boot/modules .for FILE in ${MFSMODULES} - @test -f ${_BOOTDIR}/kernel/${FILE}.ko \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko ${_DESTDIR}/boot/modules >/dev/null 2>/dev/null || exit 0 . if defined(DEBUG) - @test -f ${_BOOTDIR}/kernel/${FILE}.ko.symbols \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko.symbols \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko.symbols ${_DESTDIR}/boot/modules >/dev/null 2>/dev/null || exit 0 . endif .endfor .if defined(ROOTHACK) @echo -n "Installing tmpfs module for roothack ..." - @${MKDIR} -p ${_ROOTDIR}/boot/modules - @${INSTALL} -m 0666 ${_BOOTDIR}/kernel/tmpfs.ko ${_ROOTDIR}/boot/modules + ${_v}${MKDIR} -p ${_ROOTDIR}/boot/modules + ${_v}${INSTALL} -m 0666 ${_BOOTDIR}/kernel/tmpfs.ko ${_ROOTDIR}/boot/modules @echo " done" .endif - @${RM} -rf ${_BOOTDIR}/kernel ${_BOOTDIR}/*.symbols - @${TOUCH} ${WRKDIR}/.boot_done + ${_v}${RM} -rf ${_BOOTDIR}/kernel ${_BOOTDIR}/*.symbols + ${_v}${TOUCH} ${WRKDIR}/.boot_done @echo " done" .if defined(ROOTHACK) @@ -507,48 +498,48 @@ .endif ${WRKDIR}/.mfsroot_done: @echo -n "Creating and compressing mfsroot ..." - @${MKDIR} ${WRKDIR}/mnt - @${MAKEFS} -t ffs -m ${MFSROOT_MAXSIZE} -f ${MFSROOT_FREE_INODES} -b ${MFSROOT_FREE_BLOCKS} ${WRKDIR}/disk/mfsroot ${_ROOTDIR} > /dev/null - @${RM} -rf ${WRKDIR}/mnt ${_DESTDIR} - @${GZIP} -9 -f ${WRKDIR}/disk/mfsroot - @${GZIP} -9 -f ${WRKDIR}/disk/boot/kernel/kernel - @if [ -f "${CFGDIR}/loader.conf" ]; then \ + ${_v}${MKDIR} ${WRKDIR}/mnt + ${_v}${MAKEFS} -t ffs -m ${MFSROOT_MAXSIZE} -f ${MFSROOT_FREE_INODES} -b ${MFSROOT_FREE_BLOCKS} ${WRKDIR}/disk/mfsroot ${_ROOTDIR} > /dev/null + ${_v}${RM} -rf ${WRKDIR}/mnt ${_DESTDIR} + ${_v}${GZIP} -9 -f ${WRKDIR}/disk/mfsroot + ${_v}${GZIP} -9 -f ${WRKDIR}/disk/boot/kernel/kernel + ${_v}if [ -f "${CFGDIR}/loader.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf ${WRKDIR}/disk/boot/loader.conf; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf.sample ${WRKDIR}/disk/boot/loader.conf; \ fi - @${TOUCH} ${WRKDIR}/.mfsroot_done + ${_v}${TOUCH} ${WRKDIR}/.mfsroot_done @echo " done" fbsddist: install prune config genkeys customfiles boot compress-usr packages mfsroot ${WRKDIR}/.fbsddist_done ${WRKDIR}/.fbsddist_done: .if defined(SE) @echo -n "Copying FreeBSD installation image ..." - @${CP} -rf ${_DISTDIR} ${WRKDIR}/disk/ + ${_v}${CP} -rf ${_DISTDIR} ${WRKDIR}/disk/ @echo " done" .endif - @${TOUCH} ${WRKDIR}/.fbsddist_done + ${_v}${TOUCH} ${WRKDIR}/.fbsddist_done image: install prune config genkeys customfiles boot compress-usr mfsroot fbsddist ${IMAGE} ${IMAGE}: @echo -n "Creating image file ..." - @${MKDIR} ${WRKDIR}/mnt ${WRKDIR}/trees/base/boot - @${INSTALL} -m 0444 ${WRKDIR}/disk/boot/boot ${WRKDIR}/trees/base/boot/ - @${DOFS} ${BSDLABEL} "" ${WRKDIR}/disk.img ${WRKDIR} ${WRKDIR}/mnt 0 ${WRKDIR}/disk 80000 auto > /dev/null 2> /dev/null - @${RM} -rf ${WRKDIR}/mnt ${WRKDIR}/trees - @${MV} ${WRKDIR}/disk.img ${IMAGE} + ${_v}${MKDIR} ${WRKDIR}/mnt ${WRKDIR}/trees/base/boot + ${_v}${INSTALL} -m 0444 ${WRKDIR}/disk/boot/boot ${WRKDIR}/trees/base/boot/ + ${_v}${DOFS} ${BSDLABEL} "" ${WRKDIR}/disk.img ${WRKDIR} ${WRKDIR}/mnt 0 ${WRKDIR}/disk 80000 auto > /dev/null 2> /dev/null + ${_v}${RM} -rf ${WRKDIR}/mnt ${WRKDIR}/trees + ${_v}${MV} ${WRKDIR}/disk.img ${IMAGE} @echo " done" - @${LS} -l ${IMAGE} + ${_v}${LS} -l ${IMAGE} gce: install prune config genkeys customfiles boot compress-usr mfsroot fbsddist ${IMAGE} ${GCEFILE} ${GCEFILE}: @echo -n "Creating GCE-compatible tarball..." .if !exists(${GTAR}) - @echo "${GTAR} is missing, please install archivers/gtar first"; exit 1 + ${_v}echo "${GTAR} is missing, please install archivers/gtar first"; exit 1 .else - @${GTAR} -C ${CURDIR} -Szcf ${GCEFILE} --transform='s/${IMAGE}/disk.raw/' ${IMAGE} + ${_v}${GTAR} -C ${CURDIR} -Szcf ${GCEFILE} --transform='s/${IMAGE}/disk.raw/' ${IMAGE} @echo " GCE tarball built" - @${LS} -l ${GCEFILE} + ${_v}${LS} -l ${GCEFILE} .endif iso: install prune config genkeys customfiles boot compress-usr mfsroot fbsddist ${ISOIMAGE} @@ -558,25 +549,25 @@ . if !exists(${MKISOFS}) @echo "${MKISOFS} is missing, please install sysutils/cdrtools first"; exit 1 . else - @${MKISOFS} -b boot/cdboot -no-emul-boot -r -J -V mfsBSD -o ${ISOIMAGE} ${WRKDIR}/disk > /dev/null 2> /dev/null + ${_v}${MKISOFS} -b boot/cdboot -no-emul-boot -r -J -V mfsBSD -o ${ISOIMAGE} ${WRKDIR}/disk > /dev/null 2> /dev/null . endif .else - @${MAKEFS} -t cd9660 -o rockridge,bootimage=i386\;/boot/cdboot,no-emul-boot,label=mfsBSD ${ISOIMAGE} ${WRKDIR}/disk + ${_v}${MAKEFS} -t cd9660 -o rockridge,bootimage=i386\;/boot/cdboot,no-emul-boot,label=mfsBSD ${ISOIMAGE} ${WRKDIR}/disk .endif @echo " done" - @${LS} -l ${ISOIMAGE} + ${_v}${LS} -l ${ISOIMAGE} tar: install prune config customfiles boot compress-usr mfsroot fbsddist ${TARFILE} ${TARFILE}: @echo -n "Creating tar file ..." - @cd ${WRKDIR}/disk && ${FIND} . -depth 1 \ + ${_v}cd ${WRKDIR}/disk && ${FIND} . -depth 1 \ -exec ${TAR} -r -f ${CURDIR}/${TARFILE} {} \; @echo " done" - @${LS} -l ${TARFILE} + ${_v}${LS} -l ${TARFILE} clean-roothack: - @${RM} -rf ${WRKDIR}/roothack + ${_v}${RM} -rf ${WRKDIR}/roothack clean: clean-roothack - @if [ -d ${WRKDIR} ]; then ${CHFLAGS} -R noschg ${WRKDIR}; fi - @cd ${WRKDIR} && ${RM} -rf mfs mnt disk dist trees .*_done + ${_v}if [ -d ${WRKDIR} ]; then ${CHFLAGS} -R noschg ${WRKDIR}; fi + ${_v}cd ${WRKDIR} && ${RM} -rf mfs mnt disk dist trees .*_done From owner-svn-soc-all@FreeBSD.ORG Tue Feb 24 22:02:55 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09E58249 for ; Tue, 24 Feb 2015 22:02:55 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7E3FF52 for ; Tue, 24 Feb 2015 22:02:54 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1OM2sJt098210 for ; Tue, 24 Feb 2015 22:02:54 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t1OM2oew098151 for svn-soc-all@FreeBSD.org; Tue, 24 Feb 2015 22:02:50 GMT (envelope-from kczekirda@FreeBSD.org) Date: Tue, 24 Feb 2015 22:02:50 GMT Message-Id: <201502242202.t1OM2oew098151@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r278253 - soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2015 22:02:55 -0000 Author: kczekirda Date: Tue Feb 24 22:02:49 2015 New Revision: 278253 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278253 Log: merge to HEAD Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/auto soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/hostname soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/keymap soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/mirrorselect soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv4 soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv6 soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/services soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/time soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/zfsboot Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/auto ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/auto Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/auto Tue Feb 24 22:02:49 2015 (r278253) @@ -31,17 +31,19 @@ BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1 -f_dprintf "%s: loading includes..." "$0" -f_include $BSDCFG_SHARE/device.subr ############################################################ FUNCTIONS error() { + local msg + if [ -n "$1" ]; then + msg="$1\n\n" + fi test -n "$DISTDIR_IS_UNIONFS" && umount -f $BSDINSTALL_DISTDIR test -f $PATH_FSTAB && bsdinstall umount dialog --backtitle "FreeBSD Installer" --title "Abort" \ --no-label "Exit" --yes-label "Restart" --yesno \ - "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 + "${msg}An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 if [ $? -ne 0 ]; then exit 1 else @@ -60,7 +62,7 @@ bsdinstall keymap trap error SIGINT # Catch cntrl-C here -bsdinstall hostname || error +bsdinstall hostname || error "Set hostname failed" export DISTRIBUTIONS="base.txz kernel.txz" if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then @@ -76,7 +78,6 @@ for dist in $EXTRA_DISTS; do export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" done - [ -n "$TOFILE" ] && echo "DISTRIBUTIONS=\"$DISTRIBUTIONS\"" >> "$TOFILE" fi FETCH_DISTRIBUTIONS="" @@ -87,7 +88,7 @@ done FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS` # Trim white space -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" -a -z "$TOFILE" ]; then +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 bsdinstall netconfig || error NETCONFIG_DONE=yes @@ -98,29 +99,22 @@ BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3) MIRROR_BUTTON=$? exec 3>&- - test $MIRROR_BUTTON -eq 0 || error + test $MIRROR_BUTTON -eq 0 || error "No mirror selected" export BSDINSTALL_DISTSITE fi -if [ -z "$TOFILE" ]; then - rm -f $PATH_FSTAB - touch $PATH_FSTAB -fi +rm -f $PATH_FSTAB +touch $PATH_FSTAB PMODES="\ -Guided \"Partitioning Tool (Recommended for Beginners)\" \ -Manual \"Manually Configure Partitions (Expert)\" \ +\"Auto (UFS)\" \"Guided Disk Setup\" \ +Manual \"Manual Disk Setup (experts)\" \ Shell \"Open a shell and partition by hand\"" -if [ ! -z "$TOFILE" ]; then - PMODES="\ - Classic \"Choose disk for installation\"" -fi - CURARCH=$( uname -m ) case $CURARCH in amd64|i386) # Booting ZFS Supported - PMODES="$PMODES ZFS \"Automatic Root-on-ZFS (Experimental)\"" + PMODES="$PMODES \"Auto (ZFS)\" \"Guided Root-on-ZFS\"" ;; *) # Booting ZFS Unspported ;; @@ -134,9 +128,9 @@ exec 3>&- case "$PARTMODE" in -"Guided") # Guided - bsdinstall autopart || error - bsdinstall mount || error +"Auto (UFS)") # Guided + bsdinstall autopart || error "Partitioning error" + bsdinstall mount || error "Failed to mount filesystem" ;; "Shell") # Shell clear @@ -146,52 +140,27 @@ "Manual") # Manual if f_isset debugFile; then # Give partedit the path to our logfile so it can append - BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error + BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error "Partitioning error" else - bsdinstall partedit || error + bsdinstall partedit || error "Partitioning error" fi - bsdinstall mount || error + bsdinstall mount || error "Failed to mount filesystem" ;; -"Classic") # only disk choise - disks= - debug= f_device_find "" $DEVICE_TYPE_DISK disks - f_device_sort_by name disks disks - - disk_check_list= - for disk in $disks; do - desc= - $disk get name name - $disk get desc desc - f_shell_escape "$desc" desc - f_getvar _${disk}_status:-off onoff - disk_check_list="$disk_check_list - $name '$desc' " - done - - exec 3>&1 - DISK=`echo "$disk_check_list" | xargs dialog --backtitle 'FreeBSD Installer' --title 'Target Selection' --menu 'Please select a disk to install FreeBSD:' 0 0 0 2>&1 1>&3` - if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi - exec 3>&- - - echo "PARTITIONS=\"$DISK { auto freebsd-ufs /}\"" >> "$TOFILE" - ;; -"ZFS") # ZFS - bsdinstall zfsboot || error - if [ -z "$TOFILE" ]; then - bsdinstall mount || error - fi +"Auto (ZFS)") # ZFS + bsdinstall zfsboot || error "ZFS setup failed" + bsdinstall mount || error "Failed to mount filesystem" ;; *) - error + error "Unknown partitioning mode" ;; esac -if [ ! -z "$FETCH_DISTRIBUTIONS" -a -z "$TOFILE" ]; then +if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then ALL_DISTRIBUTIONS="$DISTRIBUTIONS" # Download to a directory in the new system as scratch space BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist" - mkdir -p "$BSDINSTALL_FETCHDEST" || error + mkdir -p "$BSDINSTALL_FETCHDEST" || error "Could not create directory $BSDINSTALL_FETCHDEST" export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS" # Try to use any existing distfiles @@ -204,15 +173,13 @@ fi export FTP_PASSIVE_MODE=YES - bsdinstall distfetch || error + bsdinstall distfetch || error "Failed to fetch distribution" export DISTRIBUTIONS="$ALL_DISTRIBUTIONS" fi -if [ -z "$TOFILE" ]; then - bsdinstall checksum || error - bsdinstall distextract || error - bsdinstall rootpass || error -fi +bsdinstall checksum || error "Distribution checksum failed" +bsdinstall distextract || error "Distribution extract failed" +bsdinstall rootpass || error "Could not set root password" trap true SIGINT # This section is optional if [ "$NETCONFIG_DONE" != yes ]; then @@ -221,11 +188,9 @@ bsdinstall time bsdinstall services -if [ -z "$TOFILE" ]; then - dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ - "Would you like to add users to the installed system now?" 0 0 && \ - bsdinstall adduser -fi +dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ + "Would you like to add users to the installed system now?" 0 0 && \ + bsdinstall adduser finalconfig() { exec 3>&1 @@ -275,22 +240,20 @@ } # Allow user to change his mind -[ -z "$TOFILE" ] && finalconfig +finalconfig trap error SIGINT # SIGINT is bad again -if [ -z "$TOFILE" ]; then - bsdinstall config || error -fi +bsdinstall config || error "Failed to save config" -if [ ! -z "$BSDINSTALL_FETCHDEST" -a -z "$TOFILE" ]; then +if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then [ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \ umount "$BSDINSTALL_DISTDIR" rm -rf "$BSDINSTALL_FETCHDEST" fi -if [ -z "$TOFILE" ]; then dialog --backtitle "FreeBSD Installer" --title "Manual Configuration" \ - --yesno "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0 + --default-button no --yesno \ + "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0 if [ $? -eq 0 ]; then clear mount -t devfs devfs "$BSDINSTALL_CHROOT/dev" @@ -301,7 +264,6 @@ bsdinstall entropy bsdinstall umount -fi f_dprintf "Installation Completed at %s" "$( date )" Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/hostname ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/hostname Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/hostname Tue Feb 24 22:02:49 2015 (r278253) @@ -42,12 +42,7 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -if [ -z "$TOFILE" ]; then - echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname -else - echo "HOSTNAME=\"$HOSTNAME\"" >> "$TOFILE" -fi - +echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then hostname -s "$HOSTNAME" fi Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/keymap ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/keymap Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/keymap Tue Feb 24 22:02:49 2015 (r278253) @@ -222,17 +222,12 @@ n=$( eval f_dialog_menutag2index_with_help \ \"\$menu_choice\" $menu_list ) - # Turn that number in the name of the keymap struct + # Turn that number ithe name of the keymap struct k=$( set -- $KEYMAPS; eval echo \"\${$(( $n - 2))}\" ) # Get actual keymap setting while we update $keymap and $KEYMAPFILE keymap_$k get keym keymap - if [ -z "$TOFILE" ]; then - echo "keymap=\"$keymap\"" > "$KEYMAPFILE" - else - echo "KEYMAP=\"$keymap\"" >> "$TOFILE" - fi - + echo "keymap=\"$keymap\"" > "$KEYMAPFILE" done f_quietly f_keymap_kbdcontrol "$keymap" Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/mirrorselect ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/mirrorselect Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/mirrorselect Tue Feb 24 22:02:49 2015 (r278253) @@ -158,6 +158,7 @@ exec 3>&- _UNAME_R=`uname -r` +_UNAME_R=${_UNAME_R%-p*} case ${_UNAME_R} in *-CURRENT|*-STABLE|*-PRERELEASE) @@ -170,12 +171,6 @@ BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}" -if [ "$TOFILE" ]; then - echo "MIRROR=\"$MIRROR\"" >> "$TOFILE" - echo "RELDIR=\"$RELDIR\"" >> "$TOFILE" - echo "RELEASE=\"${_UNAME_R}\"" >> "$TOFILE" -fi - case $MIRROR_BUTTON in $DIALOG_CANCEL) exit 1 Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig Tue Feb 24 22:02:49 2015 (r278253) @@ -69,11 +69,7 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -if [ -z "$TOFILE" ]; then - : > $BSDINSTALL_TMPETC/._rc.conf.net -else - echo INTERFACE=\"$INTERFACE\" >> "$TOFILE" -fi +: > $BSDINSTALL_TMPETC/._rc.conf.net IFCONFIG_PREFIX="" if is_wireless_if $INTERFACE; then @@ -107,7 +103,6 @@ exec $0 else IPV4_AVAIL=0 - [ "$TOFILE" ] && echo IPV4=\"NO\" >> "$TOFILE" fi fi # In case wlanconfig left an option and we do not support IPv4 we need to write @@ -122,12 +117,9 @@ bsdinstall netconfig_ipv6 ${INTERFACE} || exec $0 else IPV6_AVAIL=0 - [ "$TOFILE" ] && echo IPV6=\"NO\" >> "$TOFILE" fi fi -[ "$TOFILE" ] && cp /etc/resolv.conf $BSDINSTALL_TMPETC - SEARCH="" IP4_1="" IP4_2="" @@ -191,59 +183,30 @@ if [ $? -eq $DIALOG_CANCEL ]; then exec $0; fi exec 3>&- -if [ -z "$TOFILE" ]; then - echo ${RESOLV} | tr ' ' '\n' | \ - awk ' - BEGIN { - search=-1; +echo ${RESOLV} | tr ' ' '\n' | \ +awk ' +BEGIN { + search=-1; +} +{ + if (/^[[:space:]]+$/) { + next; } - { - if (/^[[:space:]]+$/) { - next; - } - if (/^Nameserver$/) { - printf "\n"; - search=0; - next; - } - if (search == -1) { - printf "search "; - search=1; - } - if (search > 0) { - printf "%s%s", (search > 1) ? " " : "", $1; - search++; - next; - } - printf "nameserver %s\n", $1; - }' > ${BSDINSTALL_TMPETC}/resolv.conf - mv $BSDINSTALL_TMPETC/._rc.conf.net $BSDINSTALL_TMPETC/rc.conf.net -else - echo ${RESOLV} | tr ' ' '\n' | \ - awk ' - BEGIN { - search=-1; - dns=1; + if (/^Nameserver$/) { + printf "\n"; + search=0; + next; } - { - if (/^[[:space:]]+$/) { - next; - } - if (/^Nameserver$/) { - printf "\"\n"; - search=0; - next; - } - if (search == -1) { - printf "DOMAIN=\""; - search=1; - } - if (search > 0) { - printf "%s%s", (search > 1) ? " " : "", $1; - search++; - next; - } - printf "DNS%s=\"%s\"\n", dns, $1; - dns++; - }' >> "$TOFILE" -fi + if (search == -1) { + printf "search "; + search=1; + } + if (search > 0) { + printf "%s%s", (search > 1) ? " " : "", $1; + search++; + next; + } + printf "nameserver %s\n", $1; +}' > ${BSDINSTALL_TMPETC}/resolv.conf + +mv $BSDINSTALL_TMPETC/._rc.conf.net $BSDINSTALL_TMPETC/rc.conf.net Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv4 ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv4 Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv4 Tue Feb 24 22:02:49 2015 (r278253) @@ -48,11 +48,7 @@ dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0 if [ $? -eq $DIALOG_OK ]; then - if [ -z "$TOFILE" ]; then - echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/._rc.conf.net - else - echo DHCP=\"YES\" >> "$TOFILE" - fi + echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/._rc.conf.net if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0 @@ -66,8 +62,6 @@ exit 0 fi -[ -z "$TOFILE" ] && echo DHCP=\"NO\" >> "$TOFILE" - IP_ADDRESS=`ifconfig $INTERFACE inet | awk '/inet/ {printf("%s\n", $2); }'` NETMASK=`ifconfig $INTERFACE inet | awk '/inet/ {printf("%s\n", $4); }'` ROUTER=`netstat -rn -f inet | awk '/default/ {printf("%s\n", $2);}'` @@ -81,19 +75,11 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -if [ -z "$TOFILE" ]; then - echo $INTERFACE $IF_CONFIG | - awk -v prefix="$IFCONFIG_PREFIX" '{ - printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3); - printf("defaultrouter=\"%s\"\n", $4); - }' >> $BSDINSTALL_TMPETC/._rc.conf.net -else - echo $IF_CONFIG | - awk '{printf("ADDRESSV4=\"%s\"\n", $1); - printf("NETMASK=\"%s\"\n", $2); - printf("GWV4=\"%s\"\n", $3); - }' >> "$TOFILE" -fi +echo $INTERFACE $IF_CONFIG | + awk -v prefix="$IFCONFIG_PREFIX" '{ + printf("ifconfig_%s=\"%s\inet %s netmask %s\"\n", $1, prefix, $2, $3); + printf("defaultrouter=\"%s\"\n", $4); + }' >> $BSDINSTALL_TMPETC/._rc.conf.net if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then . $BSDINSTALL_TMPETC/._rc.conf.net Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv6 ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv6 Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/netconfig_ipv6 Tue Feb 24 22:02:49 2015 (r278253) @@ -53,8 +53,6 @@ ;; esac -[ -z "$TOFILE" ] && echo IPV6=\"YES\" >> "$TOFILE" - AGAIN="" while : ; do MSG="Would you like to try stateless address autoconfiguration (SLAAC)${AGAIN}?" @@ -73,14 +71,9 @@ continue fi fi - if [ -z "$TOFILE" ]; then - echo ifconfig_${INTERFACE}_ipv6=\"inet6 accept_rtadv\" >> $BSDINSTALL_TMPETC/._rc.conf.net - else - echo SLAAC=\"YES\" >> "$TOFILE" - fi + echo ifconfig_${INTERFACE}_ipv6=\"inet6 accept_rtadv\" >> $BSDINSTALL_TMPETC/._rc.conf.net exit 0 else - echo SLAAC=\"NO\" >> "$TOFILE" break fi done @@ -120,65 +113,34 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- -if [ -z "$TOFILE" ]; then - echo ${IF_CONFIG} | tr ' ' '\n' | \ - awk -v iface="${INTERFACE}" ' - BEGIN { - dfr=0; - count=0; - } - { - if (/^[[:space:]]+$/) { - next; - } - if (/DefaultRouter/) { - dfr=1; - next; - } - if (dfr == 1) { - printf("ipv6_defaultrouter=\"%s\"\n", $1); - next; - } - if (count > 0) { - # Ignore all but the first IP address for now. - next; - } - count++; - if (!match($1, "/")) { - sub("$", "/64", $1); - } - printf("ifconfig_%s_ipv6=\"inet6 %s\"\n", iface, $1); - }' >> $BSDINSTALL_TMPETC/._rc.conf.net -else - echo ${IF_CONFIG} | tr ' ' '\n' | \ - awk -v iface="${INTERFACE}" ' - BEGIN { - dfr=0; - count=0; - } - { - if (/^[[:space:]]+$/) { - next; - } - if (/DefaultRouter/) { - dfr=1; - next; - } - if (dfr == 1) { - printf("GWV6=\"%s\"\n", $1); - next; - } - if (count > 0) { - # Ignore all but the first IP address for now. - next; - } - count++; - if (!match($1, "/")) { - sub("$", "/64", $1); - } - printf("ADDRESSV6=\"%s\"\n", $1); - }' >> "$TOFILE" -fi +echo ${IF_CONFIG} | tr ' ' '\n' | \ +awk -v iface="${INTERFACE}" ' +BEGIN { + dfr=0; + count=0; +} +{ + if (/^[[:space:]]+$/) { + next; + } + if (/DefaultRouter/) { + dfr=1; + next; + } + if (dfr == 1) { + printf("ipv6_defaultrouter=\"%s\"\n", $1); + next; + } + if (count > 0) { + # Ignore all but the first IP address for now. + next; + } + count++; + if (!match($1, "/")) { + sub("$", "/64", $1); + } + printf("ifconfig_%s_ipv6=\"inet6 %s\"\n", iface, $1); +}' >> $BSDINSTALL_TMPETC/._rc.conf.net if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then . $BSDINSTALL_TMPETC/._rc.conf.net Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script Tue Feb 24 22:02:49 2015 (r278253) @@ -285,7 +285,7 @@ fi bsdinstall entropy -#bsdinstall umount +[ -z "$ZFSBOOT" ] && bsdinstall umount f_dprintf "Installation Completed at %s" "$( date )" Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/services ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/services Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/services Tue Feb 24 22:02:49 2015 (r278253) @@ -43,6 +43,7 @@ --title "System Configuration" --nocancel --separate-output \ --checklist "Choose the services you would like to be started at boot:" \ 0 0 0 \ + local_unbound "Local caching validating resolver" ${local_unbound:-off} \ sshd "Secure shell daemon" ${sshd_enable:-off} \ moused "PS/2 mouse pointer on console" ${moused_enable:-off} \ ntpd "Synchronize system and network time" ${ntpd_enable:-off} \ @@ -53,24 +54,15 @@ exec 3>&- havedump= - -if [ -z "$TOFILE" ]; then - for daemon in $DAEMONS; do +for daemon in $DAEMONS; do [ "$daemon" = "dumpdev" ] && havedump=1 continue - echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services - done -else - for daemon in $DAEMONS; do - DAEMONLIST="$DAEMONLIST $daemon" - done - echo "DAEMONS=\"$DAEMONLIST\"" >> "$TOFILE" -fi + echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services +done echo '# Set dumpdev to "AUTO" to enable crash dumps, "NO"' \ 'to disable' >> $BSDINSTALL_TMPETC/rc.conf.services if [ "$havedump" ]; then - [ -z "$TOFILE" ] && echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services + echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services else - [ -z "$TOFILE" ] && echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services + echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services fi - Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/time ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/time Tue Feb 24 22:02:38 2015 (r278252) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/time Tue Feb 24 22:02:49 2015 (r278253) @@ -26,394 +26,4 @@ # # $FreeBSD$ -if [ -z "$TOFILE" ]; then - chroot $BSDINSTALL_CHROOT tzsetup -else - : ${DIALOG_OK=0} - : ${DIALOG_CANCEL=1} - : ${DIALOG_ESC=255} - - exec 3>&1 - TIMEZONE=`dialog --backtitle "FreeBSD Installer" \ - --title "Time Zone Selection" \ - --menu "Please select a country or region closest to you." \ - 0 0 0 \ - Africa/Abidjan ""\ - Africa/Accra ""\ - Africa/Addis_Ababa ""\ - Africa/Algiers ""\ - Africa/Asmara ""\ - Africa/Bamako ""\ - Africa/Bangui ""\ - Africa/Banjul ""\ - Africa/Bissau ""\ - Africa/Blantyre ""\ - Africa/Brazzaville ""\ - Africa/Bujumbura ""\ - Africa/Cairo ""\ - Africa/Casablanca ""\ - Africa/Ceuta ""\ - Africa/Conakry ""\ - Africa/Dakar ""\ - Africa/Dar_es_Salaam ""\ - Africa/Djibouti ""\ - Africa/Douala ""\ - Africa/El_Aaiun ""\ - Africa/Freetown ""\ - Africa/Gaborone ""\ - Africa/Juba ""\ - Africa/Khartoum ""\ - Africa/Kigali ""\ - Africa/Kinshasa ""\ - Africa/Lagos ""\ - Africa/Libreville ""\ - Africa/Lome ""\ - Africa/Luanda ""\ - Africa/Lubumbashi ""\ - Africa/Malabo ""\ - Africa/Maputo ""\ - Africa/Maseru ""\ - Africa/Mbabane ""\ - Africa/Mogadishu ""\ - Africa/Monrovia ""\ - Africa/Nairobi ""\ - Africa/Ndjamena ""\ - Africa/Niamey ""\ - Africa/Nouakchott ""\ - Africa/Ouagadougou ""\ - Africa/Porto-Novo ""\ - Africa/Sao_Tome ""\ - Africa/Tripoli ""\ - Africa/Tunis ""\ - Africa/Windhoek ""\ - America/Anguilla ""\ - America/Antigua ""\ - America/Araguaina ""\ - America/Argentina/Buenos_Aires ""\ - America/Argentina/Catamarca ""\ - America/Argentina/Cordoba ""\ - America/Argentina/Jujuy ""\ - America/Argentina/La_Rioja ""\ - America/Argentina/Mendoza ""\ - America/Argentina/Rio_Gallegos ""\ - America/Argentina/Salta ""\ - America/Argentina/San_Juan ""\ - America/Argentina/San_Luis ""\ - America/Argentina/Tucuman ""\ - America/Argentina/Ushuaia ""\ - America/Aruba ""\ - America/Asuncion ""\ - America/Atikokan ""\ - America/Bahia ""\ - America/Bahia_Banderas ""\ - America/Barbados ""\ - America/Belem ""\ - America/Belize ""\ - America/Blanc-Sablon ""\ - America/Boa_Vista ""\ - America/Bogota ""\ - America/Cambridge_Bay ""\ - America/Campo_Grande ""\ - America/Cancun ""\ - America/Cayenne ""\ - America/Cayman ""\ - America/Chihuahua ""\ - America/Costa_Rica ""\ - America/Creston ""\ - America/Cuiaba ""\ - America/Curacao ""\ - America/Danmarkshavn ""\ - America/Dawson ""\ - America/Dawson_Creek ""\ - America/Dominica ""\ - America/Edmonton ""\ - America/Eirunepe ""\ - America/El_Salvador ""\ - America/Fortaleza ""\ - America/Glace_Bay ""\ - America/Godthab ""\ - America/Goose_Bay ""\ - America/Grand_Turk ""\ - America/Grenada ""\ - America/Guadeloupe ""\ - America/Guatemala ""\ - America/Guayaquil ""\ - America/Guyana ""\ - America/Halifax ""\ - America/Havana ""\ - America/Hermosillo ""\ - America/Inuvik ""\ - America/Iqaluit ""\ - America/Jamaica ""\ - America/Kralendijk ""\ - America/La_Paz ""\ - America/Lima ""\ - America/Lower_Princes ""\ - America/Maceio ""\ - America/Managua ""\ - America/Manaus ""\ - America/Marigot ""\ - America/Martinique ""\ - America/Matamoros ""\ - America/Mazatlan ""\ - America/Merida ""\ - America/Mexico_City ""\ - America/Miquelon ""\ - America/Moncton ""\ - America/Monterrey ""\ - America/Montserrat ""\ - America/Nassau ""\ - America/Nipigon ""\ - America/Noronha ""\ - America/Ojinaga ""\ - America/Panama ""\ - America/Pangnirtung ""\ - America/Paramaribo ""\ - America/Port_of_Spain ""\ - America/Port-au-Prince ""\ - America/Porto_Velho ""\ - America/Puerto_Rico ""\ - America/Rainy_River ""\ - America/Rankin_Inlet ""\ - America/Recife ""\ - America/Regina ""\ - America/Resolute ""\ - America/Rio_Branco ""\ - America/Santa_Isabel ""\ - America/Santarem ""\ - America/Santiago ""\ - America/Santo_Domingo ""\ - America/Sao_Paulo ""\ - America/Scoresbysund ""\ - America/St_Barthelemy ""\ - America/St_Johns ""\ - America/St_Kitts ""\ - America/St_Lucia ""\ - America/Swift_Current ""\ - America/Tegucigalpa ""\ - America/Thule ""\ - America/Thunder_Bay ""\ - America/Tijuana ""\ - America/Toronto ""\ - America/Vancouver ""\ - America/Whitehorse ""\ - America/Winnipeg ""\ - America/Yellowknife ""\ - Antarctica/Casey ""\ - Antarctica/Davis ""\ - Antarctica/DumontDUrville ""\ - Antarctica/Macquarie ""\ - Antarctica/Mawson ""\ - Antarctica/McMurdo ""\ - Antarctica/Palmer ""\ - Antarctica/Rothera ""\ - Antarctica/Syowa ""\ - Antarctica/Troll ""\ - Antarctica/Vostok ""\ - Arctic/Longyearbyen ""\ - Asia/Almaty ""\ - Asia/Amman ""\ - Asia/Anadyr ""\ - Asia/Aqtau ""\ - Asia/Aqtobe ""\ - Asia/Ashgabat ""\ - Asia/Baghdad ""\ - Asia/Bahrain ""\ - Asia/Baku ""\ - Asia/Bangkok ""\ - Asia/Beirut ""\ - Asia/Bishkek ""\ - Asia/Brunei ""\ - Asia/Choibalsan ""\ - Asia/Chongqing ""\ - Asia/Colombo ""\ - Asia/Damascus ""\ - Asia/Dhaka ""\ - Asia/Dili ""\ - Asia/Dubai ""\ - Asia/Dushanbe ""\ - Asia/Gaza ""\ - Asia/Harbin ""\ - Asia/Hebron ""\ - Asia/Hong_Kong ""\ - Asia/Hovd ""\ - Asia/Irkutsk ""\ - Asia/Jakarta ""\ - Asia/Jayapura ""\ - Asia/Jerusalem ""\ - Asia/Kabul ""\ - Asia/Kamchatka ""\ - Asia/Karachi ""\ - Asia/Kashgar ""\ - Asia/Kathmandu ""\ - Asia/Khandyga ""\ - Asia/Kolkata ""\ - Asia/Krasnoyarsk ""\ - Asia/Kuala_Lumpur ""\ - Asia/Kuching ""\ - Asia/Kuwait ""\ - Asia/Macau ""\ - Asia/Magadan ""\ - Asia/Makassar ""\ - Asia/Manila ""\ - Asia/Muscat ""\ - Asia/Nicosia ""\ - Asia/Novokuznetsk ""\ - Asia/Novosibirsk ""\ - Asia/Omsk ""\ - Asia/Oral ""\ - Asia/Phnom_Penh ""\ - Asia/Pontianak ""\ - Asia/Pyongyang ""\ - Asia/Qatar ""\ - Asia/Qyzylorda ""\ - Asia/Rangoon ""\ - Asia/Riyadh ""\ - Asia/Sakhalin ""\ - Asia/Seoul ""\ - Asia/Shanghai ""\ - Asia/Singapore ""\ - Asia/Taipei ""\ - Asia/Tbilisi ""\ - Asia/Tehran ""\ - Asia/Thimphu ""\ - Asia/Tokyo ""\ - Asia/Ulaanbaatar ""\ - Asia/Urumqi ""\ - Asia/Ust-Nera ""\ - Asia/Vientiane ""\ - Asia/Vladivostok ""\ - Asia/Yakutsk ""\ - Asia/Yekaterinburg ""\ - Asia/Yerevan ""\ - Atlantic/Azores ""\ - Atlantic/Bermuda ""\ - Atlantic/Canary ""\ - Atlantic/Cape_Verde ""\ - Atlantic/Faroe ""\ - Atlantic/Madeira ""\ - Atlantic/Reykjavik ""\ - Atlantic/South_Georgia ""\ - Atlantic/St_Helena ""\ - Atlantic/Stanley ""\ - Australia/Adelaide ""\ - Australia/Brisbane ""\ - Australia/Broken_Hill ""\ - Australia/Currie ""\ - Australia/Darwin ""\ - Australia/Eucla ""\ - Australia/Hobart ""\ - Australia/Lindeman ""\ - Australia/Lord_Howe ""\ - Australia/Melbourne ""\ - Australia/Perth ""\ - Australia/Sydney ""\ - Europe/Amsterdam ""\ - Europe/Andorra ""\ - Europe/Athens ""\ - Europe/Belgrade ""\ - Europe/Berlin ""\ - Europe/Bratislava ""\ - Europe/Brussels ""\ - Europe/Bucharest ""\ - Europe/Budapest ""\ - Europe/Busingen ""\ - Europe/Chisinau ""\ - Europe/Copenhagen ""\ - Europe/Dublin ""\ - Europe/Gibraltar ""\ - Europe/Guernsey ""\ - Europe/Helsinki ""\ - Europe/Isle_of_Man ""\ - Europe/Istanbul ""\ - Europe/Jersey ""\ - Europe/Kaliningrad ""\ - Europe/Kiev ""\ - Europe/Lisbon ""\ - Europe/Ljubljana ""\ - Europe/London ""\ - Europe/Luxembourg ""\ - Europe/Madrid ""\ - Europe/Malta ""\ - Europe/Mariehamn ""\ - Europe/Minsk ""\ - Europe/Monaco ""\ - Europe/Moscow ""\ - Europe/Oslo ""\ - Europe/Paris ""\ - Europe/Podgorica ""\ - Europe/Prague ""\ - Europe/Riga ""\ - Europe/Rome ""\ - Europe/Samara ""\ - Europe/San_Marino ""\ - Europe/Sarajevo ""\ - Europe/Simferopol ""\ - Europe/Skopje ""\ - Europe/Sofia ""\ - Europe/Stockholm ""\ - Europe/Tallinn ""\ - Europe/Tirane ""\ - Europe/Uzhgorod ""\ - Europe/Vaduz ""\ - Europe/Vienna ""\ - Europe/Vilnius ""\ - Europe/Volgograd ""\ - Europe/Warsaw ""\ - Europe/Zagreb ""\ - Europe/Zaporozhye ""\ - Europe/Zurich ""\ - Indian/Antananarivo ""\ - Indian/Chagos ""\ - Indian/Christmas ""\ - Indian/Cocos ""\ - Indian/Comoro ""\ - Indian/Kerguelen ""\ - Indian/Mahe ""\ - Indian/Maldives ""\ - Indian/Mauritius ""\ - Indian/Reunion ""\ - Pacific/Auckland ""\ - Pacific/Chatham ""\ - Pacific/Chuuk ""\ - Pacific/Easter ""\ - Pacific/Enderbury ""\ - Pacific/Fakaofo ""\ - Pacific/Fiji ""\ - Pacific/Funafuti ""\ - Pacific/Galapagos ""\ - Pacific/Gambier ""\ - Pacific/Guadalcanal ""\ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Thu Feb 26 21:49:52 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF7A8F08 for ; Thu, 26 Feb 2015 21:49:52 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B61C9C4D for ; Thu, 26 Feb 2015 21:49:52 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QLnqQl027093 for ; Thu, 26 Feb 2015 21:49:52 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t1QLnpGX027066 for svn-soc-all@FreeBSD.org; Thu, 26 Feb 2015 21:49:51 GMT (envelope-from kczekirda@FreeBSD.org) Date: Thu, 26 Feb 2015 21:49:51 GMT Message-Id: <201502262149.t1QLnpGX027066@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r278254 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall/scripts tools/mfsbsd/customfiles/usr/libexec/bsdinstall MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 21:49:52 -0000 Author: kczekirda Date: Thu Feb 26 21:49:50 2015 New Revision: 278254 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278254 Log: remove slash when is the last character in MIRROR Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script ============================================================================== --- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Tue Feb 24 22:02:49 2015 (r278253) +++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script Thu Feb 26 21:49:50 2015 (r278254) @@ -132,6 +132,8 @@ # Build mirror path +MIRROR=$(echo "$MIRROR" | sed 's/\/$//') + BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/$UNAME_M/$UNAME_P/$RELEASE" export BSDINSTALL_DISTSITE Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script Tue Feb 24 22:02:49 2015 (r278253) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/customfiles/usr/libexec/bsdinstall/script Thu Feb 26 21:49:50 2015 (r278254) @@ -132,6 +132,8 @@ # Build mirror path +MIRROR=$(echo "$MIRROR" | sed 's/\/$//') + BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/$UNAME_M/$UNAME_P/$RELEASE" export BSDINSTALL_DISTSITE