Contents of /trunk/dracut/patches/dracut-044-magellan.patch
Parent Directory | Revision Log
Revision 2727 -
(show annotations)
(download)
Mon Nov 30 10:44:31 2015 UTC (8 years, 9 months ago) by niro
File size: 14499 byte(s)
Mon Nov 30 10:44:31 2015 UTC (8 years, 9 months ago) by niro
File size: 14499 byte(s)
-rediffed patches for dracut-044
1 | diff -Naur dracut-044/dracut.conf.d/magellan.conf.example dracut-044-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-044/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 |
3 | +++ dracut-044-magellan/dracut.conf.d/magellan.conf.example 2015-11-30 10:37:05.716075316 +0100 |
4 | @@ -0,0 +1,18 @@ |
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 | diff -Naur dracut-044/Makefile dracut-044-magellan/Makefile |
24 | --- dracut-044/Makefile 2015-11-25 14:22:28.000000000 +0100 |
25 | +++ dracut-044-magellan/Makefile 2015-11-30 10:39:08.514515379 +0100 |
26 | @@ -122,6 +122,9 @@ |
27 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf |
28 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d |
29 | mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d |
30 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf |
31 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d |
32 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut |
33 | install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh |
34 | install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh |
35 | install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh |
36 | diff -Naur dracut-044/modules.d/10i18n/console_init.sh dracut-044-magellan/modules.d/10i18n/console_init.sh |
37 | --- dracut-044/modules.d/10i18n/console_init.sh 2015-11-25 14:22:28.000000000 +0100 |
38 | +++ dracut-044-magellan/modules.d/10i18n/console_init.sh 2015-11-30 10:39:36.544159181 +0100 |
39 | @@ -9,7 +9,7 @@ |
40 | [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf |
41 | |
42 | DEFAULT_FONT=LatArCyrHeb-16 |
43 | -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap |
44 | +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap |
45 | |
46 | set_keyboard() { |
47 | local param |
48 | diff -Naur dracut-044/modules.d/45ifcfg/module-setup.sh dracut-044-magellan/modules.d/45ifcfg/module-setup.sh |
49 | --- dracut-044/modules.d/45ifcfg/module-setup.sh 2015-11-25 14:22:28.000000000 +0100 |
50 | +++ dracut-044-magellan/modules.d/45ifcfg/module-setup.sh 2015-11-30 10:40:03.645814735 +0100 |
51 | @@ -2,7 +2,7 @@ |
52 | |
53 | # called by dracut |
54 | check() { |
55 | - [[ -d /etc/sysconfig/network-scripts ]] && return 0 |
56 | + [[ -d /etc/conf.d/network-scripts ]] && return 0 |
57 | return 255 |
58 | } |
59 | |
60 | diff -Naur dracut-044/modules.d/45ifcfg/write-ifcfg.sh dracut-044-magellan/modules.d/45ifcfg/write-ifcfg.sh |
61 | --- dracut-044/modules.d/45ifcfg/write-ifcfg.sh 2015-11-25 14:22:28.000000000 +0100 |
62 | +++ dracut-044-magellan/modules.d/45ifcfg/write-ifcfg.sh 2015-11-30 10:40:36.322399384 +0100 |
63 | @@ -275,13 +275,13 @@ |
64 | done |
65 | |
66 | # Pass network opts |
67 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts |
68 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts |
69 | mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient |
70 | -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab |
71 | +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab |
72 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab |
73 | { |
74 | cp /tmp/net.* /run/initramfs/ |
75 | cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf |
76 | - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts |
77 | + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts |
78 | cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient |
79 | } > /dev/null 2>&1 |
80 | diff -Naur dracut-044/modules.d/80cms/cms-write-ifcfg.sh dracut-044-magellan/modules.d/80cms/cms-write-ifcfg.sh |
81 | --- dracut-044/modules.d/80cms/cms-write-ifcfg.sh 2015-11-25 14:22:28.000000000 +0100 |
82 | +++ dracut-044-magellan/modules.d/80cms/cms-write-ifcfg.sh 2015-11-30 10:41:26.270764395 +0100 |
83 | @@ -2,7 +2,7 @@ |
84 | |
85 | type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh |
86 | |
87 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts |
88 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts |
89 | |
90 | function cms_write_config() |
91 | { |
92 | @@ -23,19 +23,19 @@ |
93 | |
94 | uuid=$(cat /proc/sys/kernel/random/uuid) |
95 | |
96 | - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE |
97 | + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE |
98 | |
99 | strglobin "$IPADDR" '*:*:*' && ipv6=1 |
100 | |
101 | # to please NetworkManager on startup in loader before loader reconfigures net |
102 | - cat > /etc/sysconfig/network << EOF |
103 | + cat > /etc/conf.d/network << EOF |
104 | HOSTNAME=$HOSTNAME |
105 | EOF |
106 | echo "$HOSTNAME" > /etc/hostname |
107 | if [ "$ipv6" ]; then |
108 | - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network |
109 | + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network |
110 | else |
111 | - echo "NETWORKING=yes" >> /etc/sysconfig/network |
112 | + echo "NETWORKING=yes" >> /etc/conf.d/network |
113 | fi |
114 | |
115 | cat > $IFCFGFILE << EOF |
116 | @@ -97,7 +97,7 @@ |
117 | unset optstr |
118 | unset DNS1 |
119 | unset DNS2 |
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 | |
125 | diff -Naur dracut-044/modules.d/95rootfs-block/mount-root.sh dracut-044-magellan/modules.d/95rootfs-block/mount-root.sh |
126 | --- dracut-044/modules.d/95rootfs-block/mount-root.sh 2015-11-25 14:22:28.000000000 +0100 |
127 | +++ dracut-044-magellan/modules.d/95rootfs-block/mount-root.sh 2015-11-30 10:42:12.442177323 +0100 |
128 | @@ -33,8 +33,8 @@ |
129 | |
130 | READONLY= |
131 | fsckoptions= |
132 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then |
133 | - . "$NEWROOT"/etc/sysconfig/readonly-root |
134 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then |
135 | + . "$NEWROOT"/etc/conf.d/readonly-root |
136 | fi |
137 | |
138 | if getargbool 0 "readonlyroot=" -y readonlyroot; then |
139 | @@ -57,8 +57,8 @@ |
140 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
141 | fsckoptions="-f $fsckoptions" |
142 | elif [ -f "$NEWROOT"/.autofsck ]; then |
143 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \ |
144 | - . "$NEWROOT"/etc/sysconfig/autofsck |
145 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \ |
146 | + . "$NEWROOT"/etc/conf.d/autofsck |
147 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
148 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
149 | fi |
150 | diff -Naur dracut-044/modules.d/97masterkey/masterkey.sh dracut-044-magellan/modules.d/97masterkey/masterkey.sh |
151 | --- dracut-044/modules.d/97masterkey/masterkey.sh 2015-11-25 14:22:28.000000000 +0100 |
152 | +++ dracut-044-magellan/modules.d/97masterkey/masterkey.sh 2015-11-30 10:42:31.696932472 +0100 |
153 | @@ -6,7 +6,7 @@ |
154 | # TORSEC group -- http://security.polito.it |
155 | # Roberto Sassu <roberto.sassu@polito.it> |
156 | |
157 | -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" |
158 | +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" |
159 | MULTIKERNELMODE="NO" |
160 | PCRLOCKNUM=11 |
161 | |
162 | diff -Naur dracut-044/modules.d/97masterkey/README dracut-044-magellan/modules.d/97masterkey/README |
163 | --- dracut-044/modules.d/97masterkey/README 2015-11-25 14:22:28.000000000 +0100 |
164 | +++ dracut-044-magellan/modules.d/97masterkey/README 2015-11-30 10:42:48.727695989 +0100 |
165 | @@ -39,7 +39,7 @@ |
166 | MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" |
167 | -------------------------------------------------------------------------- |
168 | |
169 | -2) create the configuration file '/etc/sysconfig/masterkey' to override the |
170 | +2) create the configuration file '/etc/conf.d/masterkey' to override the |
171 | value of one or all variables; |
172 | |
173 | 3) specify these parameters in the kernel command line: |
174 | diff -Naur dracut-044/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-044-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh |
175 | --- dracut-044/modules.d/98ecryptfs/ecryptfs-mount.sh 2015-11-25 14:22:28.000000000 +0100 |
176 | +++ dracut-044-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2015-11-30 10:43:11.637370224 +0100 |
177 | @@ -6,7 +6,7 @@ |
178 | # TORSEC group -- http://security.polito.it |
179 | # Roberto Sassu <roberto.sassu@polito.it> |
180 | |
181 | -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" |
182 | +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" |
183 | ECRYPTFSKEYTYPE="encrypted" |
184 | ECRYPTFSKEYDESC="1000100010001000" |
185 | ECRYPTFSKEYID="" |
186 | diff -Naur dracut-044/modules.d/98ecryptfs/README dracut-044-magellan/modules.d/98ecryptfs/README |
187 | --- dracut-044/modules.d/98ecryptfs/README 2015-11-25 14:22:28.000000000 +0100 |
188 | +++ dracut-044-magellan/modules.d/98ecryptfs/README 2015-11-30 10:43:38.993982845 +0100 |
189 | @@ -23,13 +23,13 @@ |
190 | ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" |
191 | -------------------------------------------------------------------------- |
192 | |
193 | -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY |
194 | +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY |
195 | variable; |
196 | |
197 | 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command |
198 | line. |
199 | |
200 | -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify |
201 | +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify |
202 | # more options for mounting the eCryptfs filesystem: |
203 | |
204 | ECRYPTFSSRCDIR: existent directory in the lower root filesystem; |
205 | @@ -39,7 +39,7 @@ |
206 | option is automatically added by the dracut script). |
207 | |
208 | # Example of the configuration file: |
209 | ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- |
210 | +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- |
211 | ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" |
212 | ECRYPTFSSRCDIR="/secret" |
213 | ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" |
214 | diff -Naur dracut-044/modules.d/98integrity/evm-enable.sh dracut-044-magellan/modules.d/98integrity/evm-enable.sh |
215 | --- dracut-044/modules.d/98integrity/evm-enable.sh 2015-11-25 14:22:28.000000000 +0100 |
216 | +++ dracut-044-magellan/modules.d/98integrity/evm-enable.sh 2015-11-30 10:44:01.832660738 +0100 |
217 | @@ -7,7 +7,7 @@ |
218 | # Roberto Sassu <roberto.sassu@polito.it> |
219 | |
220 | EVMSECFILE="${SECURITYFSDIR}/evm" |
221 | -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" |
222 | +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" |
223 | EVMKEYDESC="evm-key" |
224 | EVMKEYTYPE="encrypted" |
225 | EVMKEYID="" |
226 | diff -Naur dracut-044/modules.d/98integrity/ima-keys-load.sh dracut-044-magellan/modules.d/98integrity/ima-keys-load.sh |
227 | --- dracut-044/modules.d/98integrity/ima-keys-load.sh 2015-11-25 14:22:28.000000000 +0100 |
228 | +++ dracut-044-magellan/modules.d/98integrity/ima-keys-load.sh 2015-11-30 10:47:17.495942364 +0100 |
229 | @@ -2,7 +2,7 @@ |
230 | |
231 | SECURITYFSDIR="/sys/kernel/security" |
232 | IMASECDIR="${SECURITYFSDIR}/ima" |
233 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" |
234 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" |
235 | |
236 | load_x509_keys() |
237 | { |
238 | diff -Naur dracut-044/modules.d/98integrity/ima-policy-load.sh dracut-044-magellan/modules.d/98integrity/ima-policy-load.sh |
239 | --- dracut-044/modules.d/98integrity/ima-policy-load.sh 2015-11-25 14:22:28.000000000 +0100 |
240 | +++ dracut-044-magellan/modules.d/98integrity/ima-policy-load.sh 2015-11-30 10:44:23.439357030 +0100 |
241 | @@ -7,8 +7,8 @@ |
242 | # Roberto Sassu <roberto.sassu@polito.it> |
243 | |
244 | IMASECDIR="${SECURITYFSDIR}/ima" |
245 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" |
246 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
247 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" |
248 | +IMAPOLICY="/etc/conf.d/ima-policy" |
249 | |
250 | load_ima_policy() |
251 | { |
252 | diff -Naur dracut-044/modules.d/98integrity/README dracut-044-magellan/modules.d/98integrity/README |
253 | --- dracut-044/modules.d/98integrity/README 2015-11-25 14:22:28.000000000 +0100 |
254 | +++ dracut-044-magellan/modules.d/98integrity/README 2015-11-30 10:44:54.195926366 +0100 |
255 | @@ -20,7 +20,7 @@ |
256 | EVMKEY="/etc/keys/evm-trusted.blob" |
257 | -------------------------------------------------------------------------- |
258 | |
259 | -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; |
260 | +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; |
261 | |
262 | 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command |
263 | line. |
264 | @@ -33,10 +33,10 @@ |
265 | |
266 | # Save the policy in a file. |
267 | |
268 | -# Create the configuration file '/etc/sysconfig/ima' to override the path name of |
269 | +# Create the configuration file '/etc/conf.d/ima' to override the path name of |
270 | # the IMA custom policy. |
271 | -------------- '/etc/sysconfig/ima' (with the default value) ------------- |
272 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
273 | +------------- '/etc/conf.d/ima' (with the default value) ------------- |
274 | +IMAPOLICY="/etc/conf.d/ima-policy" |
275 | ------------------------------------------------------------------------- |
276 | |
277 | |
278 | @@ -64,5 +64,5 @@ |
279 | |
280 | # 98integrity/ima-keys-load.sh script loads the signed certificates stored |
281 | # in the $IMAKEYSDIR onto the trusted IMA keyring. The default $IMAKEYSDIR |
282 | -# directory is /etc/keys/ima, but can be specified in the /etc/sysconfig/ima |
283 | +# directory is /etc/keys/ima, but can be specified in the /etc/conf.d/ima |
284 | # policy. |
285 | diff -Naur dracut-044/modules.d/98usrmount/mount-usr.sh dracut-044-magellan/modules.d/98usrmount/mount-usr.sh |
286 | --- dracut-044/modules.d/98usrmount/mount-usr.sh 2015-11-25 14:22:28.000000000 +0100 |
287 | +++ dracut-044-magellan/modules.d/98usrmount/mount-usr.sh 2015-11-30 10:45:20.345561657 +0100 |
288 | @@ -32,7 +32,7 @@ |
289 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
290 | _fsckoptions="-f $_fsckoptions" |
291 | elif [ -f "$NEWROOT"/.autofsck ]; then |
292 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck |
293 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck |
294 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
295 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
296 | fi |
297 | diff -Naur dracut-044/test/TEST-04-FULL-SYSTEMD/test.sh dracut-044-magellan/test/TEST-04-FULL-SYSTEMD/test.sh |
298 | --- dracut-044/test/TEST-04-FULL-SYSTEMD/test.sh 2015-11-25 14:22:28.000000000 +0100 |
299 | +++ dracut-044-magellan/test/TEST-04-FULL-SYSTEMD/test.sh 2015-11-30 10:45:59.776014078 +0100 |
300 | @@ -86,7 +86,7 @@ |
301 | inst /lib/systemd/system/systemd-remount-fs.service |
302 | inst /lib/systemd/systemd-remount-fs |
303 | inst /lib/systemd/system/systemd-journal-flush.service |
304 | - inst /etc/sysconfig/init |
305 | + inst /etc/conf.d/init |
306 | inst /lib/systemd/system/slices.target |
307 | inst /lib/systemd/system/system.slice |
308 | inst_multiple -o /lib/systemd/system/dracut* |
309 | @@ -98,7 +98,7 @@ |
310 | inst_multiple -o \ |
311 | /etc/machine-id \ |
312 | /etc/adjtime \ |
313 | - /etc/sysconfig/init \ |
314 | + /etc/conf.d/init \ |
315 | /etc/passwd \ |
316 | /etc/shadow \ |
317 | /etc/group \ |