From owner-freebsd-current Tue Aug 20 15:15:38 2002 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AB4037B400 for ; Tue, 20 Aug 2002 15:15:30 -0700 (PDT) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60E1843E84 for ; Tue, 20 Aug 2002 15:15:29 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 1974 invoked from network); 20 Aug 2002 20:10:00 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 20 Aug 2002 20:10:00 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g7KK9wBQ015169; Tue, 20 Aug 2002 16:09:59 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200208081632.g78GWeq61331@zibbi.icomtek.csir.co.za> Date: Tue, 20 Aug 2002 16:10:04 -0400 (EDT) From: John Baldwin To: John Hay Subject: RE: 3 floppy system for -current releases Cc: ru@freebsd.org, current@freebsd.org Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 08-Aug-2002 John Hay wrote: > Here is a try at a 3 floppy system. Most people should be able to > install with the first 2 floppies (kern.flp and mfsroot.flp). Just > those that need a driver on the third floppy (drivers.flp) will > need it. > > If this idea is acceptable, we should probably tweak what should > go on the second floppy and what is used the least and put that > on the last one. > > To load drivers from the drivers floppy, go to "Configure" and then > the last option there is "Load KLD". > > The last 2 files in the diff (bld-ko.sh and driver-list.awk) are not > really needed. That is part of my attempt to create a single .ko to > save space on mfsroot.flp. But I can't get internal dependancies to > work yet. Most drivers depend on miibus and that don't get loaded > first. > > John > -- > John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org > > > Index: usr.sbin/sysinstall/system.c > =================================================================== > RCS file: /home/ncvs/src/usr.sbin/sysinstall/system.c,v > retrieving revision 1.119 > diff -u -r1.119 system.c > --- usr.sbin/sysinstall/system.c 1 Nov 2001 23:32:46 -0000 1.119 > +++ usr.sbin/sysinstall/system.c 8 Aug 2002 09:17:01 -0000 > @@ -348,7 +348,13 @@ > snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp.gz", file); > if (file_readable(buf)) > return expand(buf); > + snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp", file); > + if (file_readable(buf)) > + return expand(buf); > snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT.gz", file); > + if (file_readable(buf)) > + return expand(buf); > + snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT", file); > if (file_readable(buf)) > return expand(buf); > snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sysinstall/help/%s.hlp", file); What does this patch do? It calls expand() so it is expecting an uncompressed file which is probably wrong. > Index: release/Makefile > =================================================================== > RCS file: /home/ncvs/src/release/Makefile,v > retrieving revision 1.698 > diff -u -r1.698 Makefile > --- release/Makefile 5 Aug 2002 16:57:43 -0000 1.698 > +++ release/Makefile 8 Aug 2002 15:40:27 -0000 > @@ -518,7 +518,8 @@ > .endif > cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean > cd ${.CURDIR}/..; ${TMAKE} build-tools > - cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk all > + cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk \ > + CFLAGS="-Os -pipe" -DNO_CPU_CFLAGS all > mv ${j}_crunch/${j}_crunch ${RD}/crunch/${j} > .endfor > touch release.5 > @@ -654,15 +655,15 @@ > > ${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 > - gzip -9c ${RD}/trees/base/COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz > + cat ${RD}/trees/base/COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp > .if !defined(NODOC) > @for i in ${DIST_DOCS_ARCH_INDEP}; do \ > - gzip -9c ${RND}/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr > 'a-z' 'A-Z'`.TXT.gz; \ > + cat ${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 \ > - gzip -9c ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt > ${RD}/mfsfd/stand/help/`echo > $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \ > + cat ${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.gz ${RD}/mfsfd/stand/help/INSTALL.TXT.gz > + @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT > .endif > -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd > @mkdir -p ${RD}/mfsfd/boot > @@ -674,16 +675,28 @@ > @echo "Making the regular boot floppy." > @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ > tar xf - -C ${RD}/mfsfd/stand > - @echo "Compressing doc files..." > - @gzip -9 ${RD}/mfsfd/stand/help/*.hlp Why in the world are you not compressing the various text files? I thought the name of the game was to _decrease_ the size of things on the floppies. The rest of this looks fine although I think perhaps it should be split up into a few separate commits (SINGLE_MODULE should be its own commit, driver.flp should be its own commit, etc.) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message