diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-12 03:24:03 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-12 03:24:03 +0000 |
| commit | 7c10aa9d7597a1fdc5a6abc34bec5e6bc37528a7 (patch) | |
| tree | f19c0c696e5eaadbad8d2d75706b09392f00d25c | |
| parent | b20b08194033c07fddd842d6de594bf6761e88ba (diff) | |
Sort mount points when generating fstab file. This prevents problems
when people specify, e.g. /usr/local before /usr. deraadt@ OK
| -rw-r--r-- | distrib/miniroot/install.sh | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 83bfcc8316b..2aff7e7c0e0 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.94 2002/04/12 02:24:40 deraadt Exp $ +# $OpenBSD: install.sh,v 1.95 2002/04/12 03:24:02 millert Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -185,14 +185,17 @@ __EOT fi done - # Now write it out - _i=0 - while [ $_i -lt $_npartitions ] ; do - if [ -n "${_mount_points[${_i}]}" ]; then - echo "${DISK}${_partitions[${_i}]} ${_mount_points[${_i}]}" >> ${FILESYSTEMS} - _mount_points[${_i}]= - fi - _i=$(( ${_i} + 1 )) + # Now write it out, sorted by mount point + for _mp in `bsort ${_mount_points[*]}`; do + _i=0 + while [ $_i -lt $_npartitions ] ; do + if [ $_mp = "${_mount_points[${_i}]}" ]; then + echo "${DISK}${_partitions[${_i}]} ${_mount_points[${_i}]}" >> ${FILESYSTEMS} + _mount_points[${_i}]= + break + fi + _i=$(( ${_i} + 1 )) + done done rm -f /tmp/fstab.${DISK} done |