On 05/15/2012 05:43 PM, Otto Moerbeek wrote:
> On Tue, May 15, 2012 at 11:35:59AM -0400, Ted Unangst wrote:
>
>> On Tue, May 15, 2012 at 17:03, Marc Peters wrote:
>>> Hi list,
>>>
>>> i am trying to built a 5.1 release which fails at
>>
>>> disklabel -w vnd0 floppy576
>>> disklabel: unknown disk type: floppy576
>>
>> Your /etc/disklabel is missing something.
>
> In other words, incomplete ugrade. See upgrade guide:
> http://www.openbsd.org/faq/upgrade51.html
>
> -Otto
>
Thanks for enlightening me :).
I wonder, why sysmerge is failing on me:
root@router
/tmp # sysmerge -s etc51.tgz -x xetc51.tgz
===> Populating temporary root under /var/tmp/sysmerge.iQVVtZVllw/temproot
===> Starting comparison
===> Comparison complete
===> Checking directory hierarchy permissions (running mtree(8))
===> Removing /var/tmp/sysmerge.iQVVtZVllw
root@router
/tmp # ls /etc/disktab
/etc/disktab
root@router
/tmp # cat /etc/disktab
# $OpenBSD: disktab,v 1.21 2010/10/19 20:23:53 deraadt Exp $
floppy288|3in|3.5in High Density Floppy, 2.88MB:\
:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#5760:ob#0:\
:pc#5760:oc#0:
floppy|floppy3|3in|3.5in High Density Floppy:\
:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#2880:ob#0:\
:pc#2880:oc#0:
floppy5|5in|5.25in High Density Floppy:\
:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#15:nc#80:\
:pa#2400:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#2400:ob#0:bb#4096:fb#512:\
:pc#2400:oc#0:bc#4096:fc#512:
rdroot|ramdiskroot|RAM-disk root FS image:\
:ty=ramdisk:se#512:nt#2:ns#128:nc#16:\
:pa#3872:oa#0:ta=4.2BSD:ba#4096:fa#512:\
:pb#0:ob#0:tb=swap:\
:pc#3872:oc#0:
root@router
/tmp # tar -xzf etc51.tgz ./etc/disktab
root@router
/tmp # cat etc/disktab
# $OpenBSD: disktab,v 1.11 2010/07/06 08:26:23 pirofti Exp $
floppy576|3in|3.5in High Density Floppy, 5.76MB:\
:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#160:\
:pa#11520:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#11520:ob#0:\
:pc#11520:oc#0:
floppy288|3in|3.5in High Density Floppy, 2.88MB:\
:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#5760:ob#0:\
:pc#5760:oc#0:
floppy|floppy3|3in|3.5in High Density Floppy:\
:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#2880:ob#0:\
:pc#2880:oc#0:
rdroot|ramdiskroot|RAM-disk root FS image:\
:ty=ramdisk:se#512:nt#2:ns#140:nc#16:\
:pa#4480:oa#0:ta=4.2BSD:ba#4480:fa#512:\
:pb#0:ob#0:tb=swap:\
:pc#4480:oc#0:
Shouldn't sysmerge at least ask what to do with the differing files? Am
i doing something?
marc
