test-functions: use sfdisk without cyl,head,sectors

[elogind.git] / test / test-functions

diff --git a/test/test-functions b/test/test-functions
index 80e0f65697e89a6a52a15e24f6db0aeb4f3bcedc..50daedc2019b44409474004d6029b68f1d77289e 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -137,8 +137,8 @@ create_empty_image() {
     LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img)
     [ -b "$LOOPDEV" ] || return 1
     echo "LOOPDEV=$LOOPDEV" >> $STATEFILE
-    sfdisk -C 9600 -H 2 -S 32 -L "$LOOPDEV" <<EOF
-,4800
+    sfdisk "$LOOPDEV" <<EOF
+,290M
 ,
 EOF
 
@@ -233,6 +233,8 @@ EOF
 install_basic_tools() {
     [[ $BASICTOOLS ]] && dracut_install $BASICTOOLS
     dracut_install -o sushell
+    # in Debian ldconfig is just a shell script wrapper around ldconfig.real
+    dracut_install -o ldconfig.real
 }
 
 install_debug_tools() {
@@ -242,9 +244,7 @@ install_debug_tools() {
 install_libnss() {
     # install libnss_files for login
     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
+    dracut_install $NSS_LIBS
 }
 
 install_dbus() {