Skip to content

Commit 85cc6a4

Browse files
committed
test: mask rc.local generator, broken on Jammy
On jammy it started to fail, it's not really needed and we install an empty stub anyway, so just mask the generator (cherry picked from commit 565916c) (cherry picked from commit dfb007f)
1 parent 1a20768 commit 85cc6a4

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

test/test-functions

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,13 +1853,9 @@ strip_binaries() {
18531853
}
18541854

18551855
create_rc_local() {
1856-
dinfo "Create rc.local"
1857-
mkdir -p "${initdir:?}/etc/rc.d"
1858-
cat >"$initdir/etc/rc.d/rc.local" <<EOF
1859-
#!/usr/bin/env bash
1860-
exit 0
1861-
EOF
1862-
chmod 0755 "$initdir/etc/rc.d/rc.local"
1856+
dinfo "Mask rc.local generator"
1857+
mkdir -p "${initdir:?}/etc/systemd/system-generators/"
1858+
ln -s /dev/null "$initdir/etc/systemd/system-generators/systemd-rc-local-generator"
18631859
}
18641860

18651861
install_execs() {

0 commit comments

Comments
 (0)