shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 01:55:22 +03:00
Code

Merge pull request #33577 from fbuihuu/testsuite-tweaks-for-v256-on-SUSE

Browse Source 
Testsuite tweaks for v256 on suse
This commit is contained in:
Luca Boccassi 2024-07-02 23:35:33 +02:00 committed by GitHub
commit 467c501667
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-24-CRYPTSETUP/test.sh
View File

@ -198,7 +198,7 @@ EOF
# Forward journal messages to the console, so we have something to investigate even if we fail to mount
# the encrypted /var
mkdir "$initdir/etc/systemd/journald.conf.d/"
mkdir -p "$initdir/etc/systemd/journald.conf.d/"
echo -ne "[Journal]\nForwardToConsole=yes\n" >"$initdir/etc/systemd/journald.conf.d/99-forward.conf"
# If $INITRD wasn't provided explicitly, generate a custom one with dm-crypt

3
test/test-functions
View File

@ -1947,6 +1947,7 @@ EOF
install_config_files() {
dinfo "Install config files"
inst /etc/sysconfig/init || :
inst /etc/hosts
inst /etc/passwd
inst /etc/shadow
inst_any /etc/login.defs /usr/etc/login.defs
@ -2959,6 +2960,8 @@ inst_recursive() {
while read -r item; do
if [[ -d "$item" ]]; then
inst_dir "$item"
elif [[ -L "$item" ]]; then
inst_symlink "$item"
elif [[ -f "$item" ]]; then
inst_simple "$item"
fi

5
test/units/TEST-74-AUX-UTILS.ssh.sh
View File

@ -46,7 +46,10 @@ test -f /etc/ssh/ssh_host_rsa_key || ssh-keygen -t rsa -C '' -N '' -f /etc/ssh/s
echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
echo "LogLevel DEBUG3" >> /etc/ssh/sshd_config
test -f /etc/ssh/ssh_config || echo 'Include /etc/ssh/ssh_config.d/*.conf' > /etc/ssh/ssh_config
test -f /etc/ssh/ssh_config || {
echo 'Include /etc/ssh/ssh_config.d/*.conf'
echo 'Include /usr/etc/ssh/ssh_config.d/*.conf'
} >/etc/ssh/ssh_config
# ssh wants this dir around, but distros cannot agree on a common name for it, let's just create all that are aware of distros use
mkdir -p /usr/share/empty.sshd /var/empty /var/empty/sshd /run/sshd