Contents of /trunk/dracut/patches/dracut-023-magellan-2.patch
Parent Directory | Revision Log
Revision 1878 -
(show annotations)
(download)
Thu Aug 16 13:24:52 2012 UTC (12 years, 1 month ago) by niro
File size: 14446 byte(s)
Thu Aug 16 13:24:52 2012 UTC (12 years, 1 month ago) by niro
File size: 14446 byte(s)
-disabled systemd inclusion and omit dash
1 | diff -Naur dracut-023/dracut.conf.d/magellan.conf.example dracut-023-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-023/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 |
3 | +++ dracut-023-magellan/dracut.conf.d/magellan.conf.example 2012-08-16 17:22:26.386978889 +0200 |
4 | @@ -0,0 +1,15 @@ |
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 | +omit_drivers+=" .*/fs/ocfs/.* " |
10 | +stdloglvl=3 |
11 | +install_items+=" nano /etc/nanorc lsmod ps grep cat rm " |
12 | +prefix="/" |
13 | +systemdutildir=/usr/lib/systemd |
14 | +systemdsystemunitdir=/usr/lib/systemd/system |
15 | +udevdir=/usr/lib/udev |
16 | +omit_dracutmodules+=" dash " |
17 | +# disabled not working with current systemd-188 |
18 | +#add_dracutmodules+=" systemd " |
19 | +realinitpath="/usr/lib/systemd/systemd" |
20 | diff -Naur dracut-023/Makefile dracut-023-magellan/Makefile |
21 | --- dracut-023/Makefile 2012-08-01 15:30:30.000000000 +0200 |
22 | +++ dracut-023-magellan/Makefile 2012-08-16 17:21:17.549980324 +0200 |
23 | @@ -86,6 +86,9 @@ |
24 | install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd |
25 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf |
26 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d |
27 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf |
28 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d |
29 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut |
30 | install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh |
31 | install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh |
32 | ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions |
33 | diff -Naur dracut-023/modules.d/10i18n/console_init.sh dracut-023-magellan/modules.d/10i18n/console_init.sh |
34 | --- dracut-023/modules.d/10i18n/console_init.sh 2012-08-01 15:30:30.000000000 +0200 |
35 | +++ dracut-023-magellan/modules.d/10i18n/console_init.sh 2012-08-16 17:21:17.549980324 +0200 |
36 | @@ -11,7 +11,7 @@ |
37 | [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf |
38 | |
39 | DEFAULT_FONT=LatArCyrHeb-16 |
40 | -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap |
41 | +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap |
42 | |
43 | set_keyboard() { |
44 | local param |
45 | diff -Naur dracut-023/modules.d/40network/module-setup.sh dracut-023-magellan/modules.d/40network/module-setup.sh |
46 | --- dracut-023/modules.d/40network/module-setup.sh 2012-08-01 15:30:30.000000000 +0200 |
47 | +++ dracut-023-magellan/modules.d/40network/module-setup.sh 2012-08-16 17:21:17.549980324 +0200 |
48 | @@ -16,7 +16,7 @@ |
49 | } |
50 | |
51 | depends() { |
52 | - [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg |
53 | + [ -d /etc/conf.d/network-scripts/ ] && echo ifcfg |
54 | return 0 |
55 | } |
56 | |
57 | diff -Naur dracut-023/modules.d/40uvesafb/module-setup.sh dracut-023-magellan/modules.d/40uvesafb/module-setup.sh |
58 | --- dracut-023/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 |
59 | +++ dracut-023-magellan/modules.d/40uvesafb/module-setup.sh 2012-08-16 17:21:17.549980324 +0200 |
60 | @@ -0,0 +1,19 @@ |
61 | +#!/bin/sh |
62 | + |
63 | +check() { |
64 | + [ -x /sbin/v86d ] |
65 | +} |
66 | + |
67 | +depends() { |
68 | + return 0 |
69 | +} |
70 | + |
71 | +installkernel() { |
72 | + hostonly='' instmods uvesafb |
73 | +} |
74 | + |
75 | +install() { |
76 | + dracut_install /sbin/v86d |
77 | + inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh |
78 | +} |
79 | + |
80 | diff -Naur dracut-023/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-023-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh |
81 | --- dracut-023/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100 |
82 | +++ dracut-023-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-08-16 17:21:17.549980324 +0200 |
83 | @@ -0,0 +1,6 @@ |
84 | +#!/bin/sh |
85 | + |
86 | +if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then |
87 | + [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb |
88 | +fi |
89 | + |
90 | diff -Naur dracut-023/modules.d/45ifcfg/write-ifcfg.sh dracut-023-magellan/modules.d/45ifcfg/write-ifcfg.sh |
91 | --- dracut-023/modules.d/45ifcfg/write-ifcfg.sh 2012-08-01 15:30:30.000000000 +0200 |
92 | +++ dracut-023-magellan/modules.d/45ifcfg/write-ifcfg.sh 2012-08-16 17:21:17.549980324 +0200 |
93 | @@ -227,13 +227,13 @@ |
94 | done |
95 | |
96 | # Pass network opts |
97 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts |
98 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts |
99 | mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient |
100 | -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab |
101 | +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab |
102 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab |
103 | { |
104 | cp /tmp/net.* /run/initramfs/ |
105 | cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf |
106 | - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts |
107 | + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts |
108 | cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient |
109 | } > /dev/null 2>&1 |
110 | diff -Naur dracut-023/modules.d/80cms/cms-write-ifcfg.sh dracut-023-magellan/modules.d/80cms/cms-write-ifcfg.sh |
111 | --- dracut-023/modules.d/80cms/cms-write-ifcfg.sh 2012-08-01 15:30:30.000000000 +0200 |
112 | +++ dracut-023-magellan/modules.d/80cms/cms-write-ifcfg.sh 2012-08-16 17:21:17.549980324 +0200 |
113 | @@ -4,7 +4,7 @@ |
114 | |
115 | type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh |
116 | |
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 | |
120 | function cms_write_config() |
121 | { |
122 | @@ -24,18 +24,18 @@ |
123 | |
124 | uuid=$(cat /proc/sys/kernel/random/uuid) |
125 | |
126 | - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE |
127 | + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE |
128 | |
129 | strstr "$IPADDR" '*:*:*' && ipv6=1 |
130 | |
131 | # to please NetworkManager on startup in loader before loader reconfigures net |
132 | - cat > /etc/sysconfig/network << EOF |
133 | + cat > /etc/conf.d/network << EOF |
134 | HOSTNAME=$HOSTNAME |
135 | EOF |
136 | if [ "$ipv6" ]; then |
137 | - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network |
138 | + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network |
139 | else |
140 | - echo "NETWORKING=yes" >> /etc/sysconfig/network |
141 | + echo "NETWORKING=yes" >> /etc/conf.d/network |
142 | fi |
143 | |
144 | cat > $IFCFGFILE << EOF |
145 | @@ -97,7 +97,7 @@ |
146 | unset optstr |
147 | unset DNS1 |
148 | unset DNS2 |
149 | - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab |
150 | + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab |
151 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab |
152 | } |
153 | |
154 | diff -Naur dracut-023/modules.d/95rootfs-block/mount-root.sh dracut-023-magellan/modules.d/95rootfs-block/mount-root.sh |
155 | --- dracut-023/modules.d/95rootfs-block/mount-root.sh 2012-08-01 15:30:30.000000000 +0200 |
156 | +++ dracut-023-magellan/modules.d/95rootfs-block/mount-root.sh 2012-08-16 17:21:17.550980377 +0200 |
157 | @@ -34,8 +34,8 @@ |
158 | |
159 | READONLY= |
160 | fsckoptions= |
161 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then |
162 | - . "$NEWROOT"/etc/sysconfig/readonly-root |
163 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then |
164 | + . "$NEWROOT"/etc/conf.d/readonly-root |
165 | fi |
166 | |
167 | if getargbool 0 "readonlyroot=" -y readonlyroot; then |
168 | @@ -58,8 +58,8 @@ |
169 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
170 | fsckoptions="-f $fsckoptions" |
171 | elif [ -f "$NEWROOT"/.autofsck ]; then |
172 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \ |
173 | - . "$NEWROOT"/etc/sysconfig/autofsck |
174 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \ |
175 | + . "$NEWROOT"/etc/conf.d/autofsck |
176 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
177 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
178 | fi |
179 | diff -Naur dracut-023/modules.d/95udev-rules/module-setup.sh dracut-023-magellan/modules.d/95udev-rules/module-setup.sh |
180 | --- dracut-023/modules.d/95udev-rules/module-setup.sh 2012-08-01 15:30:30.000000000 +0200 |
181 | +++ dracut-023-magellan/modules.d/95udev-rules/module-setup.sh 2012-08-16 17:21:17.550980377 +0200 |
182 | @@ -54,6 +54,13 @@ |
183 | [ -f /etc/arch-release ] && \ |
184 | inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh |
185 | |
186 | + # magellan uses a special modprobe script too |
187 | + if [ -f /etc/mageversion ] |
188 | + then |
189 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh |
190 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist |
191 | + fi |
192 | + |
193 | inst_libdir_file "libnss_files*" |
194 | } |
195 | |
196 | diff -Naur dracut-023/modules.d/97masterkey/masterkey.sh dracut-023-magellan/modules.d/97masterkey/masterkey.sh |
197 | --- dracut-023/modules.d/97masterkey/masterkey.sh 2012-08-01 15:30:30.000000000 +0200 |
198 | +++ dracut-023-magellan/modules.d/97masterkey/masterkey.sh 2012-08-16 17:21:17.550980377 +0200 |
199 | @@ -8,7 +8,7 @@ |
200 | # TORSEC group -- http://security.polito.it |
201 | # Roberto Sassu <roberto.sassu@polito.it> |
202 | |
203 | -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" |
204 | +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" |
205 | MULTIKERNELMODE="NO" |
206 | PCRLOCKNUM=11 |
207 | |
208 | diff -Naur dracut-023/modules.d/97masterkey/README dracut-023-magellan/modules.d/97masterkey/README |
209 | --- dracut-023/modules.d/97masterkey/README 2012-08-01 15:30:30.000000000 +0200 |
210 | +++ dracut-023-magellan/modules.d/97masterkey/README 2012-08-16 17:21:17.550980377 +0200 |
211 | @@ -39,7 +39,7 @@ |
212 | MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" |
213 | -------------------------------------------------------------------------- |
214 | |
215 | -2) create the configuration file '/etc/sysconfig/masterkey' to override the |
216 | +2) create the configuration file '/etc/conf.d/masterkey' to override the |
217 | value of one or all variables; |
218 | |
219 | 3) specify these parameters in the kernel command line: |
220 | diff -Naur dracut-023/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-023-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh |
221 | --- dracut-023/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-08-01 15:30:30.000000000 +0200 |
222 | +++ dracut-023-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-08-16 17:21:17.550980377 +0200 |
223 | @@ -8,7 +8,7 @@ |
224 | # TORSEC group -- http://security.polito.it |
225 | # Roberto Sassu <roberto.sassu@polito.it> |
226 | |
227 | -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" |
228 | +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" |
229 | ECRYPTFSKEYTYPE="encrypted" |
230 | ECRYPTFSKEYDESC="1000100010001000" |
231 | ECRYPTFSKEYID="" |
232 | diff -Naur dracut-023/modules.d/98ecryptfs/README dracut-023-magellan/modules.d/98ecryptfs/README |
233 | --- dracut-023/modules.d/98ecryptfs/README 2012-08-01 15:30:30.000000000 +0200 |
234 | +++ dracut-023-magellan/modules.d/98ecryptfs/README 2012-08-16 17:21:17.550980377 +0200 |
235 | @@ -23,13 +23,13 @@ |
236 | ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" |
237 | -------------------------------------------------------------------------- |
238 | |
239 | -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY |
240 | +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY |
241 | variable; |
242 | |
243 | 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command |
244 | line. |
245 | |
246 | -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify |
247 | +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify |
248 | # more options for mounting the eCryptfs filesystem: |
249 | |
250 | ECRYPTFSSRCDIR: existent directory in the lower root filesystem; |
251 | @@ -39,7 +39,7 @@ |
252 | option is automatically added by the dracut script). |
253 | |
254 | # Example of the configuration file: |
255 | ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- |
256 | +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- |
257 | ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" |
258 | ECRYPTFSSRCDIR="/secret" |
259 | ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" |
260 | diff -Naur dracut-023/modules.d/98integrity/evm-enable.sh dracut-023-magellan/modules.d/98integrity/evm-enable.sh |
261 | --- dracut-023/modules.d/98integrity/evm-enable.sh 2012-08-01 15:30:30.000000000 +0200 |
262 | +++ dracut-023-magellan/modules.d/98integrity/evm-enable.sh 2012-08-16 17:21:17.550980377 +0200 |
263 | @@ -9,7 +9,7 @@ |
264 | # Roberto Sassu <roberto.sassu@polito.it> |
265 | |
266 | EVMSECFILE="${SECURITYFSDIR}/evm" |
267 | -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" |
268 | +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" |
269 | EVMKEYDESC="evm-key" |
270 | EVMKEYTYPE="encrypted" |
271 | EVMKEYID="" |
272 | diff -Naur dracut-023/modules.d/98integrity/ima-policy-load.sh dracut-023-magellan/modules.d/98integrity/ima-policy-load.sh |
273 | --- dracut-023/modules.d/98integrity/ima-policy-load.sh 2012-08-01 15:30:30.000000000 +0200 |
274 | +++ dracut-023-magellan/modules.d/98integrity/ima-policy-load.sh 2012-08-16 17:21:17.550980377 +0200 |
275 | @@ -9,8 +9,8 @@ |
276 | # Roberto Sassu <roberto.sassu@polito.it> |
277 | |
278 | IMASECDIR="${SECURITYFSDIR}/ima" |
279 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" |
280 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
281 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" |
282 | +IMAPOLICY="/etc/conf.d/ima-policy" |
283 | |
284 | load_ima_policy() |
285 | { |
286 | diff -Naur dracut-023/modules.d/98integrity/README dracut-023-magellan/modules.d/98integrity/README |
287 | --- dracut-023/modules.d/98integrity/README 2012-08-01 15:30:30.000000000 +0200 |
288 | +++ dracut-023-magellan/modules.d/98integrity/README 2012-08-16 17:21:17.551980426 +0200 |
289 | @@ -20,7 +20,7 @@ |
290 | EVMKEY="/etc/keys/evm-trusted.blob" |
291 | -------------------------------------------------------------------------- |
292 | |
293 | -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; |
294 | +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; |
295 | |
296 | 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command |
297 | line. |
298 | @@ -33,8 +33,8 @@ |
299 | |
300 | # Save the policy in a file. |
301 | |
302 | -# Create the configuration file '/etc/sysconfig/ima' to override the path name of |
303 | +# Create the configuration file '/etc/conf.d/ima' to override the path name of |
304 | # the IMA custom policy. |
305 | -------------- '/etc/sysconfig/ima' (with the default value) ------------- |
306 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
307 | +------------- '/etc/conf.d/ima' (with the default value) ------------- |
308 | +IMAPOLICY="/etc/conf.d/ima-policy" |
309 | ------------------------------------------------------------------------- |
310 | diff -Naur dracut-023/modules.d/98usrmount/mount-usr.sh dracut-023-magellan/modules.d/98usrmount/mount-usr.sh |
311 | --- dracut-023/modules.d/98usrmount/mount-usr.sh 2012-08-01 15:30:30.000000000 +0200 |
312 | +++ dracut-023-magellan/modules.d/98usrmount/mount-usr.sh 2012-08-16 17:21:17.551980426 +0200 |
313 | @@ -19,7 +19,7 @@ |
314 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
315 | _fsckoptions="-f $_fsckoptions" |
316 | elif [ -f "$NEWROOT"/.autofsck ]; then |
317 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck |
318 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck |
319 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
320 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
321 | fi |