Rename the `*_root` functions to `*_rootfs` since those functions build
root file systems.
}
-make_encrypted_root() {
+make_encrypted_rootfs() {
rm -fr "$TESTDIR"/overlay
# Create what will eventually be our root filesystem onto an overlay
build_client_rootfs "$TESTDIR/overlay/source"
grep -F -a -m 1 ID_FS_UUID "$TESTDIR"/marker.img > "$TESTDIR"/luks.uuid
}
-make_client_root() {
+make_client_rootfs() {
build_client_rootfs "$TESTDIR/client-rootfs"
inst_multiple ip
inst_init ./client-init.sh "$TESTDIR"/client-rootfs
rm -fr "$TESTDIR"/client-rootfs
}
-make_server_root() {
+make_server_rootfs() {
rm -fr "$TESTDIR"/server-rootfs
cat > /tmp/config << EOF
}
test_setup() {
- make_encrypted_root
- make_client_root
- make_server_root
+ make_encrypted_rootfs
+ make_client_rootfs
+ make_server_rootfs
# shellcheck source=$TESTDIR/luks.uuid
. "$TESTDIR"/luks.uuid