diff --git a/Changelog b/Changelog index d134a4a..7ee3037 100644 --- a/Changelog +++ b/Changelog @@ -4,9 +4,8 @@ * Bind with Satan / start using autoconf. * Fix a bug in automatic authorization that revealed the username and password in ps output, by munging argv. - * Fix dgl-create-chroot's copying of terminfo - the terminfo dir - might be full of symlinks, so dereference them by passing -L to - cp. It's SUSv3, honest! + * Fix dgl-create-chroot's copying of terminfo by choosing a sane + default. * Now compiles with Tiny C Compiler. 1.4.5 (2004/06/14) diff --git a/dgl-create-chroot b/dgl-create-chroot index 42ac4ab..76ed434 100755 --- a/dgl-create-chroot +++ b/dgl-create-chroot @@ -23,7 +23,13 @@ playground_fixed="/usr/lib/games/nethack" # variable data to create (leave blank to skip) (may be equal to previous) playground_var="/var/games/nethack" # termcap/terminfo (copied recursively) (leave blank to skip) -termdata="/usr/share/terminfo" +if [ -d "/etc/terminfo" ]; then + termdata="/etc/terminfo" +elif [ -d "/usr/share/lib/terminfo" ]; then + termdata="/usr/share/lib/terminfo" +else + termdata="/usr/share/terminfo" +fi [ -f dgl-create-chroot.conf ] && . ./dgl-create-chroot.conf @@ -122,8 +128,7 @@ fi if [ -n "$termdata" ]; then mkdir -p $chroot_path`dirname $termdata` if [ -d $termdata/. ]; then - # $termdata might be full of symlinks, like Debian is - cp -L -R $termdata/. $chroot_path$termdata + cp -R $termdata/. $chroot_path$termdata else cp $termdata $chroot_path`dirname $termdata` fi