Annotation of /trunk/dracut/patches/dracut-026-magellan.patch
Parent Directory | Revision Log
Revision 2116 -
(hide annotations)
(download)
Mon Mar 18 10:37:50 2013 UTC (11 years, 6 months ago) by niro
File size: 13405 byte(s)
Mon Mar 18 10:37:50 2013 UTC (11 years, 6 months ago) by niro
File size: 13405 byte(s)
-rediffed for 026
1 | niro | 2116 | diff -Naur dracut-026/dracut.conf.d/magellan.conf.example dracut-026-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-026/dracut.conf.d/magellan.conf.example 1970-01-01 00:00:00.000000000 +0000 | ||
3 | +++ dracut-026-magellan/dracut.conf.d/magellan.conf.example 2013-03-18 12:41:29.197000000 +0000 | ||
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/.* i2o_scsi' | ||
10 | +stdloglvl=3 | ||
11 | +logfile=/var/log/dracut.log | ||
12 | +fileloglvl=6 | ||
13 | +install_items+=" nano /etc/nanorc lsmod ps grep cat rm " | ||
14 | +prefix="/" | ||
15 | +systemdutildir=/usr/lib/systemd | ||
16 | +systemdsystemunitdir=/usr/lib/systemd/system | ||
17 | +udevdir=/usr/lib/udev | ||
18 | +omit_dracutmoduls+=" dash" | ||
19 | +add_dracutmodules+=" systemd " | ||
20 | diff -Naur dracut-026/Makefile dracut-026-magellan/Makefile | ||
21 | --- dracut-026/Makefile 2013-03-08 06:07:48.000000000 +0000 | ||
22 | +++ dracut-026-magellan/Makefile 2013-03-18 12:42:25.438000000 +0000 | ||
23 | @@ -93,6 +93,9 @@ | ||
24 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf | ||
25 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d | ||
26 | mkdir -p $(DESTDIR)$(pkglibdir)/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-026/modules.d/10i18n/console_init.sh dracut-026-magellan/modules.d/10i18n/console_init.sh | ||
34 | --- dracut-026/modules.d/10i18n/console_init.sh 2013-03-08 06:07:48.000000000 +0000 | ||
35 | +++ dracut-026-magellan/modules.d/10i18n/console_init.sh 2013-03-18 12:43:27.008000000 +0000 | ||
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-026/modules.d/40network/module-setup.sh dracut-026-magellan/modules.d/40network/module-setup.sh | ||
46 | --- dracut-026/modules.d/40network/module-setup.sh 2013-03-08 06:07:48.000000000 +0000 | ||
47 | +++ dracut-026-magellan/modules.d/40network/module-setup.sh 2013-03-18 12:43:47.745000000 +0000 | ||
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-026/modules.d/45ifcfg/write-ifcfg.sh dracut-026-magellan/modules.d/45ifcfg/write-ifcfg.sh | ||
58 | --- dracut-026/modules.d/45ifcfg/write-ifcfg.sh 2013-03-08 06:07:48.000000000 +0000 | ||
59 | +++ dracut-026-magellan/modules.d/45ifcfg/write-ifcfg.sh 2013-03-18 12:44:18.105000000 +0000 | ||
60 | @@ -230,13 +230,13 @@ | ||
61 | done | ||
62 | |||
63 | # Pass network opts | ||
64 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts | ||
65 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts | ||
66 | mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient | ||
67 | -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab | ||
68 | +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab | ||
69 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab | ||
70 | { | ||
71 | cp /tmp/net.* /run/initramfs/ | ||
72 | cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf | ||
73 | - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts | ||
74 | + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts | ||
75 | cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient | ||
76 | } > /dev/null 2>&1 | ||
77 | diff -Naur dracut-026/modules.d/80cms/cms-write-ifcfg.sh dracut-026-magellan/modules.d/80cms/cms-write-ifcfg.sh | ||
78 | --- dracut-026/modules.d/80cms/cms-write-ifcfg.sh 2013-03-08 06:07:48.000000000 +0000 | ||
79 | +++ dracut-026-magellan/modules.d/80cms/cms-write-ifcfg.sh 2013-03-18 12:45:00.705000000 +0000 | ||
80 | @@ -4,7 +4,7 @@ | ||
81 | |||
82 | type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh | ||
83 | |||
84 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts | ||
85 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts | ||
86 | |||
87 | function cms_write_config() | ||
88 | { | ||
89 | @@ -24,19 +24,19 @@ | ||
90 | |||
91 | uuid=$(cat /proc/sys/kernel/random/uuid) | ||
92 | |||
93 | - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE | ||
94 | + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE | ||
95 | |||
96 | strstr "$IPADDR" '*:*:*' && ipv6=1 | ||
97 | |||
98 | # to please NetworkManager on startup in loader before loader reconfigures net | ||
99 | - cat > /etc/sysconfig/network << EOF | ||
100 | + cat > /etc/conf.d/network << EOF | ||
101 | HOSTNAME=$HOSTNAME | ||
102 | EOF | ||
103 | echo "$HOSTNAME" > /etc/hostname | ||
104 | if [ "$ipv6" ]; then | ||
105 | - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network | ||
106 | + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network | ||
107 | else | ||
108 | - echo "NETWORKING=yes" >> /etc/sysconfig/network | ||
109 | + echo "NETWORKING=yes" >> /etc/conf.d/network | ||
110 | fi | ||
111 | |||
112 | cat > $IFCFGFILE << EOF | ||
113 | @@ -98,7 +98,7 @@ | ||
114 | unset optstr | ||
115 | unset DNS1 | ||
116 | unset DNS2 | ||
117 | - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab | ||
118 | + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab | ||
119 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab | ||
120 | } | ||
121 | |||
122 | diff -Naur dracut-026/modules.d/95rootfs-block/mount-root.sh dracut-026-magellan/modules.d/95rootfs-block/mount-root.sh | ||
123 | --- dracut-026/modules.d/95rootfs-block/mount-root.sh 2013-03-08 06:07:48.000000000 +0000 | ||
124 | +++ dracut-026-magellan/modules.d/95rootfs-block/mount-root.sh 2013-03-18 12:46:21.195000000 +0000 | ||
125 | @@ -35,8 +35,8 @@ | ||
126 | |||
127 | READONLY= | ||
128 | fsckoptions= | ||
129 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then | ||
130 | - . "$NEWROOT"/etc/sysconfig/readonly-root | ||
131 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then | ||
132 | + . "$NEWROOT"/etc/conf.d/readonly-root | ||
133 | fi | ||
134 | |||
135 | if getargbool 0 "readonlyroot=" -y readonlyroot; then | ||
136 | @@ -59,8 +59,8 @@ | ||
137 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then | ||
138 | fsckoptions="-f $fsckoptions" | ||
139 | elif [ -f "$NEWROOT"/.autofsck ]; then | ||
140 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \ | ||
141 | - . "$NEWROOT"/etc/sysconfig/autofsck | ||
142 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \ | ||
143 | + . "$NEWROOT"/etc/conf.d/autofsck | ||
144 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then | ||
145 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" | ||
146 | fi | ||
147 | diff -Naur dracut-026/modules.d/95udev-rules/module-setup.sh dracut-026-magellan/modules.d/95udev-rules/module-setup.sh | ||
148 | --- dracut-026/modules.d/95udev-rules/module-setup.sh 2013-03-08 06:07:48.000000000 +0000 | ||
149 | +++ dracut-026-magellan/modules.d/95udev-rules/module-setup.sh 2013-03-18 12:46:54.380000000 +0000 | ||
150 | @@ -75,6 +75,13 @@ | ||
151 | [ -f /etc/arch-release ] && \ | ||
152 | inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh | ||
153 | |||
154 | + # magellan uses a special modprobe script too | ||
155 | + if [ -f /etc/mageversion ] | ||
156 | + then | ||
157 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh | ||
158 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist | ||
159 | + fi | ||
160 | + | ||
161 | inst_libdir_file "libnss_files*" | ||
162 | |||
163 | } | ||
164 | diff -Naur dracut-026/modules.d/97masterkey/masterkey.sh dracut-026-magellan/modules.d/97masterkey/masterkey.sh | ||
165 | --- dracut-026/modules.d/97masterkey/masterkey.sh 2013-03-08 06:07:48.000000000 +0000 | ||
166 | +++ dracut-026-magellan/modules.d/97masterkey/masterkey.sh 2013-03-18 12:47:15.756000000 +0000 | ||
167 | @@ -8,7 +8,7 @@ | ||
168 | # TORSEC group -- http://security.polito.it | ||
169 | # Roberto Sassu <roberto.sassu@polito.it> | ||
170 | |||
171 | -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" | ||
172 | +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" | ||
173 | MULTIKERNELMODE="NO" | ||
174 | PCRLOCKNUM=11 | ||
175 | |||
176 | diff -Naur dracut-026/modules.d/97masterkey/README dracut-026-magellan/modules.d/97masterkey/README | ||
177 | --- dracut-026/modules.d/97masterkey/README 2013-03-08 06:07:48.000000000 +0000 | ||
178 | +++ dracut-026-magellan/modules.d/97masterkey/README 2013-03-18 12:47:29.836000000 +0000 | ||
179 | @@ -39,7 +39,7 @@ | ||
180 | MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" | ||
181 | -------------------------------------------------------------------------- | ||
182 | |||
183 | -2) create the configuration file '/etc/sysconfig/masterkey' to override the | ||
184 | +2) create the configuration file '/etc/conf.d/masterkey' to override the | ||
185 | value of one or all variables; | ||
186 | |||
187 | 3) specify these parameters in the kernel command line: | ||
188 | diff -Naur dracut-026/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-026-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh | ||
189 | --- dracut-026/modules.d/98ecryptfs/ecryptfs-mount.sh 2013-03-08 06:07:48.000000000 +0000 | ||
190 | +++ dracut-026-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2013-03-18 12:47:51.084000000 +0000 | ||
191 | @@ -8,7 +8,7 @@ | ||
192 | # TORSEC group -- http://security.polito.it | ||
193 | # Roberto Sassu <roberto.sassu@polito.it> | ||
194 | |||
195 | -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" | ||
196 | +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" | ||
197 | ECRYPTFSKEYTYPE="encrypted" | ||
198 | ECRYPTFSKEYDESC="1000100010001000" | ||
199 | ECRYPTFSKEYID="" | ||
200 | diff -Naur dracut-026/modules.d/98ecryptfs/README dracut-026-magellan/modules.d/98ecryptfs/README | ||
201 | --- dracut-026/modules.d/98ecryptfs/README 2013-03-08 06:07:48.000000000 +0000 | ||
202 | +++ dracut-026-magellan/modules.d/98ecryptfs/README 2013-03-18 12:48:09.797000000 +0000 | ||
203 | @@ -23,13 +23,13 @@ | ||
204 | ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" | ||
205 | -------------------------------------------------------------------------- | ||
206 | |||
207 | -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY | ||
208 | +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY | ||
209 | variable; | ||
210 | |||
211 | 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command | ||
212 | line. | ||
213 | |||
214 | -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify | ||
215 | +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify | ||
216 | # more options for mounting the eCryptfs filesystem: | ||
217 | |||
218 | ECRYPTFSSRCDIR: existent directory in the lower root filesystem; | ||
219 | @@ -39,7 +39,7 @@ | ||
220 | option is automatically added by the dracut script). | ||
221 | |||
222 | # Example of the configuration file: | ||
223 | ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- | ||
224 | +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- | ||
225 | ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" | ||
226 | ECRYPTFSSRCDIR="/secret" | ||
227 | ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" | ||
228 | diff -Naur dracut-026/modules.d/98integrity/evm-enable.sh dracut-026-magellan/modules.d/98integrity/evm-enable.sh | ||
229 | --- dracut-026/modules.d/98integrity/evm-enable.sh 2013-03-08 06:07:48.000000000 +0000 | ||
230 | +++ dracut-026-magellan/modules.d/98integrity/evm-enable.sh 2013-03-18 12:48:30.637000000 +0000 | ||
231 | @@ -9,7 +9,7 @@ | ||
232 | # Roberto Sassu <roberto.sassu@polito.it> | ||
233 | |||
234 | EVMSECFILE="${SECURITYFSDIR}/evm" | ||
235 | -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" | ||
236 | +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" | ||
237 | EVMKEYDESC="evm-key" | ||
238 | EVMKEYTYPE="encrypted" | ||
239 | EVMKEYID="" | ||
240 | diff -Naur dracut-026/modules.d/98integrity/ima-policy-load.sh dracut-026-magellan/modules.d/98integrity/ima-policy-load.sh | ||
241 | --- dracut-026/modules.d/98integrity/ima-policy-load.sh 2013-03-08 06:07:48.000000000 +0000 | ||
242 | +++ dracut-026-magellan/modules.d/98integrity/ima-policy-load.sh 2013-03-18 12:49:15.423000000 +0000 | ||
243 | @@ -9,8 +9,8 @@ | ||
244 | # Roberto Sassu <roberto.sassu@polito.it> | ||
245 | |||
246 | IMASECDIR="${SECURITYFSDIR}/ima" | ||
247 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" | ||
248 | -IMAPOLICY="/etc/sysconfig/ima-policy" | ||
249 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" | ||
250 | +IMAPOLICY="/etc/conf.d/ima-policy" | ||
251 | |||
252 | load_ima_policy() | ||
253 | { | ||
254 | diff -Naur dracut-026/modules.d/98integrity/README dracut-026-magellan/modules.d/98integrity/README | ||
255 | --- dracut-026/modules.d/98integrity/README 2013-03-08 06:07:48.000000000 +0000 | ||
256 | +++ dracut-026-magellan/modules.d/98integrity/README 2013-03-18 12:48:53.094000000 +0000 | ||
257 | @@ -20,7 +20,7 @@ | ||
258 | EVMKEY="/etc/keys/evm-trusted.blob" | ||
259 | -------------------------------------------------------------------------- | ||
260 | |||
261 | -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; | ||
262 | +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; | ||
263 | |||
264 | 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command | ||
265 | line. | ||
266 | @@ -33,8 +33,8 @@ | ||
267 | |||
268 | # Save the policy in a file. | ||
269 | |||
270 | -# Create the configuration file '/etc/sysconfig/ima' to override the path name of | ||
271 | +# Create the configuration file '/etc/conf.d/ima' to override the path name of | ||
272 | # the IMA custom policy. | ||
273 | -------------- '/etc/sysconfig/ima' (with the default value) ------------- | ||
274 | -IMAPOLICY="/etc/sysconfig/ima-policy" | ||
275 | +------------- '/etc/conf.d/ima' (with the default value) ------------- | ||
276 | +IMAPOLICY="/etc/conf.d/ima-policy" | ||
277 | ------------------------------------------------------------------------- | ||
278 | diff -Naur dracut-026/modules.d/98usrmount/mount-usr.sh dracut-026-magellan/modules.d/98usrmount/mount-usr.sh | ||
279 | --- dracut-026/modules.d/98usrmount/mount-usr.sh 2013-03-08 06:07:48.000000000 +0000 | ||
280 | +++ dracut-026-magellan/modules.d/98usrmount/mount-usr.sh 2013-03-18 12:49:44.927000000 +0000 | ||
281 | @@ -34,7 +34,7 @@ | ||
282 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then | ||
283 | _fsckoptions="-f $_fsckoptions" | ||
284 | elif [ -f "$NEWROOT"/.autofsck ]; then | ||
285 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck | ||
286 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck | ||
287 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then | ||
288 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" | ||
289 | fi |