forked from freeipa/freeipa-container
-
Notifications
You must be signed in to change notification settings - Fork 0
/
ipa-data-fedora-33.patch
62 lines (57 loc) · 2.23 KB
/
ipa-data-fedora-33.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
--- /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.9/shutil.py 2019-12-18 18:48:49.000000000 +0000
+++ /usr/lib64/python3.9/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 2020-05-26 08:23:25.000000000 +0000
+++ /usr/libexec/generate-rndc-key.sh 2020-06-04 12:07:40.032800430 +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 -a ! -s /etc/rndc.conf ]; then
- echo -n $"Generating /etc/rndc.key:"
- if /usr/sbin/rndc-confgen -a -A hmac-sha256 -r /dev/urandom > /dev/null 2>&1
+if [ ! -s /data/etc/rndc.key -a ! -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 -r /dev/urandom > /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