The following patch is for -CURRENT. It at least gets past that dumb
floppy loop. The problem I'm having is that after the scripts, nothing
else is done, it just sits there with "Welcome to PicoBSD". Any ideas?
To Luigi: I made the changes you asked for, disregard that patchfile as
I've incorporated those changes in here.
-- snip --
--- /usr/src/release/picobsd/build/Makefile.crunch Tue Feb 8 03:27:55 2000
+++ /usr/src/release/picobsd/build/Makefile.crunch Thu Mar 30 14:28:20 2000
@@ -4,3 +4,3 @@
SRC?=/usr/src
-CRUNCHFLAGS+= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT
+CRUNCHFLAGS+= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
@@ -31,12 +31,12 @@
install:
- cp crunch1 /mnt/stand/crunch
- chmod 555 /mnt/stand/crunch
+ cp crunch1 ${MFS_MOUNTPOINT}/stand/crunch
+ chmod 555 ${MFS_MOUNTPOINT}/stand/crunch
for i in `crunchgen -l crunch1.conf` ; \
do \
- ln /mnt/stand/crunch /mnt/stand/$${i}; \
+ ln ${MFS_MOUNTPOINT}/stand/crunch ${MFS_MOUNTPOINT}/stand/$${i}; \
done
- rm /mnt/stand/crunch
+ rm ${MFS_MOUNTPOINT}/stand/crunch
# Install the MIB files
- #mkdir -p /mnt/usr/local/share/snmp/mibs
- #cp ../../net/crunch1/mibs/*.txt /mnt/usr/local/share/snmp/mibs/
+ #mkdir -p ${MFS_MOUNTPOINT}/usr/local/share/snmp/mibs
+ #cp ../../net/crunch1/mibs/*.txt ${MFS_MOUNTPOINT}/usr/local/share/snmp/mibs/
--- /usr/src/release/picobsd/build/build Tue Feb 8 03:24:59 2000
+++ /usr/src/release/picobsd/build/build Thu Mar 30 14:33:40 2000
@@ -75,3 +75,3 @@
-# Main build procedure. It calls another scripts (stage1)
+# Main build procedure. It calls another script (stage1)
main() {
@@ -103,4 +103,5 @@
echo -n "-> Cleaning temporary files... "
- umount -f /mnt
- vnconfig -u /dev/rvn0
+ umount -f ${MFS_MOUNTPOINT}
+ rm -rf ${MFS_MOUNTPOINT}
+ vnconfig -u /dev/rvn${VNUM}
./clean ${TYPE}
--- /usr/src/release/picobsd/build/crunch.inc Tue Feb 8 03:29:18 2000
+++ /usr/src/release/picobsd/build/crunch.inc Thu Mar 30 12:04:03 2000
@@ -6 +6,2 @@
NONETGRAPH=yes
+NOIPSEC=yes
--- /usr/src/release/picobsd/build/mfs.mtree Tue Feb 8 06:39:28 2000
+++ /usr/src/release/picobsd/build/mfs.mtree Thu Mar 30 12:04:04 2000
@@ -49,2 +49,8 @@
..
+ locale
+ ..
+ syscons
+ ..
+ nls
+ ..
..
--- /usr/src/release/picobsd/build/stage1 Tue Feb 8 03:25:00 2000
+++ /usr/src/release/picobsd/build/stage1 Thu Mar 30 14:03:27 2000
@@ -10,4 +10,8 @@
+# By default, /tmp should exist.
+#
MFS_NAME=fs.PICOBSD
-MFS_MOUNTPOINT=/mnt
+MFS_MOUNTPOINT=`mktemp -d "/tmp/picobsd.XXXXXXXXXX"`
+export MFS_MOUNTPOINT
+
# fail errno errcode
@@ -21,3 +25,3 @@
no_vnconfig)
- echo "Error while doing vnconfig of ${MFS_NAME} on /dev/rvn0..."
+ echo "Error while doing vnconfig of ${MFS_NAME} on /dev/rvn${VNUM}..."
echo " Most probably your running kernel doesn't have the vn(4) device."
@@ -28,3 +32,3 @@
no_mount)
- echo "Error while mounting ${MFS_NAME} (/dev/vn0c) on ${MFS_MOUNTPOINT}"
+ echo "Error while mounting ${MFS_NAME} (/dev/vn${VNUM}c) on ${MFS_MOUNTPOINT}"
;;
@@ -40,3 +44,3 @@
vnconfig2)
- echo "Error while doing vnconfig of floppy.img on /dev/rvn0..."
+ echo "Error while doing vnconfig of floppy.img on /dev/rvn${VNUM}..."
;;
@@ -56,2 +60,4 @@
echo "-> Aborting $0"
+ umount ${MFS_MOUNTPOINT} 2> /dev/null || true
+ rm -rf ${MFS_MOUNTPOINT} 2> /dev/null || true
exit 10
@@ -63,5 +69,9 @@
echo "-> Preparing MFS filesystem..."
- umount /dev/vn0 2> /dev/null || true
+ VNUM=`mount | awk "/vn/ { num++ } END { printf \"%d\", num }"`
+ export VNUM
+ echo "-> Using vn${VNUM}..."
+
+ umount /dev/vn${VNUM} 2> /dev/null || true
umount ${MFS_MOUNTPOINT} 2> /dev/null || true
- vnconfig -u /dev/rvn0 2> /dev/null || true
+ vnconfig -u /dev/rvn${VNUM} 2> /dev/null || true
@@ -72,3 +82,3 @@
- vnconfig -s labels -c /dev/rvn0 ${MFS_NAME} 2>/dev/null || \
+ vnconfig -s labels -c /dev/rvn${VNUM} ${MFS_NAME} 2>/dev/null || \
fail $? no_vnconfig
@@ -80,9 +90,9 @@
if [ ${MFS_SIZE} -lt 1024 ] ; then
- disklabel -rw /dev/rvn0 fd${MFS_SIZE} || fail $? disklabel
+ disklabel -rw /dev/rvn${VNUM} fd${MFS_SIZE} || fail $? disklabel
else
- disklabel -rw vn0 auto || fail $? disklabel
+ disklabel -rw vn${VNUM} auto || fail $? disklabel
fi
- newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn0c
- mount /dev/vn0c ${MFS_MOUNTPOINT} || fail $? no_mount
+ newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn${VNUM}c
+ mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT} || fail $? no_mount
@@ -148,4 +158,4 @@
umount ${MFS_MOUNTPOINT}
- fsck -p /dev/rvn0c
- vnconfig -u /dev/rvn0
+ fsck -p /dev/rvn${VNUM}c
+ vnconfig -u /dev/rvn${VNUM}
}
@@ -174,3 +184,3 @@
- vnconfig -c /dev/rvn0 picobsd.bin || fail $? vnconfig2
+ vnconfig -c /dev/rvn${VNUM} picobsd.bin || fail $? vnconfig2
@@ -179,8 +189,8 @@
# XXX todo: use a type matching floppy size.
- disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn0 fd1440 || \
+ disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn${VNUM} fd1440 || \
fail $? disklabel
- newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/rvn0c
+ newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/rvn${VNUM}c
- mount /dev/vn0c ${MFS_MOUNTPOINT}
+ mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT}
@@ -217,3 +227,3 @@
files="motd"
- echo "-> Copying language dependent files: ${files} -> /mnt/etc ..."
+ echo "-> Copying language dependent files: ${files} -> ${MFS_MOUNTPOINT}/etc ..."
for i in ${files} ; do
@@ -265,3 +275,3 @@
umount ${MFS_MOUNTPOINT}
- vnconfig -u /dev/rvn0
+ vnconfig -u /dev/rvn${VNUM}
# rm kernel.gz ${MFS_NAME}
--- /usr/src/release/picobsd/dial/Makefile.mfs Fri Aug 27 21:33:14 1999
+++ /usr/src/release/picobsd/dial/Makefile.mfs Thu Mar 30 12:12:19 2000
@@ -4,3 +4,5 @@
+.ifndef (DESTDIR)
DESTDIR?=/mnt
+.endif
@@ -15,3 +17,3 @@
.if ${LANGUAGE} == pl
-LOCALE= pl_PL.ISO_8859-2
+LOCALE=pl_PL.ISO_8859-2
LOCALE_LINKS=${PL_LOCALE_LINKS}
@@ -20,3 +22,3 @@
.else
-LOCALE= en_US.ISO_8859-1
+LOCALE=en_US.ISO_8859-1
LOCALE_LINKS=${US_LOCALE_LINKS}
@@ -27,3 +29,3 @@
tree:
- mtree -deU -f mfs.mtree -p ${DESTDIR}
+ mtree -deU -f ../build/mfs.mtree -p ${DESTDIR}
@@ -44,3 +46,3 @@
ln -s /etc/termcap termcap; \
- echo emacs >/mnt/usr/share/misc/init.ee; \
+ echo emacs >${DESTDIR}/usr/share/misc/init.ee; \
cd ../; \
@@ -51,2 +53,3 @@
done; \
+ mkdir ${LOCALE}/; \
cp /usr/share/locale/${LOCALE}/* ${LOCALE}/; \
--- /usr/src/release/picobsd/dial/PICOBSD Wed Mar 15 21:45:38 2000
+++ /usr/src/release/picobsd/dial/PICOBSD Thu Mar 30 13:43:06 2000
@@ -31,2 +31,4 @@
options NO_SWAPPING
+options COMPAT_OLDISA #Use ISA shims and glue for old drivers
+options COMPAT_OLDPCI #Use PCI shims and glue for old drivers
--- /usr/src/release/picobsd/dial/crunch1/crunch.conf Tue Feb 8 03:37:50 2000
+++ /usr/src/release/picobsd/dial/crunch1/crunch.conf Thu Mar 30 20:49:05 2000
@@ -4,6 +4,2 @@
# correct value set in 'build' script - you should change it there
-#
-# NOTE2: use of init(8) is now optional (selectable in "build" script).
-# See Makefile for details on how it's added here - you shouldn't add it
-# manually here...
@@ -21,3 +17,3 @@
-progs ppp ftp telnet ee gzip more
+progs ppp ftp telnet ee gzip more init
#progs ssh
--- /usr/src/release/picobsd/dial/floppy.tree/etc/mfs.rc Fri Aug 27 21:33:17
1999
+++ /usr/src/release/picobsd/dial/floppy.tree/etc/mfs.rc Fri Mar 31 06:49:59
+2000
@@ -30,3 +30,8 @@
echo ""
+rm -f rc
+gzip -d fstab.gz
+gzip -d rc.gz
. rc
+echo ""
+date
exit 0
--- /usr/src/release/picobsd/dial/floppy.tree/etc/rc Fri Aug 27 21:33:17 1999
+++ /usr/src/release/picobsd/dial/floppy.tree/etc/rc Fri Mar 31 06:54:00 2000
@@ -6,10 +6,16 @@
############################################
+gzip -9 rc
mount -a -t nonfs
-if [ -f /etc/rc.conf ]; then
+
+if [ -f /etc/rc.conf.gz ]; then
+ gzip -d /etc/rc.conf.gz
. /etc/rc.conf
+ gzip -9 /etc/rc.conf
fi
# start up the initial network configuration.
-if [ -f /etc/rc.network ]; then
- . /etc/rc.network
- network_pass1
+if [ -f /etc/rc.network.gz ]; then
+ gzip -d /etc/rc.network.gz
+ . /etc/rc.network
+ gzip -9 /etc/rc.network
+ network_pass1
fi
--- /usr/src/release/picobsd/dial/floppy.tree/etc/rc.conf Fri Aug 27 21:33:18
1999
+++ /usr/src/release/picobsd/dial/floppy.tree/etc/rc.conf Fri Mar 31 06:46:33
+2000
@@ -29,4 +29,6 @@
### Allow local configuration override at the very end here ##
-if [ -f /etc/rc.conf.local ]; then
+if [ -f /etc/rc.conf.local.gz ]; then
+ gzip -d /etc/rc.conf.local.gz
. /etc/rc.conf.local
+ gzip -9 /etc/rc.conf.local
fi
--- /usr/src/release/picobsd/dial/floppy.tree/etc/ttys Thu Aug 27 13:38:42 1998
+++ /usr/src/release/picobsd/dial/floppy.tree/etc/ttys Fri Mar 31 06:45:18 2000
@@ -10,22 +10 @@
ttyv0 "/usr/libexec/getty Pc" cons25 on secure
-# Virtual terminals
-ttyv1 "/usr/libexec/getty Pc" cons25 on secure
-ttyv2 "/usr/libexec/getty Pc" cons25 on secure
-ttyv3 "/usr/libexec/getty Pc" cons25 on secure
-ttyv4 "/usr/libexec/getty Pc" cons25 on secure
-ttyv5 "/usr/libexec/getty Pc" cons25 on secure
-ttyv6 "/usr/libexec/getty Pc" cons25 on secure
-ttyv7 "/usr/libexec/getty Pc" cons25 on secure
-ttyv8 "/usr/libexec/getty Pc" cons25 on secure
-ttyv9 "/usr/libexec/getty Pc" cons25 on secure
-# Pseudo terminals
-ttyp0 none network secure
-ttyp1 none network secure
-ttyp2 none network secure
-ttyp3 none network
-ttyp4 none network
-ttyp5 none network
-ttyp6 none network
-ttyp7 none network
-ttyp8 none network
-ttyp9 none network
--- /usr/src/release/picobsd/floppy.tree/etc/fstab Tue Feb 8 09:20:49 2000
+++ /usr/src/release/picobsd/floppy.tree/etc/fstab Thu Mar 30 20:48:48 2000
@@ -1,2 +1 @@
-proc /proc procfs rw 0 0
/dev/fd0c /fd ufs rw,noauto 0 0
-- snip --
--
+-------------------------------------------------------------------------+
| Omachonu Ogali [EMAIL PROTECTED] |
| Intranova Networking Group http://tribune.intranova.net |
| PGP Key ID: 0xBFE60839 |
| PGP Fingerprint: C8 51 14 FD 2A 87 53 D1 E3 AA 12 12 01 93 BD 34 |
+-------------------------------------------------------------------------+
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
