Contents of /trunk/dracut/patches/dracut-047-magellan.patch
Parent Directory | Revision Log
Revision 3132 -
(show annotations)
(download)
Fri Jun 15 13:34:46 2018 UTC (6 years, 3 months ago) by niro
File size: 25857 byte(s)
Fri Jun 15 13:34:46 2018 UTC (6 years, 3 months ago) by niro
File size: 25857 byte(s)
-re-diffed magellan patch
1 | diff -Naur dracut-047/dracut.conf.d/magellan.conf.example dracut-047-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-047/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 |
3 | +++ dracut-047-magellan/dracut.conf.d/magellan.conf.example 2018-06-15 10:44:47.628885659 +0200 |
4 | @@ -0,0 +1,19 @@ |
5 | +# dracut config file customized for Magellan-Linux |
6 | + |
7 | +# i18n |
8 | +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefont:CONSOLEFONT" |
9 | +i18n_default_font="latarcyrheb-sun16" |
10 | +i18n_install_all="yes" |
11 | +stdloglvl=3 |
12 | +sysloglvl=5 |
13 | +install_optional_items+=" nano /etc/nanorc lsmod ps grep cat rm " |
14 | +prefix="/" |
15 | +systemdutildir=/usr/lib/systemd |
16 | +systemdsystemunitdir=/usr/lib/systemd/system |
17 | +systemdsystemconfdir=/etc/systemd/system |
18 | +udevdir=/usr/lib/udev |
19 | +hostonly="yes" |
20 | +hostonly_cmdline="no" |
21 | +early_microcode="yes" |
22 | +reproducible="yes" |
23 | + |
24 | diff -Naur dracut-047/Makefile dracut-047-magellan/Makefile |
25 | --- dracut-047/Makefile 2018-02-19 10:00:33.000000000 +0100 |
26 | +++ dracut-047-magellan/Makefile 2018-06-15 10:46:00.404872250 +0200 |
27 | @@ -123,6 +123,9 @@ |
28 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf |
29 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d |
30 | mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d |
31 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf |
32 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d |
33 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut |
34 | install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh |
35 | install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh |
36 | install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh |
37 | diff -Naur dracut-047/modules.d/10i18n/console_init.sh dracut-047-magellan/modules.d/10i18n/console_init.sh |
38 | --- dracut-047/modules.d/10i18n/console_init.sh 2018-02-19 10:00:33.000000000 +0100 |
39 | +++ dracut-047-magellan/modules.d/10i18n/console_init.sh 2018-06-15 10:47:25.314798501 +0200 |
40 | @@ -9,7 +9,7 @@ |
41 | [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf |
42 | |
43 | DEFAULT_FONT=LatArCyrHeb-16 |
44 | -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap |
45 | +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap |
46 | |
47 | set_keyboard() { |
48 | local param |
49 | diff -Naur dracut-047/modules.d/40network/ifup.sh dracut-047-magellan/modules.d/40network/ifup.sh |
50 | --- dracut-047/modules.d/40network/ifup.sh 2018-02-19 10:00:33.000000000 +0100 |
51 | +++ dracut-047-magellan/modules.d/40network/ifup.sh 2018-06-15 10:51:12.613281095 +0200 |
52 | @@ -319,12 +319,12 @@ |
53 | unset TEAM_PORT_CONFIG |
54 | _hwaddr=$(cat /sys/class/net/$slave/address) |
55 | _subchannels=$(iface_get_subchannels "$slave") |
56 | - if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then |
57 | - . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" |
58 | - elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then |
59 | - . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" |
60 | - elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then |
61 | - . "/etc/sysconfig/network-scripts/ifcfg-${slave}" |
62 | + if [ -n "$_hwaddr" ] && [ -e "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf" ]; then |
63 | + . "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf" |
64 | + elif [ -n "$_subchannels" ] && [ -e "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" ]; then |
65 | + . "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" |
66 | + elif [ -e "/etc/conf.d/network-scripts/ifcfg-${slave}" ]; then |
67 | + . "/etc/conf.d/network-scripts/ifcfg-${slave}" |
68 | fi |
69 | |
70 | if [ -n "${TEAM_PORT_CONFIG}" ]; then |
71 | diff -Naur dracut-047/modules.d/40network/module-setup.sh dracut-047-magellan/modules.d/40network/module-setup.sh |
72 | --- dracut-047/modules.d/40network/module-setup.sh 2018-02-19 10:00:33.000000000 +0100 |
73 | +++ dracut-047-magellan/modules.d/40network/module-setup.sh 2018-06-15 10:51:42.095978798 +0200 |
74 | @@ -56,7 +56,7 @@ |
75 | unset TEAM_PORT_CONFIG |
76 | unset HWADDR |
77 | unset SUBCHANNELS |
78 | - for i in /etc/sysconfig/network-scripts/ifcfg-*; do |
79 | + for i in /etc/conf.d/network-scripts/ifcfg-*; do |
80 | [ -e "$i" ] || continue |
81 | case "$i" in |
82 | *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave) |
83 | @@ -75,12 +75,12 @@ |
84 | |
85 | HWADDR="$(echo $HWADDR | sed 'y/ABCDEF/abcdef/')" |
86 | if [ -n "$HWADDR" ]; then |
87 | - ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf" |
88 | + ln_r "$i" "/etc/conf.d/network-scripts/mac-${HWADDR}.conf" |
89 | fi |
90 | |
91 | SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')" |
92 | if [ -n "$SUBCHANNELS" ]; then |
93 | - ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf" |
94 | + ln_r "$i" "/etc/conf.d/network-scripts/ccw-${SUBCHANNELS}.conf" |
95 | fi |
96 | fi |
97 | fi |
98 | diff -Naur dracut-047/modules.d/45ifcfg/module-setup.sh dracut-047-magellan/modules.d/45ifcfg/module-setup.sh |
99 | --- dracut-047/modules.d/45ifcfg/module-setup.sh 2018-02-19 10:00:33.000000000 +0100 |
100 | +++ dracut-047-magellan/modules.d/45ifcfg/module-setup.sh 2018-06-15 10:52:08.065715644 +0200 |
101 | @@ -2,7 +2,7 @@ |
102 | |
103 | # called by dracut |
104 | check() { |
105 | - [[ -d /etc/sysconfig/network-scripts ]] && return 0 |
106 | + [[ -d /etc/conf.d/network-scripts ]] && return 0 |
107 | return 255 |
108 | } |
109 | |
110 | diff -Naur dracut-047/modules.d/45ifcfg/write-ifcfg.sh dracut-047-magellan/modules.d/45ifcfg/write-ifcfg.sh |
111 | --- dracut-047/modules.d/45ifcfg/write-ifcfg.sh 2018-02-19 10:00:33.000000000 +0100 |
112 | +++ dracut-047-magellan/modules.d/45ifcfg/write-ifcfg.sh 2018-06-15 10:52:46.536330540 +0200 |
113 | @@ -280,13 +280,13 @@ |
114 | done |
115 | |
116 | # Pass network opts |
117 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts |
118 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts |
119 | mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient |
120 | -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab |
121 | +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab |
122 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab |
123 | { |
124 | cp /tmp/net.* /run/initramfs/ |
125 | cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf |
126 | - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts |
127 | + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts |
128 | cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient |
129 | } > /dev/null 2>&1 |
130 | diff -Naur dracut-047/modules.d/80cms/cms-write-ifcfg.sh dracut-047-magellan/modules.d/80cms/cms-write-ifcfg.sh |
131 | --- dracut-047/modules.d/80cms/cms-write-ifcfg.sh 2018-02-19 10:00:33.000000000 +0100 |
132 | +++ dracut-047-magellan/modules.d/80cms/cms-write-ifcfg.sh 2018-06-15 10:53:36.723835484 +0200 |
133 | @@ -2,7 +2,7 @@ |
134 | |
135 | type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh |
136 | |
137 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts |
138 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts |
139 | |
140 | function cms_write_config() |
141 | { |
142 | @@ -23,19 +23,19 @@ |
143 | |
144 | uuid=$(cat /proc/sys/kernel/random/uuid) |
145 | |
146 | - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE |
147 | + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE |
148 | |
149 | strglobin "$IPADDR" '*:*:*' && ipv6=1 |
150 | |
151 | # to please NetworkManager on startup in loader before loader reconfigures net |
152 | - cat > /etc/sysconfig/network << EOF |
153 | + cat > /etc/conf.d/network << EOF |
154 | HOSTNAME=$HOSTNAME |
155 | EOF |
156 | echo "$HOSTNAME" > /etc/hostname |
157 | if [ "$ipv6" ]; then |
158 | - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network |
159 | + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network |
160 | else |
161 | - echo "NETWORKING=yes" >> /etc/sysconfig/network |
162 | + echo "NETWORKING=yes" >> /etc/conf.d/network |
163 | fi |
164 | |
165 | cat > $IFCFGFILE << EOF |
166 | @@ -97,7 +97,7 @@ |
167 | unset optstr |
168 | unset DNS1 |
169 | unset DNS2 |
170 | - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab |
171 | + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab |
172 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab |
173 | } |
174 | |
175 | diff -Naur dracut-047/modules.d/95rootfs-block/mount-root.sh dracut-047-magellan/modules.d/95rootfs-block/mount-root.sh |
176 | --- dracut-047/modules.d/95rootfs-block/mount-root.sh 2018-02-19 10:00:33.000000000 +0100 |
177 | +++ dracut-047-magellan/modules.d/95rootfs-block/mount-root.sh 2018-06-15 10:57:38.561527640 +0200 |
178 | @@ -33,8 +33,8 @@ |
179 | |
180 | READONLY= |
181 | fsckoptions= |
182 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then |
183 | - . "$NEWROOT"/etc/sysconfig/readonly-root |
184 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then |
185 | + . "$NEWROOT"/etc/conf.d/readonly-root |
186 | fi |
187 | |
188 | if getargbool 0 "readonlyroot=" -y readonlyroot; then |
189 | @@ -57,8 +57,8 @@ |
190 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
191 | fsckoptions="-f $fsckoptions" |
192 | elif [ -f "$NEWROOT"/.autofsck ]; then |
193 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \ |
194 | - . "$NEWROOT"/etc/sysconfig/autofsck |
195 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \ |
196 | + . "$NEWROOT"/etc/conf.d/autofsck |
197 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
198 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
199 | fi |
200 | diff -Naur dracut-047/modules.d/97masterkey/masterkey.sh dracut-047-magellan/modules.d/97masterkey/masterkey.sh |
201 | --- dracut-047/modules.d/97masterkey/masterkey.sh 2018-02-19 10:00:33.000000000 +0100 |
202 | +++ dracut-047-magellan/modules.d/97masterkey/masterkey.sh 2018-06-15 10:58:06.558265935 +0200 |
203 | @@ -6,7 +6,7 @@ |
204 | # TORSEC group -- http://security.polito.it |
205 | # Roberto Sassu <roberto.sassu@polito.it> |
206 | |
207 | -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" |
208 | +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" |
209 | MULTIKERNELMODE="NO" |
210 | PCRLOCKNUM=11 |
211 | |
212 | diff -Naur dracut-047/modules.d/97masterkey/README dracut-047-magellan/modules.d/97masterkey/README |
213 | --- dracut-047/modules.d/97masterkey/README 2018-02-19 10:00:33.000000000 +0100 |
214 | +++ dracut-047-magellan/modules.d/97masterkey/README 2018-06-15 10:58:24.123907511 +0200 |
215 | @@ -39,7 +39,7 @@ |
216 | MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" |
217 | -------------------------------------------------------------------------- |
218 | |
219 | -2) create the configuration file '/etc/sysconfig/masterkey' to override the |
220 | +2) create the configuration file '/etc/conf.d/masterkey' to override the |
221 | value of one or all variables; |
222 | |
223 | 3) specify these parameters in the kernel command line: |
224 | diff -Naur dracut-047/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-047-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh |
225 | --- dracut-047/modules.d/98ecryptfs/ecryptfs-mount.sh 2018-02-19 10:00:33.000000000 +0100 |
226 | +++ dracut-047-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2018-06-15 10:58:49.309397324 +0200 |
227 | @@ -6,7 +6,7 @@ |
228 | # TORSEC group -- http://security.polito.it |
229 | # Roberto Sassu <roberto.sassu@polito.it> |
230 | |
231 | -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" |
232 | +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" |
233 | ECRYPTFSKEYTYPE="encrypted" |
234 | ECRYPTFSKEYDESC="1000100010001000" |
235 | ECRYPTFSKEYID="" |
236 | diff -Naur dracut-047/modules.d/98ecryptfs/README dracut-047-magellan/modules.d/98ecryptfs/README |
237 | --- dracut-047/modules.d/98ecryptfs/README 2018-02-19 10:00:33.000000000 +0100 |
238 | +++ dracut-047-magellan/modules.d/98ecryptfs/README 2018-06-15 10:59:15.049888225 +0200 |
239 | @@ -23,13 +23,13 @@ |
240 | ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" |
241 | -------------------------------------------------------------------------- |
242 | |
243 | -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY |
244 | +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY |
245 | variable; |
246 | |
247 | 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command |
248 | line. |
249 | |
250 | -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify |
251 | +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify |
252 | # more options for mounting the eCryptfs filesystem: |
253 | |
254 | ECRYPTFSSRCDIR: existent directory in the lower root filesystem; |
255 | @@ -39,7 +39,7 @@ |
256 | option is automatically added by the dracut script). |
257 | |
258 | # Example of the configuration file: |
259 | ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- |
260 | +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- |
261 | ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" |
262 | ECRYPTFSSRCDIR="/secret" |
263 | ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" |
264 | diff -Naur dracut-047/modules.d/98integrity/evm-enable.sh dracut-047-magellan/modules.d/98integrity/evm-enable.sh |
265 | --- dracut-047/modules.d/98integrity/evm-enable.sh 2018-02-19 10:00:33.000000000 +0100 |
266 | +++ dracut-047-magellan/modules.d/98integrity/evm-enable.sh 2018-06-15 10:59:37.896446298 +0200 |
267 | @@ -7,7 +7,7 @@ |
268 | # Roberto Sassu <roberto.sassu@polito.it> |
269 | |
270 | EVMSECFILE="${SECURITYFSDIR}/evm" |
271 | -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" |
272 | +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" |
273 | EVMKEYDESC="evm-key" |
274 | EVMKEYTYPE="encrypted" |
275 | EVMKEYID="" |
276 | diff -Naur dracut-047/modules.d/98integrity/ima-keys-load.sh dracut-047-magellan/modules.d/98integrity/ima-keys-load.sh |
277 | --- dracut-047/modules.d/98integrity/ima-keys-load.sh 2018-02-19 10:00:33.000000000 +0100 |
278 | +++ dracut-047-magellan/modules.d/98integrity/ima-keys-load.sh 2018-06-15 10:59:58.450056376 +0200 |
279 | @@ -2,7 +2,7 @@ |
280 | |
281 | SECURITYFSDIR="/sys/kernel/security" |
282 | IMASECDIR="${SECURITYFSDIR}/ima" |
283 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" |
284 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" |
285 | |
286 | load_x509_keys() |
287 | { |
288 | diff -Naur dracut-047/modules.d/98integrity/ima-policy-load.sh dracut-047-magellan/modules.d/98integrity/ima-policy-load.sh |
289 | --- dracut-047/modules.d/98integrity/ima-policy-load.sh 2018-02-19 10:00:33.000000000 +0100 |
290 | +++ dracut-047-magellan/modules.d/98integrity/ima-policy-load.sh 2018-06-15 11:00:19.456665029 +0200 |
291 | @@ -7,8 +7,8 @@ |
292 | # Roberto Sassu <roberto.sassu@polito.it> |
293 | |
294 | IMASECDIR="${SECURITYFSDIR}/ima" |
295 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" |
296 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
297 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" |
298 | +IMAPOLICY="/etc/conf.d/ima-policy" |
299 | |
300 | load_ima_policy() |
301 | { |
302 | diff -Naur dracut-047/modules.d/98integrity/README dracut-047-magellan/modules.d/98integrity/README |
303 | --- dracut-047/modules.d/98integrity/README 2018-02-19 10:00:33.000000000 +0100 |
304 | +++ dracut-047-magellan/modules.d/98integrity/README 2018-06-15 11:00:52.641060893 +0200 |
305 | @@ -20,7 +20,7 @@ |
306 | EVMKEY="/etc/keys/evm-trusted.blob" |
307 | -------------------------------------------------------------------------- |
308 | |
309 | -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; |
310 | +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; |
311 | |
312 | 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command |
313 | line. |
314 | @@ -33,10 +33,10 @@ |
315 | |
316 | # Save the policy in a file. |
317 | |
318 | -# Create the configuration file '/etc/sysconfig/ima' to override the path name of |
319 | +# Create the configuration file '/etc/conf.d/ima' to override the path name of |
320 | # the IMA custom policy. |
321 | -------------- '/etc/sysconfig/ima' (with the default value) ------------- |
322 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
323 | +------------- '/etc/conf.d/ima' (with the default value) ------------- |
324 | +IMAPOLICY="/etc/conf.d/ima-policy" |
325 | ------------------------------------------------------------------------- |
326 | |
327 | |
328 | @@ -64,5 +64,5 @@ |
329 | |
330 | # 98integrity/ima-keys-load.sh script loads the signed certificates stored |
331 | # in the $IMAKEYSDIR onto the trusted IMA keyring. The default $IMAKEYSDIR |
332 | -# directory is /etc/keys/ima, but can be specified in the /etc/sysconfig/ima |
333 | +# directory is /etc/keys/ima, but can be specified in the /etc/conf.d/ima |
334 | # policy. |
335 | diff -Naur dracut-047/modules.d/98usrmount/mount-usr.sh dracut-047-magellan/modules.d/98usrmount/mount-usr.sh |
336 | --- dracut-047/modules.d/98usrmount/mount-usr.sh 2018-02-19 10:00:33.000000000 +0100 |
337 | +++ dracut-047-magellan/modules.d/98usrmount/mount-usr.sh 2018-06-15 11:01:19.843577843 +0200 |
338 | @@ -32,7 +32,7 @@ |
339 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
340 | _fsckoptions="-f $_fsckoptions" |
341 | elif [ -f "$NEWROOT"/.autofsck ]; then |
342 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck |
343 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck |
344 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
345 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
346 | fi |
347 | diff -Naur dracut-047/test/TEST-04-FULL-SYSTEMD/test.sh dracut-047-magellan/test/TEST-04-FULL-SYSTEMD/test.sh |
348 | --- dracut-047/test/TEST-04-FULL-SYSTEMD/test.sh 2018-02-19 10:00:33.000000000 +0100 |
349 | +++ dracut-047-magellan/test/TEST-04-FULL-SYSTEMD/test.sh 2018-06-15 11:01:52.771006948 +0200 |
350 | @@ -87,7 +87,7 @@ |
351 | inst /lib/systemd/system/systemd-remount-fs.service |
352 | inst /lib/systemd/systemd-remount-fs |
353 | inst /lib/systemd/system/systemd-journal-flush.service |
354 | - inst /etc/sysconfig/init |
355 | + inst /etc/conf.d/init |
356 | inst /lib/systemd/system/slices.target |
357 | inst /lib/systemd/system/system.slice |
358 | inst_multiple -o /lib/systemd/system/dracut* |
359 | @@ -99,7 +99,7 @@ |
360 | inst_multiple -o \ |
361 | /etc/machine-id \ |
362 | /etc/adjtime \ |
363 | - /etc/sysconfig/init \ |
364 | + /etc/conf.d/init \ |
365 | /etc/passwd \ |
366 | /etc/shadow \ |
367 | /etc/group \ |
368 | diff -Naur dracut-047/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh dracut-047-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh |
369 | --- dracut-047/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2018-02-19 10:00:33.000000000 +0100 |
370 | +++ dracut-047-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2018-06-15 11:02:13.210659800 +0200 |
371 | @@ -11,7 +11,7 @@ |
372 | ( |
373 | echo OK |
374 | ip -o -4 address show scope global | while read n if rest; do echo $if;done | sort |
375 | - for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do |
376 | + for i in /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-*; do |
377 | echo $i |
378 | grep -v 'UUID=' $i |
379 | done |
380 | diff -Naur dracut-047/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh dracut-047-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh |
381 | --- dracut-047/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2018-02-19 10:00:33.000000000 +0100 |
382 | +++ dracut-047-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2018-06-15 11:03:42.999194599 +0200 |
383 | @@ -125,7 +125,7 @@ |
384 | rd.neednet=1 |
385 | root=nfs:192.168.50.1:/nfs/client bootdev=ens3 |
386 | " \ |
387 | - 'ens3 ens4.0004 ens4.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4.0004 # Generated by dracut initrd NAME="ens4.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens4.0004" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4.3 # Generated by dracut initrd NAME="ens4.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens4.3" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="ens4" EOF ' \ |
388 | + 'ens3 ens4.0004 ens4.3 vlan0001 vlan2 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens4.0004 # Generated by dracut initrd NAME="ens4.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens4.0004" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens4.3 # Generated by dracut initrd NAME="ens4.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens4.3" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="ens4" EOF ' \ |
389 | || return 1 |
390 | |
391 | client_test "Multiple Bonds" \ |
392 | @@ -138,7 +138,7 @@ |
393 | rd.neednet=1 |
394 | root=nfs:192.168.50.1:/nfs/client bootdev=bond0 |
395 | " \ |
396 | - 'bond0 bond1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \ |
397 | + 'bond0 bond1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \ |
398 | || return 1 |
399 | |
400 | client_test "Multiple Bridges" \ |
401 | @@ -151,7 +151,7 @@ |
402 | rd.neednet=1 |
403 | root=nfs:192.168.50.1:/nfs/client bootdev=br0 |
404 | " \ |
405 | - 'br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \ |
406 | + 'br0 br1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \ |
407 | || return 1 |
408 | |
409 | kill_server |