Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 May 2003 17:30:05 -0600
From:      Scott Long <scott_long@btc.adaptec.com>
To:        freebsd-alpha@freebsd.org
Cc:        re-alpha@freebsd.org
Subject:   Re: My take at unbreaking releases for 5.1
Message-ID:  <3EC5747D.9030507@btc.adaptec.com>
In-Reply-To: <3EC490B4.6080506@btc.adaptec.com>
References:  <20030516071037.GB67956@sunbay.com> <3EC490B4.6080506@btc.adaptec.com>

next in thread | previous in thread | raw e-mail | index | archive | help
I'm moving this over to the alpha mailing list for comment.  In short,
the alpha release build is overflowing the install floppies.  Ruslan's
fix is to remove the cd and acd drivers with the theory that if the
user doesn't boot off of the CD during install, they probably won't
use the CD at all during the install.  Is this reasonable?  We would
like comments relatively quickly as having Alpha releasable for
5.1-BETA2 is highly desirable.  Another angle that will be tested this
weekend is to de-inline the mutex functions to slim down the kernel.
That should save a few 10's of kilobytes, though it's unclear if this
will allow the cd and acd drivers to be restored.

Thanks!

Scott

Scott Long wrote:
> Ruslan Ermilov wrote:
> 
>> Hi!
>>
>> Since David has passed me the responsibility for unbreaking
>> Alpha builds for the upcoming 5.1-RELEASE...
>>
>> Attached is the patch that addresses several issues with
>> 5.1 release building.
>>
>> 1.  Unbreaks Alpha snapshots.
>>
>> I had to nuke the cd(4) and atapicd(4) support from the
>> floppy installations, as there's nothing more left to axe.
>> I personally think we shouldn't remove the floppy support
>> just yet, but if so will be the consenses, this can be
>> done pretty fast.
>>
> 
> I guess the assumption is that if the user didn't boot the
> installation with a CD, it's unlikely that they will use a CD
> at all during installation?  Can someone with more experience
> here comment?
> 
>>
>>>>> make release for alpha started on Thu May 15 16:57:02 GMT 2003
>>>>> make rerelease for alpha finished on Fri May 16 06:37:28 GMT 2003
>>
>>
>>
>> Some useful numbers:
>>
>> drivers.flp: *** Filesystem is 1440 K, 137 left
>> mfsroot: *** Filesystem is 4320 K, 496 left
>> mfsroot.flp: *** Filesystem is 1440 K, 15 left
>> kern.flp: *** Filesystem is 1440 K, 13 left
>> boot.flp: *** Filesystem is 2880 K, 45 left
>> fixit.flp: *** Filesystem is 2880 K, 1269 left
>>
>> (This was the -DNODOC -DNOPORTS "make release", BTW.)
>>
>> 2.  disklabel^Wbsdlabel was missing from the fixit floppy.
>>
>> Some diffs are easier to see against some older revisions,
>> as this patch reverts part of the non-functional changes
>> made recently.  In particular,
>>
>> cvs di -u -r1.774 release/Makefile
>> cvs di -u -r1.66 release/alpha/dokern.sh
> 
> 
> Again, please do not drag re@ into this particular area.  Please use
> the appropriate channels, or better yet, just take a deep breath and
> let this one go for now.
> 
> Thank you for working on this.  Let's wait for some more review and
> feedback.
> 
> Scott
> 
>>
>>
>> Cheers,
>>
>>
>> ------------------------------------------------------------------------
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /home/ncvs/src/release/Makefile,v
>> retrieving revision 1.775
>> diff -u -r1.775 Makefile
>> --- Makefile    8 May 2003 03:25:17 -0000    1.775
>> +++ Makefile    16 May 2003 06:41:21 -0000
>> @@ -216,7 +216,11 @@
>>  MFSSIZE=        8192
>>  .endif
>>  
>> +.if exists(/sbin/bsdlabel)
>> +DISKLABEL?=        bsdlabel
>> +.else
>>  DISKLABEL?=        disklabel
>> +.endif
>>  
>>  ZIPNSPLIT=        gzip --no-name -9 -c | split -b 1423k -
>>  
>> @@ -756,117 +760,6 @@
>>  .endif
>>      touch release.9
>>  
>> -release.9.alpha:
>> -.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH}
>> -    cp ${RD}/trees/base/etc/disktab /etc
>> -    rm -rf ${RD}/mfsfd
>> -    mkdir ${RD}/mfsfd
>> -    cd ${RD}/mfsfd && \
>> -        mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help
>> -    @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
>> -        DIR=${RD}/mfsfd/stand ZIP=false
>> -    ( cd ${RD}/mfsfd && \
>> -      for dir in bin sbin ; do \
>> -        ln -sf /stand $$dir; \
>> -      done )
>> -    cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand
>> -.if ${TARGET} == "pc98"
>> -    cp ${.CURDIR}/../etc/defaults/pccard.conf 
>> ${RD}/mfsfd/etc/defaults/pccard.conf
>> -.endif
>> -    cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
>> -    ( for F in defaults/rc.conf netconfig protocols ; do \
>> -        sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
>> -        ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
>> -      done )
>> -    grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \
>> -        ${RD}/trees/base/etc/services | \
>> -        sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
>> -        > ${RD}/mfsfd/stand/etc/services
>> -    ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
>> -    ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
>> -    cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp
>> -.if !defined(NODOC)
>> -    @for i in ${DIST_DOCS_ARCH_INDEP}; do \
>> -      cp ${RND}/${RELNOTES_LANG}/$$i/article.txt 
>> ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
>> -    done
>> -    @for i in ${DIST_DOCS_ARCH_DEP}; do \
>> -      cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt 
>> ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
>> -    done
>> -    @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT 
>> ${RD}/mfsfd/stand/help/INSTALL.TXT
>> -    @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT 
>> ${RD}/mfsfd/stand/help/EARLY.TXT
>> -.endif
>> -    -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg 
>> ${RD}/mfsfd
>> -    @mkdir -p ${RD}/mfsfd/boot
>> -.if ${TARGET_ARCH} != "ia64"
>> -    @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot
>> -.endif
>> -.if ${TARGET} == "i386"
>> -    @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
>> -.endif
>> -    @echo "Making the regular boot floppy."
>> -    @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall 
>> help | \
>> -        tar xf - -C ${RD}/mfsfd/stand
>> -.if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES)
>> -    rm -rf ${RD}/mfsfd/stand/help/*
>> -.endif
>> -.if defined(SMALLBOOTSIZE)
>> -.if exists(${.CURDIR}/${TARGET}/drivers-small.conf)
>> -    @rm -rf ${RD}/mfsfd/modules
>> -    @mkdir -p ${RD}/mfsfd/modules
>> -    @awk -f  ${.CURDIR}/scripts/driver-copy2.awk 2 \
>> -        ${.CURDIR}/${TARGET}/drivers-small.conf \
>> -        ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
>> -.endif
>> -    sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
>> -        ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
>> -    @gzip -9vc mfsroot > mfsroot.gz
>> -    @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \
>> -        ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
>> -        ${BOOTINODE} ${SMALLBOOTLABEL}
>> -.endif
>> -.if exists(${.CURDIR}/${TARGET}/drivers.conf)
>> -    @rm -rf ${RD}/mfsfd/modules
>> -    @mkdir -p ${RD}/mfsfd/modules
>> -    @awk -f  ${.CURDIR}/scripts/driver-copy2.awk 2 \
>> -        ${.CURDIR}/${TARGET}/drivers.conf \
>> -        ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
>> -    @rm -rf ${RD}/driversfd
>> -    @mkdir ${RD}/driversfd
>> -    @awk -f  ${.CURDIR}/scripts/driver-copy2.awk 3 \
>> -        ${.CURDIR}/${TARGET}/drivers.conf \
>> -        ${RD}/trees/base/boot/kernel ${RD}/driversfd
>> -    -@rmdir ${RD}/driversfd
>> -    if [ -d ${RD}/driversfd ]; then \
>> -        sh -e ${DOFS_SH} \
>> -        ${RD}/floppies/drivers.flp ${RD} ${MNT} ${DRIVERSIZE} \
>> -        ${RD}/driversfd ${DRIVERINODE} ${DRIVERLABEL}; \
>> -        cd ${RD}/driversfd && awk -f  
>> ${.CURDIR}/scripts/driver-desc.awk \
>> -        *.dsc >> ${RD}/floppies/DRIVERS.TXT; \
>> -    fi
>> -.endif
>> -    sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
>> -        ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
>> -    @gzip -9vc mfsroot > mfsroot.gz
>> -    @mkdir -p ${RD}/mfsroot
>> -    @cp mfsroot.gz ${RD}/mfsroot
>> -.if !defined(NO_FLOPPIES)
>> -.if defined(BOOTSIZE)
>> -    @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \
>> -        ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
>> -    @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
>> -.endif
>> -.if defined(SMALLBOOTSIZE)
>> -    @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
>> -.endif
>> -.if defined(BIGBOOTSIZE)
>> -    @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG
>> -.endif
>> -.endif
>> -    @rm mfsroot mfsroot.gz
>> -    @echo "Regular and MFS boot floppies made."
>> -.endif
>> -    touch release.9.alpha
>> -
>>  #
>>  # --==## Create a fixit floppy ##==--
>>  #
>> @@ -1083,14 +976,8 @@
>>             md5 * > CHECKSUM.MD5) \
>>      )
>>  
>> -.if ${TARGET_ARCH} == "alpha"
>> -RELEASE9=release.9.${TARGET_ARCH}
>> -.else
>> -RELEASE9=release.9 -.endif
>> -
>>  doRELEASE:  release.1 release.2 release.3 ${DOCREL} release.4 
>> release.5 \
>> -        release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET}
>> +        release.6 release.7 release.8 release.9 ${FIXIT_TARGET}
>>      @cd ${.CURDIR} && ${MAKE} ${EXTRAS}
>>      @echo "Release done"
>>  
>> Index: alpha/dokern.sh
>> ===================================================================
>> RCS file: /home/ncvs/src/release/alpha/dokern.sh,v
>> retrieving revision 1.69
>> diff -u -r1.69 dokern.sh
>> --- alpha/dokern.sh    14 May 2003 16:01:02 -0000    1.69
>> +++ alpha/dokern.sh    16 May 2003 06:33:49 -0000
>> @@ -3,65 +3,63 @@
>>  # $FreeBSD: src/release/alpha/dokern.sh,v 1.69 2003/05/14 16:01:02 
>> obrien Exp $
>>  #
>>  
>> -#    XXX sort by order in GENERIC, not alphabetical
>> -
>>  sed    \
>> -    -e 's/ident.*GENERIC/ident        BOOTMFS/g'
>> +    -e '/DDB/d' \
>>      -e '/DEBUG/d' \
>>      -e '/DEC_KN8AE/d' \
>> -    -e '/SOFTUPDATES/d' \
>> -    -e '/UFS_ACL/d' \
>> -    -e '/UFS_DIRHASH/d' \
>> +    -e '/INVARIANTS/d' \
>> +    -e '/INVARIANT_SUPPORT/d' \
>> +    -e '/KTRACE/d' \
>> +    -e '/MSDOSFS/d' \
>>      -e '/NFSSERVER/d' \
>>      -e '/NFS_ROOT/d' \
>> -    -e '/MSDOSFS/d' \
>>      -e '/PROCFS/d' \
>>      -e '/PSEUDOFS/d' \
>> -    -e '/KTRACE/d' \
>> +    -e '/SMP/d' \
>> +    -e '/SOFTUPDATES/d' \
>>      -e '/SYSV/d' \
>> +    -e '/UFS_ACL/d' \
>> +    -e '/UFS_DIRHASH/d' \
>>      -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \
>> -    -e '/DDB/d' \
>> -    -e '/INVARIANTS/d' \
>> -    -e '/INVARIANT_SUPPORT/d' \
>> -    -e '/WITNESS/d' \
>> -    -e '/SMP/d' \
>> +    -e '/    atapicd    /d' \
>>      -e '/    atapifd    /d' \
>>      -e '/    atapist    /d' \
>> +    -e '/    aue    /d' \
>> +    -e '/    cd    /d' \
>>      -e '/    ch    /d' \
>> +    -e '/    cue    /d' \
>> +    -e '/    faith    /d' \
>> +    -e '/    firewire    /d' \
>> +    -e '/    fwe    /d' \
>> +    -e '/    gif    /d' \
>> +    -e '/    kue    /d' \
>> +    -e '/    lpt    /d' \
>> +    -e '/    ohci    /d' \
>>      -e '/    pass    /d' \
>> -    -e '/    sa    /d' \
>> -    -e '/    ses    /d' \
>> -    -e '/    splash    /d' \
>> -    -e '/    ppc$/d' \
>>      -e '/    ppbus    /d' \
>> -    -e '/    lpt    /d' \
>> +    -e '/    ppc$/d' \
>>      -e '/    ppi    /d' \
>> +    -e '/    ppp    /d' \
>> +    -e '/    pty    /d' \
>> +    -e '/    random    /d' \
>> +    -e '/    sa    /d' \
>> +    -e '/    sbp    /d' \
>> +    -e '/    ses    /d' \
>>      -e '/    sf    /d' \
>>      -e '/    sis    /d' \
>> -    -e '/    ste    /d' \
>> -    -e '/    wb    /d' \
>> -    -e '/    random    /d' \
>>      -e '/    sl    /d' \
>> -    -e '/    ppp    /d' \
>> -    -e '/    pty    /d' \
>> -    -e '/    gif    /d' \
>> -    -e '/    faith    /d' \
>> -    -e '/    uhci    /d' \
>> -    -e '/    ohci    /d' \
>> -    -e '/    usb    /d' \
>> +    -e '/    splash    /d' \
>> +    -e '/    ste    /d' \
>>      -e '/    ugen    /d' \
>> +    -e '/    uhci    /d' \
>>      -e '/    uhid    /d' \
>>      -e '/    ukbd    /d' \
>>      -e '/    ulpt    /d' \
>>      -e '/    umass    /d' \
>>      -e '/    ums    /d' \
>> -    -e '/    aue    /d' \
>> -    -e '/    axe    /d' \
>> -    -e '/    cue    /d' \
>> -    -e '/    kue    /d' \
>> -    -e '/    firewire    /d' \
>> -    -e '/    sbp    /d' \
>> -    -e '/    fwe    /d' \
>> +    -e '/    usb    /d' \
>> +    -e '/    wb    /d' \
>> +    -e 's/ident.*GENERIC/ident        BOOTMFS/g'
>>  
>>  echo "options  SCSI_NO_OP_STRINGS"  echo "options  
>> SCSI_NO_SENSE_STRINGS"
>> Index: alpha/drivers.conf
>> ===================================================================
>> RCS file: /home/ncvs/src/release/alpha/drivers.conf,v
>> retrieving revision 1.17
>> diff -u -r1.17 drivers.conf
>> --- alpha/drivers.conf    14 May 2003 15:38:44 -0000    1.17
>> +++ alpha/drivers.conf    15 May 2003 08:21:58 -0000
>> @@ -43,7 +43,6 @@
>>  miibus    miibus        2    network    "MII bus support"
>>  pcn    if_pcn        2    network    "AMD Am79C97x PCI 10/100"
>>  rl    if_rl        2    network    "RealTek 8129/8139"
>> -tl    if_tl        3    network    "Texas Instruments ThunderLAN"
>>  txp    if_txp        2    network    "3Com 3XP Typhoon/Sidewinder 
>> (3CR990)"
>>  vr    if_vr        2    network    "VIA Rhine, Rhine II"
>>  vx    if_vx        2    network    "3Com 3c590 and 3c595 EtherLink III"
>> @@ -60,6 +59,7 @@
>>  axe    if_axe        3    network "ASIX AX88172 USB 2.0 Ethernet"
>>  if_gif    if_gif        3    network    "IPv6 and IPv4 tunneling"
>>  if_tun    if_tun        3    network    "Packet tunnel"
>> +tl    if_tl        3    network    "Texas Instruments ThunderLAN"
>>  
>>  CD9660    cd9660        3    options    "ISO 9660 Filesystem"
>>  NFSCLIENT nfsclient    3    options    "Network Filesystem Client"
>> Index: alpha/fixit_crunch.conf
>> ===================================================================
>> RCS file: /home/ncvs/src/release/alpha/fixit_crunch.conf,v
>> retrieving revision 1.34
>> diff -u -r1.34 fixit_crunch.conf
>> --- alpha/fixit_crunch.conf    21 Apr 2003 19:14:32 -0000    1.34
>> +++ alpha/fixit_crunch.conf    16 May 2003 05:56:28 -0000
>> @@ -7,9 +7,10 @@
>>  progs ln ls mkdir mv rm rmdir
>>  
>>  srcdirs /usr/src/sbin
>> -progs clri disklabel dmesg mknod
>> +progs bsdlabel clri dmesg mknod
>>  progs mount mount_cd9660
>>  progs reboot restore swapon umount
>> +ln bsdlabel disklabel
>>  ln restore rrestore
>>  
>>  srcdirs /usr/src/usr.bin
>> @@ -19,4 +20,4 @@
>>  progs chown chroot
>>  ln chown chgrp
>>  
>> -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
>> +libs -ledit -lgeom -lkvm -lm -lncurses -lutil
>> Index: i386/fixit_crunch.conf
>> ===================================================================
>> RCS file: /home/ncvs/src/release/i386/fixit_crunch.conf,v
>> retrieving revision 1.9
>> diff -u -r1.9 fixit_crunch.conf
>> --- i386/fixit_crunch.conf    21 Apr 2003 19:14:32 -0000    1.9
>> +++ i386/fixit_crunch.conf    16 May 2003 05:54:47 -0000
>> @@ -7,9 +7,10 @@
>>  progs ln ls mkdir mv rm rmdir sleep sync
>>  
>>  srcdirs /usr/src/sbin
>> -progs clri disklabel dmesg fdisk mknod
>> +progs bsdlabel clri dmesg fdisk mknod
>>  progs mount mount_cd9660 mount_msdosfs
>>  progs reboot restore swapon umount
>> +ln bsdlabel disklabel
>>  ln restore rrestore
>>  
>>  srcdirs /usr/src/usr.bin
>> @@ -21,4 +22,4 @@
>>  progs chown chroot
>>  ln chown chgrp
>>  
>> -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
>> +libs -ledit -lgeom -lkvm -lm -lncurses -lutil
>> Index: ia64/doFS.sh
>> ===================================================================
>> RCS file: /home/ncvs/src/release/ia64/doFS.sh,v
>> retrieving revision 1.7
>> diff -u -r1.7 doFS.sh
>> --- ia64/doFS.sh    23 Apr 2003 09:01:35 -0000    1.7
>> +++ ia64/doFS.sh    3 May 2003 19:42:02 -0000
>> @@ -20,7 +20,7 @@
>>  if [ x$FSLABEL != "xefi" ]; then
>>      DOFS_SH=`dirname $0`/../scripts/`basename $0`
>>      echo "Transferring control to $DOFS_SH..."
>> -    exec sh $DOFS_SH disklabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO 
>> $FSINODE $FSLABEL
>> +    exec sh $DOFS_SH bsdlabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO 
>> $FSINODE $FSLABEL
>>  fi
>>  
>>  export BLOCKSIZE=512
>> Index: pc98/fixit-small_crunch.conf
>> ===================================================================
>> RCS file: /home/ncvs/src/release/pc98/fixit-small_crunch.conf,v
>> retrieving revision 1.2
>> diff -u -r1.2 fixit-small_crunch.conf
>> --- pc98/fixit-small_crunch.conf    21 Apr 2003 19:14:32 -0000    1.2
>> +++ pc98/fixit-small_crunch.conf    16 May 2003 05:59:07 -0000
>> @@ -7,9 +7,10 @@
>>  progs ln ls mkdir mv rm rmdir sleep sync
>>  
>>  srcdirs /usr/src/sbin
>> -progs clri disklabel dmesg fdisk mknod
>> +progs bsdlabel clri dmesg fdisk mknod
>>  progs mount mount_cd9660 mount_msdosfs
>>  progs reboot restore swapon umount
>> +ln bsdlabel disklabel
>>  ln restore rrestore
>>  
>>  special fdisk srcdir /usr/src/sbin/fdisk_pc98
>> @@ -22,4 +23,4 @@
>>  progs chown chroot
>>  ln chown chgrp
>>  
>> -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
>> +libs -ledit -lgeom -lkvm -lm -lncurses -lutil
>> Index: pc98/fixit_crunch.conf
>> ===================================================================
>> RCS file: /home/ncvs/src/release/pc98/fixit_crunch.conf,v
>> retrieving revision 1.9
>> diff -u -r1.9 fixit_crunch.conf
>> --- pc98/fixit_crunch.conf    21 Apr 2003 19:14:32 -0000    1.9
>> +++ pc98/fixit_crunch.conf    16 May 2003 05:59:02 -0000
>> @@ -7,9 +7,10 @@
>>  progs ln ls mkdir mv rm rmdir sleep sync
>>  
>>  srcdirs /usr/src/sbin
>> -progs clri disklabel dmesg fdisk mknod
>> +progs bsdlabel clri dmesg fdisk mknod
>>  progs mount mount_cd9660 mount_msdosfs
>>  progs reboot restore swapon umount
>> +ln bsdlabel disklabel
>>  ln restore rrestore
>>  
>>  special fdisk srcdir /usr/src/sbin/fdisk_pc98
>> @@ -23,4 +24,4 @@
>>  progs chown chroot
>>  ln chown chgrp
>>  
>> -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm
>> +libs -ledit -lgeom -lkvm -lm -lncurses -lutil
>> Index: scripts/doFS.sh
>> ===================================================================
>> RCS file: /home/ncvs/src/release/scripts/doFS.sh,v
>> retrieving revision 1.50
>> diff -u -r1.50 doFS.sh
>> --- scripts/doFS.sh    9 May 2003 09:41:18 -0000    1.50
>> +++ scripts/doFS.sh    14 May 2003 18:06:55 -0000
>> @@ -20,7 +20,7 @@
>>  #
>>  # We don't have any bootblocks on ia64. Note that -B implies -r,
>>  # so we have to specifically specify -r when we don't have -B.
>> -# disklabel fails otherwise.
>> +# bsdlabel fails otherwise.
>>  #
>>  if [ -f "${RD}/trees/base/boot/boot" ]; then
>>      BOOT="-B -b ${RD}/trees/base/boot/boot"
>> Index: sparc64/mkisoimages.sh
>> ===================================================================
>> RCS file: /home/ncvs/src/release/sparc64/mkisoimages.sh,v
>> retrieving revision 1.1
>> diff -u -r1.1 mkisoimages.sh
>> --- sparc64/mkisoimages.sh    13 Oct 2002 18:36:06 -0000    1.1
>> +++ sparc64/mkisoimages.sh    3 May 2003 19:44:08 -0000
>> @@ -30,7 +30,7 @@
>>  if [ "x$1" = "x-b" ]; then
>>      dd if=/dev/zero of=${IMG} bs=512 count=1024
>>      MD=`mdconfig -a -t vnode -f ${IMG}`
>> -    disklabel -Brw ${MD} auto
>> +    sunlabel -Brw ${MD} auto
>>      newfs /dev/${MD}c
>>      mount /dev/${MD}c ${MNT}
>>      mkdir ${MNT}/boot
> 
> 




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3EC5747D.9030507>