From owner-freebsd-embedded@FreeBSD.ORG Thu Nov 28 08:49:19 2013 Return-Path: Delivered-To: freebsd-embedded@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22EE9CEC for ; Thu, 28 Nov 2013 08:49:19 +0000 (UTC) Received: from vps.van-laarhoven.org (www.hibma.org [IPv6:2a02:2308::216:3eff:feec:b1b5]) by mx1.freebsd.org (Postfix) with ESMTP id 9496A1E3C for ; Thu, 28 Nov 2013 08:49:18 +0000 (UTC) Received: from [192.168.178.39] (thuis.van-laarhoven.org [80.100.41.4]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by vps.van-laarhoven.org (Postfix) with ESMTPSA id 0DDCF5F27AD; Thu, 28 Nov 2013 09:45:16 +0100 (CET) Content-Type: multipart/mixed; boundary="Apple-Mail=_DB20417F-0D8E-4E7B-98E8-34239F8201FE" Mime-Version: 1.0 (Mac OS X Mail 7.0 \(1822\)) Subject: Re: NanoBSD update scripts are broken when using disk labels From: Nick Hibma In-Reply-To: <52926BE0.8050003@kibab.com> Date: Thu, 28 Nov 2013 09:49:08 +0100 Message-Id: <4615AB4C-9DA5-4475-BFB6-68964B4CFC0A@van-laarhoven.org> References: <52926BE0.8050003@kibab.com> To: Ilya Bakulin X-Mailer: Apple Mail (2.1822) Cc: "freebsd-embedded@freebsd.org" X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Nov 2013 08:49:19 -0000 --Apple-Mail=_DB20417F-0D8E-4E7B-98E8-34239F8201FE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On 24 Nov 2013, at 22:13, Ilya Bakulin wrote: > After looking in the /root/updatep2 script I realized that it cannot > work when NANO_LABEL parameter > is set when building the NanoBSD image. The problem is that you need the device, not the UFS label to update the = active partition. Attached the fixed updatep1 and updatep2 scripts. I=92ve= fixed exactly this problem yesterday to make booting from a USB thumb = drive, and embedded CF card using the same image work. If you could test them, I=92d be more than happy to commit them. Thanks in advance. Nick --Apple-Mail=_DB20417F-0D8E-4E7B-98E8-34239F8201FE Content-Disposition: attachment; filename=updatep1 Content-Type: application/octet-stream; x-unix-mode=0644; name="updatep1" Content-Transfer-Encoding: 7bit #!/bin/sh # # Copyright (c) 2004-2005 Poul-Henning Kamp. # 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: head/tools/tools/nanobsd/Files/root/updatep1 205584 2010-03-24 11:21:33Z phk $ # # Script to update partition 1 on a NanoBSD system. # # usage: # ssh somewhere cat image.s1 | sh updatep1 # set -e . /etc/nanobsd.conf if mount | grep ${NANO_DRIVE}s1 > /dev/null ; then echo "You are running partition 1 already" echo "you probably want to use 'updatep2' instead" exit 1 fi dev=$NANO_DRIVE test -n "$NANO_LABEL" \ && dev=$(glabel status -s | grep "$NANO_DRIVE""s1a" | awk '{gsub("s1a",""); print $3}') # Blow away old system. dd if=/dev/zero of=/dev/${dev}s1 bs=1m count=1 > /dev/null 2>&1 # Copy in new system dd of=/dev/${dev}s1 obs=64k # Check that it worked fsck_ffs -n /dev/${NANO_DRIVE}s1a gpart set -a active -i 1 ${dev} --Apple-Mail=_DB20417F-0D8E-4E7B-98E8-34239F8201FE Content-Disposition: attachment; filename=updatep2 Content-Type: application/octet-stream; x-unix-mode=0644; name="updatep2" Content-Transfer-Encoding: 7bit #!/bin/sh # # Copyright (c) 2004-2005 Poul-Henning Kamp. # 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: head/tools/tools/nanobsd/Files/root/updatep2 205584 2010-03-24 11:21:33Z phk $ # # Script to update partition 2 on a NanoBSD system. # # usage: # ssh somewhere cat image.s1 | sh updatep2 # set -e . /etc/nanobsd.conf if mount | grep ${NANO_DRIVE}s2 > /dev/null ; then echo "You are running partition 2 already" echo "you probably want to use 'updatep1' instead" exit 1 fi dev=$NANO_DRIVE test -n "$NANO_LABEL" \ && dev=$(glabel status -s | grep "$NANO_DRIVE""s1a" | awk '{gsub("s1a",""); print $3}') # Blow away old system. dd if=/dev/zero of=/dev/${dev}s2 bs=1m count=1 > /dev/null 2>&1 # Copy in new system dd of=/dev/${dev}s2 obs=64k # Check that it worked fsck_ffs -n /dev/${NANO_DRIVE}s2a # Update the /etc/fstab trap "umount /mnt" 1 2 15 EXIT mount /dev/${NANO_DRIVE}s2a /mnt sed -i "" "s/${NANO_DRIVE}s1/${NANO_DRIVE}s2/" /mnt/conf/base/etc/fstab sed -i "" "s/${NANO_DRIVE}s1/${NANO_DRIVE}s2/" /mnt/etc/fstab umount /mnt trap 1 2 15 EXIT gpart set -a active -i 2 ${dev} --Apple-Mail=_DB20417F-0D8E-4E7B-98E8-34239F8201FE Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii --Apple-Mail=_DB20417F-0D8E-4E7B-98E8-34239F8201FE--