diff options
| author | alm <alm@FreeBSD.org> | 1993-09-09 14:04:20 +0000 |
|---|---|---|
| committer | alm <alm@FreeBSD.org> | 1993-09-09 14:04:20 +0000 |
| commit | 3e808869c39aa7fea2918dee242b6429d2b659f1 (patch) | |
| tree | 4ffff0e6b7ca6abf81a885b8ad4aa52d4d8a715b | |
| parent | 19fe3ad59ed1dda9294a7dcd597b64ccca12269e (diff) | |
| download | FreeBSD-src-3e808869c39aa7fea2918dee242b6429d2b659f1.zip FreeBSD-src-3e808869c39aa7fea2918dee242b6429d2b659f1.tar.gz | |
Combined some conditional statements now that `test' works correctly.
| -rwxr-xr-x | etc/etc.i386/inst1.install | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/etc/etc.i386/inst1.install b/etc/etc.i386/inst1.install index 62e5dad..fe3377d 100755 --- a/etc/etc.i386/inst1.install +++ b/etc/etc.i386/inst1.install @@ -4,6 +4,8 @@ # Currently, no method for checking to see if the designated disk type is # already in /etc/disktab. You can edit it out of the file after installation. # +PATH=/sbin:/bin:/usr/bin:/usr/sbin:. + OPSYSTEM=FreeBSD OPSYSID=165 ROOTMIN=7 @@ -83,20 +85,12 @@ while read data; do end_cyl=`expr "$data" : '[ ]*end[^0-9]*\([0-9]*\)'` if [ "$part_id" ]; then part_cnt=`expr $part_cnt + 1` - elif [ "$beg_cyl" ]; then - if [ $beg_cyl -gt $cyls_per_disk ]; then - no_part_table=1 - sysid_cnt=0 - have_opsys_part=0 - unused_last_part=`expr $part_cnt - 1` - fi - elif [ "$end_cyl" ]; then - if [ $end_cyl -gt $cyls_per_disk ]; then - no_part_table=1 - sysid_cnt=0 - have_opsys_part=0 - unused_last_part=`expr $part_cnt - 1` - fi + elif [ "${beg_cyl}" -gt "${cyls_per_disk}" -o \ + "${end_cyl}" -gt "${cyls_per_disk}" ]; then + no_part_table=1 + sysid_cnt=0 + have_opsys_part=0 + unused_last_part=`expr $part_cnt - 1` fi fi done <fdisk.out |
