Contents of /trunk/dracut/patches/dracut-017-magellan.patch
Parent Directory | Revision Log
Revision 1674 -
(show annotations)
(download)
Sat Mar 3 11:20:09 2012 UTC (12 years, 6 months ago) by niro
File size: 14066 byte(s)
Sat Mar 3 11:20:09 2012 UTC (12 years, 6 months ago) by niro
File size: 14066 byte(s)
-refactor patches
1 | diff -Naur dracut-017/dracut.conf.d/magellan.conf.example dracut-017-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-017/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 |
3 | +++ dracut-017-magellan/dracut.conf.d/magellan.conf.example 2012-03-03 12:34:18.445982387 +0100 |
4 | @@ -0,0 +1,9 @@ |
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_dracutmodules+=" dash " |
10 | +omit_drivers+=" .*/fs/ocfs/.* " |
11 | +stdloglvl=3 |
12 | +realinitpath="/usr/lib/systemd/systemd" |
13 | +install_items+=" nano /etc/nanorc lsmod ps grep cat rm openvt " |
14 | diff -Naur dracut-017/dracut-gencmdline.sh dracut-017-magellan/dracut-gencmdline.sh |
15 | --- dracut-017/dracut-gencmdline.sh 2012-02-24 15:38:08.000000000 +0100 |
16 | +++ dracut-017-magellan/dracut-gencmdline.sh 2012-03-03 12:36:49.676982386 +0100 |
17 | @@ -103,7 +103,7 @@ |
18 | LD_SO_CONF=/etc/ld.so.conf |
19 | LD_SO_CONF_D=/etc/ld.so.conf.d/ |
20 | |
21 | -[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd |
22 | +[ -e /etc/conf.d/mkinitrd ] && . /etc/conf.d/mkinitrd |
23 | |
24 | CONFMODS="$MODULES" |
25 | MODULES="" |
26 | @@ -599,6 +599,9 @@ |
27 | shift |
28 | done |
29 | |
30 | +# HACK: always pass a kernel version |
31 | +[ -z "$kernel" ] && kernel=$(uname -r) |
32 | + |
33 | [ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab) |
34 | [ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab) |
35 | [ -z "$rootopts" ] && rootopts="defaults" |
36 | @@ -697,8 +700,10 @@ |
37 | fi |
38 | |
39 | # output local keyboard/18n settings |
40 | -[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard |
41 | -[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n |
42 | +[ -e /etc/conf.d/keymap ] && . /etc/conf.d/keymap |
43 | +[ -e /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont |
44 | +[ -n "$KEYMAP" ] && KEYTABLE="$KEYMAP" |
45 | +[ -n "$CONSOLEFONT" ] && SYSFONT="$CONSOLEFONT" |
46 | |
47 | for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do |
48 | val=$(eval echo \$$i) |
49 | diff -Naur dracut-017/Makefile dracut-017-magellan/Makefile |
50 | --- dracut-017/Makefile 2012-02-24 15:38:08.000000000 +0100 |
51 | +++ dracut-017-magellan/Makefile 2012-03-03 12:38:21.347982387 +0100 |
52 | @@ -38,6 +38,9 @@ |
53 | install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd |
54 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf |
55 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d |
56 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf |
57 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d |
58 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut |
59 | install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh |
60 | ln -s dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions |
61 | install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh |
62 | diff -Naur dracut-017/modules.d/10i18n/console_init.sh dracut-017-magellan/modules.d/10i18n/console_init.sh |
63 | --- dracut-017/modules.d/10i18n/console_init.sh 2012-02-24 15:38:08.000000000 +0100 |
64 | +++ dracut-017-magellan/modules.d/10i18n/console_init.sh 2012-03-03 12:48:37.520982386 +0100 |
65 | @@ -5,7 +5,7 @@ |
66 | [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf |
67 | |
68 | DEFAULT_FONT=LatArCyrHeb-16 |
69 | -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap |
70 | +DEFAULT_KEYMAP=/etc/conf.d/console.kmap |
71 | |
72 | set_keyboard() { |
73 | local param |
74 | diff -Naur dracut-017/modules.d/40network/module-setup.sh dracut-017-magellan/modules.d/40network/module-setup.sh |
75 | --- dracut-017/modules.d/40network/module-setup.sh 2012-02-24 15:38:08.000000000 +0100 |
76 | +++ dracut-017-magellan/modules.d/40network/module-setup.sh 2012-03-03 12:49:32.537982386 +0100 |
77 | @@ -17,7 +17,7 @@ |
78 | } |
79 | |
80 | depends() { |
81 | - [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg |
82 | + [ -d /etc/conf.d/network-scripts/ ] && echo ifcfg |
83 | return 0 |
84 | } |
85 | |
86 | diff -Naur dracut-017/modules.d/40uvesafb/module-setup.sh dracut-017-magellan/modules.d/40uvesafb/module-setup.sh |
87 | --- dracut-017/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 |
88 | +++ dracut-017-magellan/modules.d/40uvesafb/module-setup.sh 2012-03-03 12:39:20.578982387 +0100 |
89 | @@ -0,0 +1,18 @@ |
90 | +#!/bin/bash |
91 | + |
92 | +check() { |
93 | + [ -x /sbin/v86d ] |
94 | +} |
95 | + |
96 | +depends() { |
97 | + return 0 |
98 | +} |
99 | + |
100 | +installkernel() { |
101 | + hostonly='' instmods uvesafb |
102 | +} |
103 | + |
104 | +install() { |
105 | + dracut_install /sbin/v86d |
106 | + inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh |
107 | +} |
108 | diff -Naur dracut-017/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-017-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh |
109 | --- dracut-017/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100 |
110 | +++ dracut-017-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-03-03 12:39:53.288982385 +0100 |
111 | @@ -0,0 +1,5 @@ |
112 | +#!/bin/sh |
113 | + |
114 | +if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then |
115 | + [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb |
116 | +fi |
117 | diff -Naur dracut-017/modules.d/45ifcfg/write-ifcfg.sh dracut-017-magellan/modules.d/45ifcfg/write-ifcfg.sh |
118 | --- dracut-017/modules.d/45ifcfg/write-ifcfg.sh 2012-02-24 15:38:08.000000000 +0100 |
119 | +++ dracut-017-magellan/modules.d/45ifcfg/write-ifcfg.sh 2012-03-03 12:59:55.432982384 +0100 |
120 | @@ -136,9 +136,9 @@ |
121 | # Pass network opts |
122 | [ -d /run/initramfs ] || mkdir -m 0755 -p /run/initramfs |
123 | cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1 |
124 | -for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/sysconfig /run/initramfs/state/etc/sysconfig/network-scripts; do |
125 | +for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/conf.d /run/initramfs/state/etc/conf.d/network-scripts; do |
126 | [ -d $i ] || mkdir -m 0755 -p $i |
127 | done |
128 | cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1 |
129 | -echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab |
130 | -cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1 |
131 | +echo "files /etc/conf.d/network-scripts" > /run/initramfs/rwtab |
132 | +cp -a -t /run/initramfs/state/etc/conf.d/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1 |
133 | diff -Naur dracut-017/modules.d/95rootfs-block/mount-root.sh dracut-017-magellan/modules.d/95rootfs-block/mount-root.sh |
134 | --- dracut-017/modules.d/95rootfs-block/mount-root.sh 2012-02-24 15:38:08.000000000 +0100 |
135 | +++ dracut-017-magellan/modules.d/95rootfs-block/mount-root.sh 2012-03-03 12:54:31.720982386 +0100 |
136 | @@ -34,8 +34,8 @@ |
137 | |
138 | READONLY= |
139 | fsckoptions= |
140 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then |
141 | - . "$NEWROOT"/etc/sysconfig/readonly-root |
142 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then |
143 | + . "$NEWROOT"/etc/conf.d/readonly-root |
144 | fi |
145 | |
146 | if getargbool 0 "readonlyroot=" -y readonlyroot; then |
147 | @@ -57,7 +57,7 @@ |
148 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
149 | fsckoptions="-f $fsckoptions" |
150 | elif [ -f "$NEWROOT"/.autofsck ]; then |
151 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck |
152 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck |
153 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
154 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
155 | fi |
156 | diff -Naur dracut-017/modules.d/95udev-rules/module-setup.sh dracut-017-magellan/modules.d/95udev-rules/module-setup.sh |
157 | --- dracut-017/modules.d/95udev-rules/module-setup.sh 2012-02-24 15:38:08.000000000 +0100 |
158 | +++ dracut-017-magellan/modules.d/95udev-rules/module-setup.sh 2012-03-03 12:41:03.484982385 +0100 |
159 | @@ -74,6 +74,13 @@ |
160 | [ -f /etc/arch-release ] && \ |
161 | inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh |
162 | |
163 | + # magellan uses a special modprobe script too |
164 | + if [ -f /etc/mageversion ] |
165 | + then |
166 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh |
167 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist |
168 | + fi |
169 | + |
170 | for _i in {"$libdir","$usrlibdir"}/libnss_files*; do |
171 | [ -e "$_i" ] && dracut_install "$_i" |
172 | done |
173 | diff -Naur dracut-017/modules.d/97masterkey/masterkey.sh dracut-017-magellan/modules.d/97masterkey/masterkey.sh |
174 | --- dracut-017/modules.d/97masterkey/masterkey.sh 2012-02-24 15:38:08.000000000 +0100 |
175 | +++ dracut-017-magellan/modules.d/97masterkey/masterkey.sh 2012-03-03 12:53:23.653982386 +0100 |
176 | @@ -8,7 +8,7 @@ |
177 | # TORSEC group -- http://security.polito.it |
178 | # Roberto Sassu <roberto.sassu@polito.it> |
179 | |
180 | -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" |
181 | +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" |
182 | MULTIKERNELMODE="NO" |
183 | PCRLOCKNUM=11 |
184 | |
185 | diff -Naur dracut-017/modules.d/97masterkey/README dracut-017-magellan/modules.d/97masterkey/README |
186 | --- dracut-017/modules.d/97masterkey/README 2012-02-24 15:38:08.000000000 +0100 |
187 | +++ dracut-017-magellan/modules.d/97masterkey/README 2012-03-03 12:52:54.289982386 +0100 |
188 | @@ -39,7 +39,7 @@ |
189 | MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" |
190 | -------------------------------------------------------------------------- |
191 | |
192 | -2) create the configuration file '/etc/sysconfig/masterkey' to override the |
193 | +2) create the configuration file '/etc/conf.d/masterkey' to override the |
194 | value of one or all variables; |
195 | |
196 | 3) specify these parameters in the kernel command line: |
197 | diff -Naur dracut-017/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-017-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh |
198 | --- dracut-017/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-02-24 15:38:08.000000000 +0100 |
199 | +++ dracut-017-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-03-03 12:55:44.499982387 +0100 |
200 | @@ -8,7 +8,7 @@ |
201 | # TORSEC group -- http://security.polito.it |
202 | # Roberto Sassu <roberto.sassu@polito.it> |
203 | |
204 | -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" |
205 | +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" |
206 | ECRYPTFSKEYTYPE="encrypted" |
207 | ECRYPTFSKEYDESC="1000100010001000" |
208 | ECRYPTFSKEYID="" |
209 | diff -Naur dracut-017/modules.d/98ecryptfs/README dracut-017-magellan/modules.d/98ecryptfs/README |
210 | --- dracut-017/modules.d/98ecryptfs/README 2012-02-24 15:38:08.000000000 +0100 |
211 | +++ dracut-017-magellan/modules.d/98ecryptfs/README 2012-03-03 12:56:18.720982386 +0100 |
212 | @@ -23,13 +23,13 @@ |
213 | ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" |
214 | -------------------------------------------------------------------------- |
215 | |
216 | -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY |
217 | +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY |
218 | variable; |
219 | |
220 | 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command |
221 | line. |
222 | |
223 | -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify |
224 | +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify |
225 | # more options for mounting the eCryptfs filesystem: |
226 | |
227 | ECRYPTFSSRCDIR: existent directory in the lower root filesystem; |
228 | @@ -39,7 +39,7 @@ |
229 | option is automatically added by the dracut script). |
230 | |
231 | # Example of the configuration file: |
232 | ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- |
233 | +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- |
234 | ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" |
235 | ECRYPTFSSRCDIR="/secret" |
236 | ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" |
237 | diff -Naur dracut-017/modules.d/98integrity/evm-enable.sh dracut-017-magellan/modules.d/98integrity/evm-enable.sh |
238 | --- dracut-017/modules.d/98integrity/evm-enable.sh 2012-02-24 15:38:08.000000000 +0100 |
239 | +++ dracut-017-magellan/modules.d/98integrity/evm-enable.sh 2012-03-03 12:57:35.482982387 +0100 |
240 | @@ -9,7 +9,7 @@ |
241 | # Roberto Sassu <roberto.sassu@polito.it> |
242 | |
243 | EVMSECFILE="${SECURITYFSDIR}/evm" |
244 | -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" |
245 | +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" |
246 | EVMKEYDESC="evm-key" |
247 | EVMKEYTYPE="encrypted" |
248 | EVMKEYID="" |
249 | diff -Naur dracut-017/modules.d/98integrity/ima-policy-load.sh dracut-017-magellan/modules.d/98integrity/ima-policy-load.sh |
250 | --- dracut-017/modules.d/98integrity/ima-policy-load.sh 2012-02-24 15:38:08.000000000 +0100 |
251 | +++ dracut-017-magellan/modules.d/98integrity/ima-policy-load.sh 2012-03-03 12:56:42.959982385 +0100 |
252 | @@ -9,8 +9,8 @@ |
253 | # Roberto Sassu <roberto.sassu@polito.it> |
254 | |
255 | IMASECDIR="${SECURITYFSDIR}/ima" |
256 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" |
257 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
258 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" |
259 | +IMAPOLICY="/etc/conf.d/ima-policy" |
260 | |
261 | load_ima_policy() |
262 | { |
263 | diff -Naur dracut-017/modules.d/98integrity/README dracut-017-magellan/modules.d/98integrity/README |
264 | --- dracut-017/modules.d/98integrity/README 2012-02-24 15:38:08.000000000 +0100 |
265 | +++ dracut-017-magellan/modules.d/98integrity/README 2012-03-03 12:57:14.624982386 +0100 |
266 | @@ -20,7 +20,7 @@ |
267 | EVMKEY="/etc/keys/evm-trusted.blob" |
268 | -------------------------------------------------------------------------- |
269 | |
270 | -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; |
271 | +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; |
272 | |
273 | 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command |
274 | line. |
275 | @@ -33,8 +33,8 @@ |
276 | |
277 | # Save the policy in a file. |
278 | |
279 | -# Create the configuration file '/etc/sysconfig/ima' to override the path name of |
280 | +# Create the configuration file '/etc/conf.d/ima' to override the path name of |
281 | # the IMA custom policy. |
282 | -------------- '/etc/sysconfig/ima' (with the default value) ------------- |
283 | -IMAPOLICY="/etc/sysconfig/ima-policy" |
284 | +------------- '/etc/conf.d/ima' (with the default value) ------------- |
285 | +IMAPOLICY="/etc/conf.d/ima-policy" |
286 | ------------------------------------------------------------------------- |
287 | diff -Naur dracut-017/modules.d/98usrmount/mount-usr.sh dracut-017-magellan/modules.d/98usrmount/mount-usr.sh |
288 | --- dracut-017/modules.d/98usrmount/mount-usr.sh 2012-02-24 15:38:08.000000000 +0100 |
289 | +++ dracut-017-magellan/modules.d/98usrmount/mount-usr.sh 2012-03-03 12:58:02.266982386 +0100 |
290 | @@ -18,7 +18,7 @@ |
291 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then |
292 | _fsckoptions="-f $_fsckoptions" |
293 | elif [ -f "$NEWROOT"/.autofsck ]; then |
294 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck |
295 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck |
296 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then |
297 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" |
298 | fi |