View | Details | Raw Unified | Return to bug 17737 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/src/release/picobsd/build/stage1 (-19 / +30 lines)
Lines 10-13 Link Here
10
10
11
# By default, /tmp should exist.
12
#
11
MFS_NAME=fs.PICOBSD
13
MFS_NAME=fs.PICOBSD
12
MFS_MOUNTPOINT=/mnt
14
MFS_MOUNTPOINT=`mktemp -d "/tmp/picobsd.XXXXXXXXXX"`
15
export MFS_MOUNTPOINT
16
13
# fail errno errcode
17
# fail errno errcode
Lines 21-23 Link Here
21
    no_vnconfig)
25
    no_vnconfig)
22
	echo "Error while doing vnconfig of ${MFS_NAME} on /dev/rvn0..."
26
	echo "Error while doing vnconfig of ${MFS_NAME} on /dev/rvn${VNUM}..."
23
	echo "   Most probably your running kernel doesn't have the vn(4) device."
27
	echo "   Most probably your running kernel doesn't have the vn(4) device."
Lines 28-30 Link Here
28
    no_mount)
32
    no_mount)
29
	echo "Error while mounting ${MFS_NAME} (/dev/vn0c) on ${MFS_MOUNTPOINT}"
33
	echo "Error while mounting ${MFS_NAME} (/dev/vn${VNUM}c) on ${MFS_MOUNTPOINT}"
30
	;;
34
	;;
Lines 40-42 Link Here
40
    vnconfig2)
44
    vnconfig2)
41
	echo "Error while doing vnconfig of floppy.img on /dev/rvn0..."
45
	echo "Error while doing vnconfig of floppy.img on /dev/rvn${VNUM}..."
42
	;;
46
	;;
Lines 56-57 Link Here
56
    echo "-> Aborting $0"
60
    echo "-> Aborting $0"
61
    umount ${MFS_MOUNTPOINT} 2> /dev/null || true
62
    rm -rf ${MFS_MOUNTPOINT} 2> /dev/null || true
57
    exit 10
63
    exit 10
Lines 63-67 Link Here
63
    echo "-> Preparing MFS filesystem..."
69
    echo "-> Preparing MFS filesystem..."
64
    umount /dev/vn0 2> /dev/null || true
70
    VNUM=`mount | awk "/vn/ { num++ } END { printf \"%d\", num }"`
71
    export VNUM
72
    echo "-> Using vn${VNUM}..."
73
74
    umount /dev/vn${VNUM} 2> /dev/null || true
65
    umount ${MFS_MOUNTPOINT} 2> /dev/null || true
75
    umount ${MFS_MOUNTPOINT} 2> /dev/null || true
66
    vnconfig -u /dev/rvn0 2> /dev/null || true
76
    vnconfig -u /dev/rvn${VNUM} 2> /dev/null || true
67
77
Lines 72-74 Link Here
72
82
73
    vnconfig -s labels -c /dev/rvn0 ${MFS_NAME} 2>/dev/null || \
83
    vnconfig -s labels -c /dev/rvn${VNUM} ${MFS_NAME} 2>/dev/null || \
74
	    fail $? no_vnconfig
84
	    fail $? no_vnconfig
Lines 80-88 Link Here
80
    if [ ${MFS_SIZE} -lt 1024 ] ; then
90
    if [ ${MFS_SIZE} -lt 1024 ] ; then
81
	disklabel -rw /dev/rvn0 fd${MFS_SIZE} || fail $? disklabel
91
	disklabel -rw /dev/rvn${VNUM} fd${MFS_SIZE} || fail $? disklabel
82
    else
92
    else
83
	disklabel -rw vn0 auto || fail $? disklabel
93
	disklabel -rw vn${VNUM} auto || fail $? disklabel
84
    fi
94
    fi
85
95
86
    newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn0c
96
    newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn${VNUM}c
87
    mount /dev/vn0c ${MFS_MOUNTPOINT} || fail $? no_mount
97
    mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT} || fail $? no_mount
88
98
Lines 148-151 Link Here
148
    umount ${MFS_MOUNTPOINT}
158
    umount ${MFS_MOUNTPOINT}
149
    fsck -p /dev/rvn0c
159
    fsck -p /dev/rvn${VNUM}c
150
    vnconfig -u /dev/rvn0
160
    vnconfig -u /dev/rvn${VNUM}
151
}
161
}
Lines 174-176 Link Here
174
184
175
    vnconfig -c /dev/rvn0 picobsd.bin || fail $? vnconfig2
185
    vnconfig -c /dev/rvn${VNUM} picobsd.bin || fail $? vnconfig2
176
186
Lines 179-186 Link Here
179
    # XXX todo: use a type matching floppy size.
189
    # XXX todo: use a type matching floppy size.
180
    disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn0 fd1440 || \
190
    disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn${VNUM} fd1440 || \
181
	fail $?  disklabel
191
	fail $?  disklabel
182
192
183
    newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/rvn0c
193
    newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/rvn${VNUM}c
184
194
185
    mount /dev/vn0c ${MFS_MOUNTPOINT}
195
    mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT}
186
196
Lines 217-219 Link Here
217
    files="motd"
227
    files="motd"
218
    echo "-> Copying language dependent files: ${files} -> /mnt/etc ..."
228
    echo "-> Copying language dependent files: ${files} -> ${MFS_MOUNTPOINT}/etc ..."
219
    for i in ${files} ; do
229
    for i in ${files} ; do
Lines 265-267 Link Here
265
    umount ${MFS_MOUNTPOINT}
275
    umount ${MFS_MOUNTPOINT}
266
    vnconfig -u /dev/rvn0
276
    rm -rf ${MFS_MOUNTPOINT}
277
    vnconfig -u /dev/rvn${VNUM}
267
    # rm kernel.gz ${MFS_NAME}
278
    # rm kernel.gz ${MFS_NAME}

Return to bug 17737