diff options
| author | Harald Hoyer <harald@redhat.com> | 2012-02-13 21:15:22 +0100 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2012-02-13 21:15:22 +0100 |
| commit | 96d22bd7d61bb96f20cab725b717940704520247 (patch) | |
| tree | 2d13d7998d9b661d5547bc8e5a3616f875892aa9 /test/TEST-40-NBD/test.sh | |
| parent | 927d9273c4422037e81486da38e42ceb6dc43ff7 (diff) | |
| download | dracut-96d22bd7d61bb96f20cab725b717940704520247.tar.gz dracut-96d22bd7d61bb96f20cab725b717940704520247.tar.bz2 dracut-96d22bd7d61bb96f20cab725b717940704520247.zip | |
test: fixed terminfo location
Diffstat (limited to 'test/TEST-40-NBD/test.sh')
| -rwxr-xr-x | test/TEST-40-NBD/test.sh | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 255e3bc7..c7393884 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -193,7 +193,11 @@ make_encrypted_root() { initdir=$TESTDIR/overlay/source . $basedir/dracut-functions dracut_install sh df free ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux mount dmesg mkdir cp ping + mount dmesg mkdir cp ping + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst ./client-init /sbin/init find_binary plymouth >/dev/null && dracut_install plymouth (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) @@ -240,7 +244,11 @@ make_client_root() { initdir=$TESTDIR/mnt . $basedir/dracut-functions dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux dmesg mkdir cp ping + dmesg mkdir cp ping + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux inst ./client-init /sbin/init ( cd "$initdir"; @@ -272,8 +280,12 @@ make_server_root() { initdir=$TESTDIR/mnt . $basedir/dracut-functions dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - /lib/terminfo/l/linux dmesg mkdir cp ping grep \ + dmesg mkdir cp ping grep \ sleep nbd-server chmod + for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux type -P dhcpd >/dev/null && dracut_install dhcpd [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd inst ./server-init /sbin/init |