diff options
| author | ru <ru@FreeBSD.org> | 2003-09-19 09:08:41 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-09-19 09:08:41 +0000 |
| commit | 102cca2e2cd6f10e03f6f5fead0db4add258fe28 (patch) | |
| tree | 29d63266fcab9a12ff8dce29e6068be8480e6cd5 /release | |
| parent | 7a29b63c00fbfd3c532eecb26944ae866fc49a8d (diff) | |
| download | FreeBSD-src-102cca2e2cd6f10e03f6f5fead0db4add258fe28.zip FreeBSD-src-102cca2e2cd6f10e03f6f5fead0db4add258fe28.tar.gz | |
Fix this script to produce working bootable floppies on 4.x.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/doFS.sh | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh index d3e6332..4df8379 100644 --- a/release/scripts/doFS.sh +++ b/release/scripts/doFS.sh @@ -29,22 +29,6 @@ if [ ${FSSIZE} -eq 0 -a ${FSLABEL} = "auto" ]; then FSSIZE=$(roundup $(($sk*12/10)) 1024) fi -# -# 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. -# bsdlabel fails otherwise. -# -if [ -f "${RD}/trees/base/boot/boot" ]; then - BOOT="-B -b ${RD}/trees/base/boot/boot" -elif [ -f "${RD}/trees/base/boot/boot1" ]; then - BOOT="-B -b ${RD}/trees/base/boot/boot1" - if [ -f "${RD}/trees/base/boot/boot2" ]; then - BOOT="${BOOT} -s ${RD}/trees/base/boot/boot2" - fi -else - BOOT="-r" -fi - deadlock=20 dofs_vn () { @@ -137,11 +121,29 @@ dofs_md () { done } +# +# 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. +# bsdlabel fails otherwise. +# case `uname -r` in [1-4].*) + if [ -f "${RD}/trees/base/boot/boot1" ]; then + BOOT="-B -b ${RD}/trees/base/boot/boot1" + if [ -f "${RD}/trees/base/boot/boot2" ]; then + BOOT="${BOOT} -s ${RD}/trees/base/boot/boot2" + fi + else + BOOT="-r" + fi dofs_vn ;; *) + if [ -f "${RD}/trees/base/boot/boot" ]; then + BOOT="-B -b ${RD}/trees/base/boot/boot" + else + BOOT="-r" + fi dofs_md ;; esac |
