Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
This reverts changes from commit 4ab5bf9,
for Fedora rawhide.

The issue seems resolved in the Fedora rawhide builds.
  • Loading branch information
adelton committed Dec 3, 2024
1 parent 6b3bd66 commit 8c92bba
Show file tree
Hide file tree
Showing 2 changed files with 84 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 @@ -61,8 +61,8 @@ ADD hostnamectl-wrapper /usr/bin/nisdomainname
## # test: systemd-container-ipa-server-install.sh

# Move configuration and data to data volume
COPY patches/ipa-data-fedora-41.patch /root
RUN set -o pipefail ; patch --verbose -p0 --fuzz=0 < /root/ipa-data-fedora-41.patch | sed -n 's/^patching file //;T;/\.py$/p' | xargs python3 -m compileall
COPY patches/ipa-data-fedora-42.patch /root
RUN set -o pipefail ; patch --verbose -p0 --fuzz=0 < /root/ipa-data-fedora-42.patch | sed -n 's/^patching file //;T;/\.py$/p' | xargs python3 -m compileall
COPY ipaplatform-fedora.conf /usr/lib/systemd/system.conf.d/ipaplatform-override.conf
ENV IPAPLATFORM_OVERRIDE=fedora_container

Expand Down
82 changes: 82 additions & 0 deletions patches/ipa-data-fedora-42.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
--- /usr/lib/python3.13/site-packages/ipaplatform/base/paths.py 2021-11-15 06:27:57.335788513 +0000
+++ /usr/lib/python3.13/site-packages/ipaplatform/base/paths.py 2021-11-15 06:28:35.142836641 +0000
@@ -355,7 +355,7 @@
VAR_LOG_AUDIT = "/var/log/audit/audit.log"
VAR_LOG_HTTPD_DIR = "/var/log/httpd"
VAR_LOG_HTTPD_ERROR = "/var/log/httpd/error_log"
- IPABACKUP_LOG = "/var/log/ipabackup.log"
+ IPABACKUP_LOG = "/data/var/log/ipabackup.log"
IPACLIENT_INSTALL_LOG = "/var/log/ipaclient-install.log"
IPACLIENT_UNINSTALL_LOG = "/var/log/ipaclient-uninstall.log"
IPACLIENTSAMBA_INSTALL_LOG = "/var/log/ipaclientsamba-install.log"
@@ -363,7 +363,7 @@
IPAREPLICA_CA_INSTALL_LOG = "/var/log/ipareplica-ca-install.log"
IPAREPLICA_CONNCHECK_LOG = "/var/log/ipareplica-conncheck.log"
IPAREPLICA_INSTALL_LOG = "/var/log/ipareplica-install.log"
- IPARESTORE_LOG = "/var/log/iparestore.log"
+ IPARESTORE_LOG = "/data/var/log/iparestore.log"
IPASERVER_ENABLESID_LOG = "/var/log/ipaserver-enable-sid.log"
IPASERVER_INSTALL_LOG = "/var/log/ipaserver-install.log"
IPASERVER_ADTRUST_INSTALL_LOG = "/var/log/ipaserver-adtrust-install.log"
--- /usr/lib/tmpfiles.d/var.conf 2018-10-29 00:59:14.000000000 +0000
+++ /usr/lib/tmpfiles.d/var.conf 2018-12-14 10:37:58.607898037 +0000
@@ -12,9 +12,9 @@
L /var/run - - - - ../run

d /var/log 0755 - - -
-f /var/log/wtmp 0664 root utmp -
-f /var/log/btmp 0660 root utmp -
-f /var/log/lastlog 0664 root utmp -
+L /var/log/wtmp - - - - /data/var/log/wtmp
+L /var/log/btmp - - - - /data/var/log/btmp
+L /var/log/lastlog - - - - /data/var/log/lastlog

d /var/cache 0755 - - -

#
# Workaround https://github.com/freeipa/freeipa-container/issues/313
#
--- /usr/lib64/python3.13/shutil.py 2019-12-18 18:48:49.000000000 +0000
+++ /usr/lib64/python3.13/shutil.py 2020-03-11 16:17:24.727098610 +0000
@@ -160,6 +160,8 @@
raise
return
for name in names:
+ if name == 'security.selinux':
+ continue
try:
value = os.getxattr(src, name, follow_symlinks=follow_symlinks)
os.setxattr(dst, name, value, follow_symlinks=follow_symlinks)
#
# rndc-confgen does not seem to write through the
# /etc/rndc.key -> /data/etc/rndc.key symlink
#
--- /usr/libexec/generate-rndc-key.sh 2022-01-28 10:39:02.987540642 +0000
+++ /usr/libexec/generate-rndc-key.sh 2022-01-28 10:39:49.948267375 +0000
@@ -15,18 +15,18 @@

# This script generates /etc/rndc.key if doesn't exist AND if there is no rndc.conf

-if [ ! -s /etc/rndc.key ] && [ ! -s /etc/rndc.conf ]; then
- echo -n $"Generating /etc/rndc.key:"
- if /usr/sbin/rndc-confgen -a -A hmac-sha256 > /dev/null 2>&1
+if [ ! -s /data/etc/rndc.key ] && [ ! -s /etc/rndc.conf ]; then
+ echo -n $"Generating /data/etc/rndc.key:"
+ if /usr/sbin/rndc-confgen -c /data/etc/rndc.key -a -A hmac-sha256 > /dev/null 2>&1
then
- chmod 640 /etc/rndc.key
- chown root:named /etc/rndc.key
- [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.key
- success $"/etc/rndc.key generation"
+ chmod 640 /data/etc/rndc.key
+ chown root:named /data/etc/rndc.key
+ [ -x /sbin/restorecon ] && /sbin/restorecon /data/etc/rndc.key
+ success $"/data/etc/rndc.key generation"
echo
else
rc=$?
- failure $"/etc/rndc.key generation"
+ failure $"/data/etc/rndc.key generation"
echo
exit $rc
fi

0 comments on commit 8c92bba

Please sign in to comment.