diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-02-28 23:51:55 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-02-28 23:51:55 +0000 |
| commit | 3da33324b72e2478f8df7e3ef0ad0d733583aaf9 (patch) | |
| tree | 642be726c6665ed9f272f250b065bdb163a10032 /distrib | |
| parent | d5a40d37c46fd7514cffedcecc6294f37fdc8150 (diff) | |
Mount MSDOS partitions with '-l' and not '-s'. Force lists of file names
to all lower case. Check for install.$ARCH and sha256*. Fixes
getting sets from an MSDOS partition, which uebayasi@ reported was
broken, without impacting other sources for sets.
ok rpe@ halex@ deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index f5464563ba2..24f0d3d15eb 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.749 2014/02/22 05:13:22 deraadt Exp $ +# $OpenBSD: install.sub,v 1.750 2014/02/28 23:51:54 krw Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -198,8 +198,7 @@ mount_mnt2() { [[ $resp == done ]] && return 1 fi - # Always mount msdos partitions with -s to get lower case names. - grep -q "^ $resp: .*MSDOS" $_file && _opts="-s" + grep -q "^ $resp: .*MSDOS" $_file && _opts="-l" mount -o ro,$_opts /dev/$_dev$resp /mnt2 } @@ -1162,8 +1161,9 @@ enable_network() { # named in $1. Display an error message for failed installs so the # user will know to try again. install_files() { - local _src=$1 _files=$2 _f _sets _get_sets _n _col=$COLUMNS \ + local _src=$1 _f _sets _get_sets _n _col=$COLUMNS \ _tmpfs _tmpsrc _cfile _fsrc _unver _t _issue _srclocal _size + typeset -l _files=$2 # Initialize _sets to the list of sets found in _src, and initialize # _get_sets to the intersection of _sets and DEFAULTSETS. @@ -1197,7 +1197,7 @@ install_files() { return fi - isin INSTALL.$ARCH $_files || + isin install.$ARCH $_files || ask_yn "INSTALL.$ARCH not found. Use sets found here anyway?" || return @@ -1225,7 +1225,7 @@ install_files() { # Try to prefetch and control checksum files # use dummy for loop as combined assignment and do { ... } while(0) for _issue in ''; do - ! isin SHA256.sig $_files && + ! isin sha256.sig $_files && _issue="Directory does not contain SHA256.sig" && break # Find a filesystem to store the prefetched sets. Prefer file- @@ -1262,6 +1262,7 @@ install_files() { # Fetch signature file ! ftp -D "$_t" -Vmo "$_cfile.sig" "$_src/SHA256.sig" && + ! ftp -D "$_t" -Vmo "$_cfile.sig" "$_src/sha256.sig" && _issue="Cannot fetch SHA256.sig" && break # Verify signature file with public keys |