cc5549ca12
We had all kinds of indentation: 2 sp, 3 sp, 4 sp, 8 sp, and mixed. 4 sp was the most common, in particular the majority of scripts under test/ used that. Let's standarize on 4 sp, because many commandlines are long and there's a lot of nesting, and with 8sp indentation less stuff fits. 4 sp also seems to be the default indentation, so this will make it less likely that people will mess up if they don't load the editor config. (I think people often use vi, and vi has no support to load project-wide configuration automatically. We distribute a .vimrc file, but it is not loaded by default, and even the instructions in it seem to discourage its use for security reasons.) Also remove the few vim config lines that were left. We should either have them on all files, or none. Also remove some strange stuff like '#!/bin/env bash', yikes.
81 lines
2.1 KiB
Bash
Executable file
81 lines
2.1 KiB
Bash
Executable file
#!/bin/bash
|
|
set -e
|
|
TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2730"
|
|
TEST_NO_NSPAWN=1
|
|
|
|
. $TEST_BASE_DIR/test-functions
|
|
QEMU_TIMEOUT=180
|
|
FSTYPE=ext4
|
|
|
|
test_setup() {
|
|
create_empty_image
|
|
mkdir -p $TESTDIR/root
|
|
mount ${LOOPDEV}p1 $TESTDIR/root
|
|
|
|
# Create what will eventually be our root filesystem onto an overlay
|
|
(
|
|
LOG_LEVEL=5
|
|
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
|
|
|
|
setup_basic_environment
|
|
|
|
# setup the testsuite service
|
|
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
|
[Unit]
|
|
Description=Testsuite service
|
|
|
|
[Service]
|
|
ExecStart=/bin/sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK > /testok; systemctl poweroff'
|
|
Type=oneshot
|
|
EOF
|
|
|
|
rm $initdir/etc/fstab
|
|
cat >$initdir/etc/systemd/system/-.mount <<EOF
|
|
[Unit]
|
|
Before=local-fs.target
|
|
|
|
[Mount]
|
|
What=/dev/sda1
|
|
Where=/
|
|
Type=ext4
|
|
Options=errors=remount-ro,noatime
|
|
|
|
[Install]
|
|
WantedBy=local-fs.target
|
|
Alias=root.mount
|
|
EOF
|
|
|
|
cat >$initdir/etc/systemd/system/systemd-remount-fs.service <<EOF
|
|
[Unit]
|
|
DefaultDependencies=no
|
|
Conflicts=shutdown.target
|
|
After=systemd-fsck-root.service
|
|
Before=local-fs-pre.target local-fs.target shutdown.target
|
|
Wants=local-fs-pre.target
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
RemainAfterExit=yes
|
|
ExecStart=/bin/systemctl reload /
|
|
EOF
|
|
|
|
setup_testsuite
|
|
) || return 1
|
|
|
|
ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/root.mount
|
|
mkdir -p $initdir/etc/systemd/system/local-fs.target.wants
|
|
ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/local-fs.target.wants/-.mount
|
|
|
|
# mask some services that we do not want to run in these tests
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
|
|
ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
|
|
|
|
ddebug "umount $TESTDIR/root"
|
|
umount $TESTDIR/root
|
|
}
|
|
|
|
do_test "$@"
|