Skip to content

Commit

Permalink
Update the Fedora rawhide patch to match the updated comment line
Browse files Browse the repository at this point in the history
  • Loading branch information
adelton committed Nov 29, 2024
1 parent b089cec commit 6b3bd66
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.fedora-rawhide
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ STOPSIGNAL RTMIN+3
# Minimize the systemd setup
RUN find /etc/systemd/system /usr/lib/systemd/system/{basic,multi-user,sysinit}.target.wants -type l \! -lname /dev/null | xargs rm -v
RUN systemctl mask systemd-logind.service
COPY patches/minimal-fedora-39.patch /root/
RUN patch --verbose -p0 --fuzz=0 < /root/minimal-fedora-39.patch
COPY patches/minimal-fedora-42.patch /root/
RUN patch --verbose -p0 --fuzz=0 < /root/minimal-fedora-42.patch
# debug: RUN ! find /etc/systemd/system /usr/lib/systemd/system/{basic,multi-user,sysinit}.target.wants /etc/tmpfiles.d -type f | grep .

RUN ln -s /usr/lib/systemd/system/dbus-broker.service /usr/lib/systemd/system/dbus.service
Expand Down
39 changes: 39 additions & 0 deletions patches/minimal-fedora-42.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#
# Avoid any default dependencies for targets that will be used.
#
--- /usr/lib/systemd/system/sysinit.target 2022-10-01 17:05:55.000000000 +0000
+++ /usr/lib/systemd/system/sysinit.target 2022-10-03 07:13:08.576478939 +0000
@@ -11,7 +11,7 @@
Description=System Initialization
Documentation=man:systemd.special(7)

-Wants=local-fs.target swap.target
+### Wants=local-fs.target swap.target
After=local-fs.target swap.target
Conflicts=emergency.service emergency.target
Before=emergency.service emergency.target
--- /usr/lib/systemd/system/basic.target 2016-05-30 04:23:03.000000000 +0000
+++ /usr/lib/systemd/system/basic.target 2018-10-21 06:23:01.878251807 +0000
@@ -9,7 +9,7 @@
Description=Basic System
Documentation=man:systemd.special(7)
Requires=sysinit.target
-Wants=sockets.target timers.target paths.target slices.target
+### Wants=sockets.target timers.target paths.target slices.target
After=sysinit.target sockets.target paths.target slices.target tmp.mount

# We support /var, /tmp, /var/tmp, being on NFS, but we don't pull in
#
# Workaround 1390191 in read-only container.
#
--- /usr/lib/tmpfiles.d/etc.conf 2024-11-27 00:00:00.000000000 +0000
+++ /usr/lib/tmpfiles.d/etc.conf 2024-11-29 08:37:36.387993347 +0000
@@ -8,7 +8,7 @@
# See tmpfiles.d(5) for details.

L /etc/os-release - - - - ../usr/lib/os-release
-L+ /etc/mtab - - - - ../proc/self/mounts
+L /etc/mtab - - - - ../proc/self/mounts
C! /etc/locale.conf - - - -
C! /etc/nsswitch.conf - - - -
C! /etc/vconsole.conf - - - -

0 comments on commit 6b3bd66

Please sign in to comment.