diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-03-09 23:34:10 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-03-09 23:34:10 +0000 |
| commit | 2912930e1c3561abee14879cd4ce96273661ee15 (patch) | |
| tree | 98bb1a105d121eb5f210eb3e96701557c9a22add | |
| parent | a500f8a419529c1809a9b1846e7409cb614a7e42 (diff) | |
correctly choose the files in a directory, even if it is a symbolic link
also don't pull extra goop into the selector (do not use ls -l)
diff from halex
ok krw
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 556455f0178..f877b6f31a3 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.599 2010/03/09 15:06:36 krw Exp $ +# $OpenBSD: install.sub,v 1.600 2010/03/09 23:34:09 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1306,7 +1306,7 @@ install_mounted_fs() { echo "The directory '$resp' does not exist." done - install_files "file://$_dir" "$(ls -l $_dir)" + install_files "file://$_dir" "$(ls $_dir/)" } install_cdrom() { |