chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: install hostname debug tool
[elogind.git]
/
test
/
test-functions
diff --git
a/test/test-functions
b/test/test-functions
index a0f1bf4eb2a3ca27bedc591cd68c58b4e9aeb68a..80e0f65697e89a6a52a15e24f6db0aeb4f3bcedc 100644
(file)
--- a/
test/test-functions
+++ b/
test/test-functions
@@
-13,7
+13,7
@@
if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then
fi
BASICTOOLS="sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe"
fi
BASICTOOLS="sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe"
-DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort"
+DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort
hostname
"
function find_qemu_bin() {
# SUSE and Red Hat call the binary qemu-kvm
function find_qemu_bin() {
# SUSE and Red Hat call the binary qemu-kvm
@@
-241,7
+241,10
@@
install_debug_tools() {
install_libnss() {
# install libnss_files for login
install_libnss() {
# install libnss_files for login
- inst_libdir_file "libnss_files*"
+ NSS_LIBS=$(LD_DEBUG=files getent passwd 2>&1 >/dev/null |sed -n '/calling init: .*libnss_/ {s!^.* /!/!; p}')
+ for l in $NSS_LIBS; do
+ dracut_install $l
+ done
}
install_dbus() {
}
install_dbus() {
@@
-293,7
+296,8
@@
install_terminfo() {
}
setup_testsuite() {
}
setup_testsuite() {
- cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/
+ cp $TEST_BASE_DIR/testsuite.target $initdir/etc/systemd/system/
+ sed "s#@SYSTEMCTL@#$(type -P systemctl)#g" $TEST_BASE_DIR/end.service.in > $initdir/etc/systemd/system/end.service
mkdir -p $initdir/etc/systemd/system/testsuite.target.wants
ln -fs $TEST_BASE_DIR/testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service
mkdir -p $initdir/etc/systemd/system/testsuite.target.wants
ln -fs $TEST_BASE_DIR/testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service