From owner-svn-src-user@freebsd.org Sun Apr 16 09:41:06 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78103D411B0 for ; Sun, 16 Apr 2017 09:41:06 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 45B7D5E0; Sun, 16 Apr 2017 09:41:06 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3G9f5PO035311; Sun, 16 Apr 2017 09:41:05 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3G9f5DE035295; Sun, 16 Apr 2017 09:41:05 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201704160941.v3G9f5DE035295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Sun, 16 Apr 2017 09:41:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317016 - user/uqs/git_conv X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Apr 2017 09:41:06 -0000 Author: uqs Date: Sun Apr 16 09:41:05 2017 New Revision: 317016 URL: https://svnweb.freebsd.org/changeset/base/317016 Log: Disable automatic CRLF handling in git, we want to have an identical copy of what svn2git produces. Modified: user/uqs/git_conv/git_conv Modified: user/uqs/git_conv/git_conv ============================================================================== --- user/uqs/git_conv/git_conv Sun Apr 16 09:11:02 2017 (r317015) +++ user/uqs/git_conv/git_conv Sun Apr 16 09:41:05 2017 (r317016) @@ -49,6 +49,7 @@ # - cd base-head.git # - git svn fetch -r 0:1000 # - git config --global push.default matching +# - git config --global core.autocrlf false # - git remote add github base.github.com:freebsd/freebsd.git # - git config --add remote.github.push '+refs/remotes/trunk:refs/heads/svn_head' # - git svn rebase From owner-svn-src-user@freebsd.org Wed Apr 19 09:01:05 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9D8CD4356B for ; Wed, 19 Apr 2017 09:01:05 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 6B1B31CAA; Wed, 19 Apr 2017 09:01:05 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3J914gD093301; Wed, 19 Apr 2017 09:01:04 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3J914Di093300; Wed, 19 Apr 2017 09:01:04 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201704190901.v3J914Di093300@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 19 Apr 2017 09:01:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317127 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 09:01:05 -0000 Author: pho Date: Wed Apr 19 09:01:04 2017 New Revision: 317127 URL: https://svnweb.freebsd.org/changeset/base/317127 Log: Added a regression test. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/nfsdelegation.sh (contents, props changed) Added: user/pho/stress2/misc/nfsdelegation.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/nfsdelegation.sh Wed Apr 19 09:01:04 2017 (r317127) @@ -0,0 +1,170 @@ +#!/bin/sh + +# +# Copyright (c) 2017 Dell EMC Isilon +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Test nfsv4 delegations. Scenario suggestion by kib. +# "(nfsdelegation), uid 0, was killed: text file modification" seen. +# Fixed by r316745 + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +[ -z "$nfs_export" ] && exit 0 +ping -c 2 `echo $nfs_export | sed 's/:.*//'` > /dev/null 2>&1 || + exit 0 + +here=`pwd` +cd /tmp +sed '1,/^EOF/d' < $here/$0 > nfsdelegation.c +mycc -o nfsdelegation -Wall -Wextra -O0 nfsdelegation.c || exit 1 +rm -f nfsdelegation.c + +[ `sysctl -n sysctl vfs.timestamp_precision` -ne 3 ] && + echo "vfs.timestamp_precision must be set to 3" +[ `sysctl -n vfs.nfsd.issue_delegations` -eq 0 ] && + { echo "vfs.nfsd.issue_delegations is not enabled"; exit 0; } +pgrep -q nfscbd || { echo "nfscbd is not running"; exit 0; } + +mount | grep "$mntpoint" | grep -q nfs && umount $mntpoint +opt="-o nocto" +opt="$opt -o nolockd -o nfsv4" +mount $opt $nfs_export $mntpoint || exit 1 +sleep .2 + +wdir=$mntpoint/`hostname`/nfsdelegation +mkdir -p $wdir || exit 1 + +delegs=0 +s=0 +(cd $wdir; /tmp/nfsdelegation) & +while kill -0 $! 2>/dev/null; do + r=`nfsstat -ec | grep -A1 Delegs | tail -1 | awk '{print $5}'` + [ $r -gt $delegs ] && { delegs=$r; break; } +done +wait +[ $delegs -eq 0 ] && { echo "No delegations detected"; s=2; } + +rm -rf $wdir +umount $mntpoint +while mount | grep "$mntpoint " | grep -q nfs; do + umount -f $mntpoint +done +tail -3 /var/log/messages | grep -m1 nfsdelegation: && s=2 +exit $s +EOF +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#define LOOPS 100 +#define INPUTFILE "/bin/sleep" +#define PARALLEL 3 + +static volatile u_int *share; + +static int +tmmap(int idx) +{ + struct stat statbuf; + pid_t epid, pid; + int i; + int fdout; + char *cmdline[3], *dst, file[128], help[80]; + + pid = getpid(); + cmdline[1] = ".01"; + cmdline[2] = 0; + for (i = 0; i < LOOPS; i++) { + sprintf(file,"nfsdelegation.p%05d.%05d", pid, i); + cmdline[0] = file; + + snprintf(help, sizeof(help), "cp %s %s; chmod 777 %s", INPUTFILE, file, file); + system(help); + share[idx] = 0; + if ((epid = fork()) == 0) { + alarm(60); + while (share[idx] == 0) + usleep(100); + if (execve(cmdline[0], cmdline, NULL) == -1) + err(1, "execve"); + } + + if ((fdout = open(file, O_RDWR)) < 0) + err(1, "open(%s)", file); + if (fstat(fdout, &statbuf) < 0) + err(1, "fstat error"); + + if ((dst = mmap(0, statbuf.st_size, PROT_READ | PROT_WRITE | + MAP_PRIVATE, MAP_SHARED, fdout, 0)) == (caddr_t) - 1) + err(1, "mmap error for output"); + + dst[statbuf.st_size] = 1; + + close(fdout); + if (munmap(dst, statbuf.st_size) == -1) + err(1, "munmap"); + share[idx] = 1; + if (waitpid(epid, NULL, 0) != epid) + err(1, "waitpid(%d)", epid); + } + + _exit(0); +} + +int +main(void) +{ + size_t len; + int i; + + len = PAGE_SIZE; + if ((share = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_SHARED, -1, 0)) == MAP_FAILED) + err(1, "mmap"); + for (i = 0; i < PARALLEL; i++) { + if (fork() == 0) + tmmap(i); + } + + for (i = 0; i < PARALLEL; i++) { + wait(NULL); + } + + return (0); +} From owner-svn-src-user@freebsd.org Wed Apr 19 09:05:31 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE431D43639 for ; Wed, 19 Apr 2017 09:05:31 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 733ED141; Wed, 19 Apr 2017 09:05:31 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3J95U6u094472; Wed, 19 Apr 2017 09:05:30 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3J95Ui5094471; Wed, 19 Apr 2017 09:05:30 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201704190905.v3J95Ui5094471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 19 Apr 2017 09:05:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317128 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 09:05:31 -0000 Author: pho Date: Wed Apr 19 09:05:30 2017 New Revision: 317128 URL: https://svnweb.freebsd.org/changeset/base/317128 Log: Limit RLIMIT_MEMLOCK so test does not deadlock. Cleanup code while here. Modified: user/pho/stress2/misc/mmap14.sh Modified: user/pho/stress2/misc/mmap14.sh ============================================================================== --- user/pho/stress2/misc/mmap14.sh Wed Apr 19 09:01:04 2017 (r317127) +++ user/pho/stress2/misc/mmap14.sh Wed Apr 19 09:05:30 2017 (r317128) @@ -43,11 +43,6 @@ # panic: vm_page_dirty: page is invalid! # https://people.freebsd.org/~pho/stress/log/kostik818.txt -# i386 livelock -# https://people.freebsd.org/~pho/stress/log/mmap14.txt - -[ `uname -m` = "i386" ] || exit 0 # Waiting for mmap14.txt - [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg @@ -59,18 +54,21 @@ mycc -o mmap14 -Wall -Wextra -O2 -g mmap rm -f mmap14.c daemon sh -c "(cd $here/../testcases/swap; ./swap -t 2m -i 20 -k -h)" -rnd=`od -An -N1 -t u1 /dev/random | sed 's/ //g'` -sleep $((rnd % 10)) +sleep `jot -r 1 1 10` +wire=$((`sysctl -n vm.max_wired` - `sysctl -n vm.stats.vm.v_wire_count`)) for i in `jot 2`; do - /tmp/mmap14 + /tmp/mmap14 $wire +done +while pgrep -q swap; do + pkill -9 swap done -killall -q swap rm -f /tmp/mmap14 /tmp/mmap14.core exit 0 EOF #include #include +#include #include #include #include @@ -92,10 +90,10 @@ EOF #define N (128 * 1024 / (int)sizeof(u_int32_t)) #define PARALLEL 50 -void *p; -u_int32_t r[N]; +static void *p; +static u_int32_t r[N]; -unsigned long +static unsigned long makearg(void) { unsigned long val; @@ -120,7 +118,7 @@ makearg(void) return(val); } -void * +static void * makeptr(void) { unsigned long val; @@ -134,7 +132,7 @@ makeptr(void) return ((void *)val); } -void * +static void * tmmap(void *arg __unused) { size_t len; @@ -164,7 +162,7 @@ tmmap(void *arg __unused) return (NULL); } -void * +static void * tmlock(void *arg __unused) { size_t len; @@ -188,7 +186,7 @@ tmlock(void *arg __unused) return (NULL); } -void +static void test(void) { pthread_t tid[4]; @@ -216,10 +214,28 @@ test(void) } int -main(void) +main(int argc, char *argv[]) { + struct rlimit rl; + rlim_t maxlock; int i, j; + if (argc != 2) { + fprintf(stderr, "Usage:%s \n", argv[0]); + exit(1); + } + if (getrlimit(RLIMIT_MEMLOCK, &rl) == -1) + warn("getrlimit"); + maxlock = atol(argv[1]); + if (maxlock == 0) + errx(1, "Argument is zero"); + maxlock = (maxlock / 10 * 8) / PARALLEL * PAGE_SIZE; + if (maxlock < rl.rlim_cur) { + rl.rlim_max = rl.rlim_cur = maxlock; + if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) + warn("setrlimit"); + } + for (i = 0; i < N; i++) r[i] = arc4random(); From owner-svn-src-user@freebsd.org Wed Apr 19 09:07:05 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CD40D4367C for ; Wed, 19 Apr 2017 09:07:05 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 0FA3B26C; Wed, 19 Apr 2017 09:07:04 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3J974Wv094571; Wed, 19 Apr 2017 09:07:04 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3J974uP094570; Wed, 19 Apr 2017 09:07:04 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201704190907.v3J974uP094570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 19 Apr 2017 09:07:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317129 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 09:07:05 -0000 Author: pho Date: Wed Apr 19 09:07:04 2017 New Revision: 317129 URL: https://svnweb.freebsd.org/changeset/base/317129 Log: Use calculated max wire for test. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/mmap18.sh Modified: user/pho/stress2/misc/mmap18.sh ============================================================================== --- user/pho/stress2/misc/mmap18.sh Wed Apr 19 09:05:30 2017 (r317128) +++ user/pho/stress2/misc/mmap18.sh Wed Apr 19 09:07:04 2017 (r317129) @@ -48,7 +48,7 @@ rm -f mmap18.c s=0 wire=$((`sysctl -n vm.max_wired` - `sysctl -n vm.stats.vm.v_wire_count`)) for i in `jot 5`; do - /tmp/mmap18 `sysctl -n vm.max_wired` || s=1 + /tmp/mmap18 $wire || s=1 done rm -f /tmp/mmap18 /tmp/mmap18.core From owner-svn-src-user@freebsd.org Fri Apr 21 17:42:50 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 220B5D496BE for ; Fri, 21 Apr 2017 17:42:50 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 E89CDF17; Fri, 21 Apr 2017 17:42:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3LHgn8g015146; Fri, 21 Apr 2017 17:42:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3LHgmQj015144; Fri, 21 Apr 2017 17:42:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201704211742.v3LHgmQj015144@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 21 Apr 2017 17:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317263 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Apr 2017 17:42:50 -0000 Author: gjb Date: Fri Apr 21 17:42:48 2017 New Revision: 317263 URL: https://svnweb.freebsd.org/changeset/base/317263 Log: Chase r316765, and add conv=sync to dd(1) for stable/10 IMX6 boards. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf user/gjb/thermite/10-armv6-WANDBOARD-snap.conf Modified: user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf ============================================================================== --- user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf Fri Apr 21 17:09:37 2017 (r317262) +++ user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf Fri Apr 21 17:42:48 2017 (r317263) @@ -44,7 +44,7 @@ arm_install_uboot() { FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=512 seek=2 + of=/dev/${mddev} bs=512 seek=2 conv=sync chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} Modified: user/gjb/thermite/10-armv6-WANDBOARD-snap.conf ============================================================================== --- user/gjb/thermite/10-armv6-WANDBOARD-snap.conf Fri Apr 21 17:09:37 2017 (r317262) +++ user/gjb/thermite/10-armv6-WANDBOARD-snap.conf Fri Apr 21 17:42:48 2017 (r317263) @@ -44,7 +44,7 @@ arm_install_uboot() { FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=512 seek=2 + of=/dev/${mddev} bs=512 seek=2 conv=sync chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}