Annotation of /trunk/dracut/patches/dracut-024-magellan.patch
Parent Directory | Revision Log
Revision 1924 -
(hide annotations)
(download)
Sun Oct 28 18:31:42 2012 UTC (11 years, 11 months ago) by niro
File size: 32532 byte(s)
Sun Oct 28 18:31:42 2012 UTC (11 years, 11 months ago) by niro
File size: 32532 byte(s)
-split off uvesafb module into an own patch, enable systemd module by default as it works with >=systemd-195 and added a hint about rd.auto=1
1 | niro | 1924 | diff -Naur dracut-024/dracut.conf.d/magellan.conf.example dracut-024-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-024/dracut.conf.d/magellan.conf.example 1970-01-01 00:00:00.000000000 +0000 | ||
3 | +++ dracut-024-magellan/dracut.conf.d/magellan.conf.example 2012-10-28 20:30:59.611513461 +0000 | ||
4 | @@ -0,0 +1,17 @@ | ||
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 | +add_dracutmodules+=" systemd " | ||
18 | +realinitpath="/usr/lib/systemd/systemd" | ||
19 | +# Uncomment this to enable autoassembly of special devices like cryptoLUKS, | ||
20 | +# dmraid, mdraid or lvm. Default is off as of dracut version >= 024. | ||
21 | +#kernelcmdline+=" rd.auto=1 " | ||
22 | diff -Naur dracut-024/Makefile dracut-024-magellan/Makefile | ||
23 | --- dracut-024/Makefile 2012-10-16 14:31:06.000000000 +0000 | ||
24 | +++ dracut-024-magellan/Makefile 2012-10-28 20:26:49.476412946 +0000 | ||
25 | @@ -91,6 +91,9 @@ | ||
26 | install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd | ||
27 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf | ||
28 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d | ||
29 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf | ||
30 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d | ||
31 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut | ||
32 | install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh | ||
33 | install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh | ||
34 | ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions | ||
35 | diff -Naur dracut-024/Makefile.orig dracut-024-magellan/Makefile.orig | ||
36 | --- dracut-024/Makefile.orig 1970-01-01 00:00:00.000000000 +0000 | ||
37 | +++ dracut-024-magellan/Makefile.orig 2012-10-16 14:31:06.000000000 +0000 | ||
38 | @@ -0,0 +1,192 @@ | ||
39 | +VERSION=024 | ||
40 | +GITVERSION=$(shell [ -d .git ] && git rev-list --abbrev-commit -n 1 HEAD |cut -b 1-8) | ||
41 | + | ||
42 | +-include Makefile.inc | ||
43 | + | ||
44 | +prefix ?= /usr | ||
45 | +libdir ?= ${prefix}/lib | ||
46 | +datadir ?= ${prefix}/share | ||
47 | +pkglibdir ?= ${libdir}/dracut | ||
48 | +sysconfdir ?= ${prefix}/etc | ||
49 | +bindir ?= ${prefix}/bin | ||
50 | +mandir ?= ${prefix}/share/man | ||
51 | +CFLAGS ?= -O2 -g -Wall | ||
52 | +CFLAGS += -std=gnu99 | ||
53 | + | ||
54 | +man1pages = lsinitrd.1 | ||
55 | + | ||
56 | +man5pages = dracut.conf.5 | ||
57 | + | ||
58 | +man7pages = dracut.cmdline.7 | ||
59 | + | ||
60 | +man8pages = dracut.8 \ | ||
61 | + dracut-catimages.8 \ | ||
62 | + mkinitrd.8 \ | ||
63 | + modules.d/98systemd/dracut-cmdline.service.8 \ | ||
64 | + modules.d/98systemd/dracut-initqueue.service.8 \ | ||
65 | + modules.d/98systemd/dracut-pre-pivot.service.8 \ | ||
66 | + modules.d/98systemd/dracut-pre-trigger.service.8 \ | ||
67 | + modules.d/98systemd/dracut-pre-udev.service.8 \ | ||
68 | + modules.d/98systemd/initrd-switch-root.service.8 \ | ||
69 | + modules.d/98systemd/udevadm-cleanup-db.service.8 | ||
70 | + | ||
71 | +manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages) | ||
72 | + | ||
73 | + | ||
74 | +.PHONY: install clean archive rpm testimage test all check AUTHORS doc | ||
75 | + | ||
76 | +all: syncheck dracut-version.sh dracut-install | ||
77 | + | ||
78 | +DRACUT_INSTALL_OBJECTS = \ | ||
79 | + install/dracut-install.o \ | ||
80 | + install/hashmap.o\ | ||
81 | + install/log.o \ | ||
82 | + install/util.o | ||
83 | + | ||
84 | +# deps generated with gcc -MM | ||
85 | +install/dracut-install.o: install/dracut-install.c install/log.h install/macro.h \ | ||
86 | + install/hashmap.h install/util.h | ||
87 | +install/hashmap.o: install/hashmap.c install/util.h install/macro.h install/log.h \ | ||
88 | + install/hashmap.h | ||
89 | +install/log.o: install/log.c install/log.h install/macro.h install/util.h | ||
90 | +install/util.o: install/util.c install/util.h install/macro.h install/log.h | ||
91 | + | ||
92 | +install/dracut-install: $(DRACUT_INSTALL_OBJECTS) | ||
93 | + | ||
94 | +dracut-install: install/dracut-install | ||
95 | + ln -fs $< $@ | ||
96 | + | ||
97 | +indent: | ||
98 | + indent -i8 -nut -br -linux -l120 install/dracut-install.c | ||
99 | + | ||
100 | +doc: $(manpages) dracut.html | ||
101 | + | ||
102 | +ifneq ($(enable_documentation),no) | ||
103 | +all: doc | ||
104 | +endif | ||
105 | + | ||
106 | +%: %.xml | ||
107 | + xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< | ||
108 | + | ||
109 | +%.xml: %.asc | ||
110 | + asciidoc -d manpage -b docbook -o $@ $< | ||
111 | + | ||
112 | +dracut.html: dracut.asc $(manpages) | ||
113 | + asciidoc -a numbered -d book -b docbook -o dracut.xml dracut.asc | ||
114 | + xsltproc -o dracut.html --xinclude -nonet \ | ||
115 | + --stringparam html.stylesheet \ | ||
116 | + http://docs.fedoraproject.org/en-US/Common_Content/css/default.css \ | ||
117 | + http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml | ||
118 | + rm dracut.xml | ||
119 | + | ||
120 | +install: dracut-version.sh | ||
121 | + mkdir -p $(DESTDIR)$(pkglibdir) | ||
122 | + mkdir -p $(DESTDIR)$(bindir) | ||
123 | + mkdir -p $(DESTDIR)$(sysconfdir) | ||
124 | + mkdir -p $(DESTDIR)$(pkglibdir)/modules.d | ||
125 | + mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 | ||
126 | + install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut | ||
127 | + install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages | ||
128 | + install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd | ||
129 | + install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd | ||
130 | + install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf | ||
131 | + mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d | ||
132 | + install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh | ||
133 | + install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh | ||
134 | + ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions | ||
135 | + install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh | ||
136 | + install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore | ||
137 | + cp -arx modules.d $(DESTDIR)$(pkglibdir) | ||
138 | +ifneq ($(enable_documentation),no) | ||
139 | + for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done | ||
140 | + for i in $(man5pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man5/$${i##*/}; done | ||
141 | + for i in $(man7pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man7/$${i##*/}; done | ||
142 | + for i in $(man8pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man8/$${i##*/}; done | ||
143 | + ln -fs dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7 | ||
144 | +endif | ||
145 | + if [ -n "$(systemdsystemunitdir)" ]; then \ | ||
146 | + mkdir -p $(DESTDIR)$(systemdsystemunitdir); \ | ||
147 | + install -m 0644 dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir); \ | ||
148 | + mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \ | ||
149 | + ln -s ../dracut-shutdown.service \ | ||
150 | + $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \ | ||
151 | + fi | ||
152 | + if [ -f install/dracut-install ]; then \ | ||
153 | + install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ | ||
154 | + fi | ||
155 | + | ||
156 | +dracut-version.sh: | ||
157 | + @echo "DRACUT_VERSION=$(VERSION)-$(GITVERSION)" > dracut-version.sh | ||
158 | + | ||
159 | +clean: | ||
160 | + $(RM) *~ | ||
161 | + $(RM) */*~ | ||
162 | + $(RM) */*/*~ | ||
163 | + $(RM) $(manpages:%=%.xml) dracut.xml | ||
164 | + $(RM) test-*.img | ||
165 | + $(RM) dracut-*.rpm dracut-*.tar.bz2 | ||
166 | + $(RM) dracut-install install/dracut-install $(DRACUT_INSTALL_OBJECTS) | ||
167 | + $(RM) $(manpages) dracut.html | ||
168 | + $(MAKE) -C test clean | ||
169 | + | ||
170 | +archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2 | ||
171 | + | ||
172 | +dist: dracut-$(VERSION).tar.bz2 | ||
173 | + | ||
174 | +dracut-$(VERSION).tar.bz2: doc | ||
175 | + git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ > dracut-$(VERSION).tar | ||
176 | + mkdir -p dracut-$(VERSION) | ||
177 | + cp $(manpages) dracut.html dracut-$(VERSION) | ||
178 | + tar -rf dracut-$(VERSION).tar dracut-$(VERSION)/*.[0-9] dracut-$(VERSION)/dracut.html | ||
179 | + rm -fr dracut-$(VERSION).tar.bz2 dracut-$(VERSION) | ||
180 | + bzip2 -9 dracut-$(VERSION).tar | ||
181 | + rm -f dracut-$(VERSION).tar | ||
182 | + | ||
183 | +rpm: dracut-$(VERSION).tar.bz2 | ||
184 | + rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \ | ||
185 | + cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \ | ||
186 | + LC_MESSAGES=C $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \ | ||
187 | + (cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \ | ||
188 | + --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \ | ||
189 | + --define "_rpmdir $$PWD" -ba dracut.spec; ) && \ | ||
190 | + ( mv "$$rpmbuild"/$$(arch)/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm ) | ||
191 | + | ||
192 | +syncheck: | ||
193 | + @ret=0;for i in dracut-initramfs-restore.sh dracut-logger.sh \ | ||
194 | + modules.d/99base/init.sh modules.d/*/*.sh; do \ | ||
195 | + [ "$${i##*/}" = "module-setup.sh" ] && continue; \ | ||
196 | + read line < "$$i"; [ "$${line#*bash*}" != "$$line" ] && continue; \ | ||
197 | + dash -n "$$i" ; ret=$$(($$ret+$$?)); \ | ||
198 | + done;exit $$ret | ||
199 | + @ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \ | ||
200 | + modules.d/*/module-setup.sh; do \ | ||
201 | + bash -n "$$i" ; ret=$$(($$ret+$$?)); \ | ||
202 | + done;exit $$ret | ||
203 | + | ||
204 | +check: all syncheck | ||
205 | + @[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; } | ||
206 | + @$(MAKE) -C test check | ||
207 | + | ||
208 | +testimage: all | ||
209 | + ./dracut.sh -l -a debug -f test-$(shell uname -r).img $(shell uname -r) | ||
210 | + @echo wrote test-$(shell uname -r).img | ||
211 | + | ||
212 | +testimages: all | ||
213 | + ./dracut.sh -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r) | ||
214 | + @echo wrote test-$(shell uname -r).img | ||
215 | + ./dracut.sh -l -a debug --no-kernel -f test-dracut.img $(shell uname -r) | ||
216 | + @echo wrote test-dracut.img | ||
217 | + | ||
218 | +hostimage: all | ||
219 | + ./dracut.sh -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r) | ||
220 | + @echo wrote test-$(shell uname -r).img | ||
221 | + | ||
222 | +AUTHORS: | ||
223 | + git shortlog --numbered --summary -e |while read a rest; do echo $$rest;done > AUTHORS | ||
224 | + | ||
225 | +dracut.html.sign: dracut-$(VERSION).tar.bz2 | ||
226 | + gpg-sign-all dracut-$(VERSION).tar.bz2 dracut.html | ||
227 | + | ||
228 | +upload: dracut.html.sign | ||
229 | + kup put dracut-$(VERSION).tar.bz2 dracut-$(VERSION).tar.sign /pub/linux/utils/boot/dracut/ | ||
230 | + kup put dracut.html dracut.html.sign /pub/linux/utils/boot/dracut/ | ||
231 | diff -Naur dracut-024/modules.d/10i18n/console_init.sh dracut-024-magellan/modules.d/10i18n/console_init.sh | ||
232 | --- dracut-024/modules.d/10i18n/console_init.sh 2012-10-16 14:31:06.000000000 +0000 | ||
233 | +++ dracut-024-magellan/modules.d/10i18n/console_init.sh 2012-10-28 20:26:49.477412947 +0000 | ||
234 | @@ -11,7 +11,7 @@ | ||
235 | [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf | ||
236 | |||
237 | DEFAULT_FONT=LatArCyrHeb-16 | ||
238 | -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap | ||
239 | +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap | ||
240 | |||
241 | set_keyboard() { | ||
242 | local param | ||
243 | diff -Naur dracut-024/modules.d/40network/module-setup.sh dracut-024-magellan/modules.d/40network/module-setup.sh | ||
244 | --- dracut-024/modules.d/40network/module-setup.sh 2012-10-16 14:31:06.000000000 +0000 | ||
245 | +++ dracut-024-magellan/modules.d/40network/module-setup.sh 2012-10-28 20:26:49.477412947 +0000 | ||
246 | @@ -16,7 +16,7 @@ | ||
247 | } | ||
248 | |||
249 | depends() { | ||
250 | - [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg | ||
251 | + [ -d /etc/conf.d/network-scripts/ ] && echo ifcfg | ||
252 | return 0 | ||
253 | } | ||
254 | |||
255 | diff -Naur dracut-024/modules.d/45ifcfg/write-ifcfg.sh dracut-024-magellan/modules.d/45ifcfg/write-ifcfg.sh | ||
256 | --- dracut-024/modules.d/45ifcfg/write-ifcfg.sh 2012-10-16 14:31:06.000000000 +0000 | ||
257 | +++ dracut-024-magellan/modules.d/45ifcfg/write-ifcfg.sh 2012-10-28 20:26:49.477412947 +0000 | ||
258 | @@ -230,13 +230,13 @@ | ||
259 | done | ||
260 | |||
261 | # Pass network opts | ||
262 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts | ||
263 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts | ||
264 | mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient | ||
265 | -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab | ||
266 | +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab | ||
267 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab | ||
268 | { | ||
269 | cp /tmp/net.* /run/initramfs/ | ||
270 | cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf | ||
271 | - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts | ||
272 | + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts | ||
273 | cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient | ||
274 | } > /dev/null 2>&1 | ||
275 | diff -Naur dracut-024/modules.d/45ifcfg/write-ifcfg.sh.orig dracut-024-magellan/modules.d/45ifcfg/write-ifcfg.sh.orig | ||
276 | --- dracut-024/modules.d/45ifcfg/write-ifcfg.sh.orig 1970-01-01 00:00:00.000000000 +0000 | ||
277 | +++ dracut-024-magellan/modules.d/45ifcfg/write-ifcfg.sh.orig 2012-10-16 14:31:06.000000000 +0000 | ||
278 | @@ -0,0 +1,242 @@ | ||
279 | +#!/bin/sh | ||
280 | +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- | ||
281 | +# ex: ts=8 sw=4 sts=4 et filetype=sh | ||
282 | + | ||
283 | +# NFS root might have reached here before /tmp/net.ifaces was written | ||
284 | +udevadm settle --timeout=30 | ||
285 | +# Don't write anything if we don't know our bootdev | ||
286 | +[ -f /tmp/net.ifaces ] || return 1 | ||
287 | + | ||
288 | +read IFACES < /tmp/net.ifaces | ||
289 | + | ||
290 | +if [ -e /tmp/bond.info ]; then | ||
291 | + . /tmp/bond.info | ||
292 | +fi | ||
293 | + | ||
294 | +if [ -e /tmp/bridge.info ]; then | ||
295 | + . /tmp/bridge.info | ||
296 | +fi | ||
297 | + | ||
298 | +mkdir -m 0755 -p /tmp/ifcfg/ | ||
299 | +mkdir -m 0755 -p /tmp/ifcfg-leases/ | ||
300 | + | ||
301 | +get_config_line_by_subchannel() | ||
302 | +{ | ||
303 | + local CHANNEL | ||
304 | + local line | ||
305 | + | ||
306 | + CHANNELS="$1" | ||
307 | + while read line; do | ||
308 | + if strstr "$line" "$CHANNELS"; then | ||
309 | + echo $line | ||
310 | + return 0 | ||
311 | + fi | ||
312 | + done < /etc/ccw.conf | ||
313 | + return 1 | ||
314 | +} | ||
315 | + | ||
316 | +print_s390() { | ||
317 | + local _netif | ||
318 | + local SUBCHANNELS | ||
319 | + local OPTIONS | ||
320 | + local NETTYPE | ||
321 | + local CONFIG_LINE | ||
322 | + local i | ||
323 | + local channel | ||
324 | + local OLD_IFS | ||
325 | + | ||
326 | + _netif="$1" | ||
327 | + # if we find ccw channel, then use those, instead of | ||
328 | + # of the MAC | ||
329 | + SUBCHANNELS=$({ | ||
330 | + for i in /sys/class/net/$_netif/device/cdev[0-9]*; do | ||
331 | + [ -e $i ] || continue | ||
332 | + channel=$(readlink -f $i) | ||
333 | + echo -n "${channel##*/}," | ||
334 | + done | ||
335 | + }) | ||
336 | + [ -n "$SUBCHANNELS" ] || return 1 | ||
337 | + | ||
338 | + SUBCHANNELS=${SUBCHANNELS%,} | ||
339 | + echo "SUBCHANNELS=\"${SUBCHANNELS}\"" | ||
340 | + CONFIG_LINE=$(get_config_line_by_subchannel $SUBCHANNELS) | ||
341 | + | ||
342 | + [ $? -ne 0 -o -z "$CONFIG_LINE" ] && return | ||
343 | + | ||
344 | + OLD_IFS=$IFS | ||
345 | + IFS="," | ||
346 | + set -- $CONFIG_LINE | ||
347 | + IFS=$OLD_IFS | ||
348 | + NETTYPE=$1 | ||
349 | + shift | ||
350 | + SUBCHANNELS="$1" | ||
351 | + OPTIONS="" | ||
352 | + shift | ||
353 | + while [ $# -gt 0 ]; do | ||
354 | + case $1 in | ||
355 | + *=*) OPTIONS="$OPTIONS $1";; | ||
356 | + esac | ||
357 | + shift | ||
358 | + done | ||
359 | + OPTIONS=${OPTIONS## } | ||
360 | + echo "NETTYPE=\"${NETTYPE}\"" | ||
361 | + echo "OPTIONS=\"${OPTIONS}\"" | ||
362 | +} | ||
363 | + | ||
364 | + | ||
365 | +for netif in $IFACES ; do | ||
366 | + [ -e /tmp/ifcfg/ifcfg-$netif ] && continue | ||
367 | + # bridge? | ||
368 | + unset bridge | ||
369 | + unset bond | ||
370 | + uuid=$(cat /proc/sys/kernel/random/uuid) | ||
371 | + if [ "$netif" = "$bridgename" ]; then | ||
372 | + bridge=yes | ||
373 | + elif [ "$netif" = "$bondname" ]; then | ||
374 | + # $netif can't be bridge and bond at the same time | ||
375 | + bond=yes | ||
376 | + fi | ||
377 | + cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr | ||
378 | + { | ||
379 | + echo "# Generated by dracut initrd" | ||
380 | + echo "DEVICE=$netif" | ||
381 | + echo "ONBOOT=yes" | ||
382 | + echo "NETBOOT=yes" | ||
383 | + echo "UUID=$uuid" | ||
384 | + [ -n "$mtu" ] && echo "MTU=$mtu" | ||
385 | + if [ -f /tmp/net.$netif.lease ]; then | ||
386 | + strstr "$ip" '*:*:*' && | ||
387 | + echo "IPV6INIT=yes" | ||
388 | + echo "DHCPV6C=yes" | ||
389 | + echo "BOOTPROTO=dhcp" | ||
390 | + cp /tmp/net.$netif.lease /tmp/ifcfg-leases/dhclient-$uuid-$netif.lease | ||
391 | + else | ||
392 | + # If we've booted with static ip= lines, the override file is there | ||
393 | + [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override | ||
394 | + if strstr "$ip" '*:*:*'; then | ||
395 | + echo "IPV6INIT=yes" | ||
396 | + echo "IPV6_AUTOCONF=no" | ||
397 | + echo "IPV6ADDR=$ip/$mask" | ||
398 | + else | ||
399 | + echo "BOOTPROTO=none" | ||
400 | + echo "IPADDR=$ip" | ||
401 | + if strstr "$mask" "."; then | ||
402 | + echo "NETMASK=$mask" | ||
403 | + else | ||
404 | + echo "PREFIX=$mask" | ||
405 | + fi | ||
406 | + fi | ||
407 | + if strstr "$gw" '*:*:*'; then | ||
408 | + echo "IPV6_DEFAULTGW=$gw" | ||
409 | + elif [ -n "$gw" ]; then | ||
410 | + echo "GATEWAY=$gw" | ||
411 | + fi | ||
412 | + fi | ||
413 | + } > /tmp/ifcfg/ifcfg-$netif | ||
414 | + | ||
415 | + # bridge needs different things written to ifcfg | ||
416 | + if [ -z "$bridge" ] && [ -z "$bond" ]; then | ||
417 | + # standard interface | ||
418 | + { | ||
419 | + if [ -n "$macaddr" ]; then | ||
420 | + echo "MACADDR=$macaddr" | ||
421 | + else | ||
422 | + echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\"" | ||
423 | + fi | ||
424 | + print_s390 $netif | ||
425 | + echo "TYPE=Ethernet" | ||
426 | + echo "NAME=\"Boot Disk\"" | ||
427 | + [ -n "$mtu" ] && echo "MTU=$mtu" | ||
428 | + } >> /tmp/ifcfg/ifcfg-$netif | ||
429 | + fi | ||
430 | + | ||
431 | + if [ -n "$bond" ] ; then | ||
432 | + # bond interface | ||
433 | + { | ||
434 | + # This variable is an indicator of a bond interface for initscripts | ||
435 | + echo "BONDING_OPTS=\"$bondoptions\"" | ||
436 | + echo "NAME=\"Boot Disk\"" | ||
437 | + } >> /tmp/ifcfg/ifcfg-$netif | ||
438 | + | ||
439 | + for slave in $bondslaves ; do | ||
440 | + # Set ONBOOT=no to prevent initscripts from trying to setup already bonded physical interface | ||
441 | + # write separate ifcfg file for the raw eth interface | ||
442 | + { | ||
443 | + echo "# Generated by dracut initrd" | ||
444 | + echo "DEVICE=$slave" | ||
445 | + echo "TYPE=Ethernet" | ||
446 | + echo "ONBOOT=no" | ||
447 | + echo "NETBOOT=yes" | ||
448 | + echo "HWADDR=$(cat /sys/class/net/$slave/address)" | ||
449 | + echo "SLAVE=yes" | ||
450 | + echo "MASTER=$netif" | ||
451 | + echo "NAME=$slave" | ||
452 | + } >> /tmp/ifcfg/ifcfg-$slave | ||
453 | + done | ||
454 | + fi | ||
455 | + | ||
456 | + if [ -n "$bridge" ] ; then | ||
457 | + # bridge | ||
458 | + { | ||
459 | + echo "TYPE=Bridge" | ||
460 | + echo "NAME=\"Boot Disk\"" | ||
461 | + } >> /tmp/ifcfg/ifcfg-$netif | ||
462 | + if [ "$ethname" = "$bondname" ] ; then | ||
463 | + { | ||
464 | + # Set ONBOOT=no to prevent initscripts from trying to setup already bridged bond interface | ||
465 | + echo "# Generated by dracut initrd" | ||
466 | + echo "DEVICE=$bondname" | ||
467 | + echo "ONBOOT=no" | ||
468 | + echo "NETBOOT=yes" | ||
469 | + # This variable is an indicator of a bond interface for initscripts | ||
470 | + echo "BONDING_OPTS=\"$bondoptions\"" | ||
471 | + echo "BRIDGE=$netif" | ||
472 | + echo "NAME=\"$bondname\"" | ||
473 | + } >> /tmp/ifcfg/ifcfg-$bondname | ||
474 | + for slave in $bondslaves ; do | ||
475 | + # write separate ifcfg file for the raw eth interface | ||
476 | + # Set ONBOOT=no to prevent initscripts from trying to setup already bridged physical interface | ||
477 | + { | ||
478 | + echo "# Generated by dracut initrd" | ||
479 | + echo "DEVICE=$slave" | ||
480 | + echo "TYPE=Ethernet" | ||
481 | + echo "ONBOOT=no" | ||
482 | + echo "NETBOOT=yes" | ||
483 | + echo "HWADDR=$(cat /sys/class/net/$slave/address)" | ||
484 | + echo "SLAVE=yes" | ||
485 | + echo "MASTER=$bondname" | ||
486 | + echo "NAME=$slave" | ||
487 | + } >> /tmp/ifcfg/ifcfg-$slave | ||
488 | + done | ||
489 | + else | ||
490 | + # write separate ifcfg file for the raw eth interface | ||
491 | + { | ||
492 | + echo "# Generated by dracut initrd" | ||
493 | + echo "DEVICE=$ethname" | ||
494 | + echo "TYPE=Ethernet" | ||
495 | + echo "ONBOOT=no" | ||
496 | + echo "NETBOOT=yes" | ||
497 | + echo "HWADDR=$(cat /sys/class/net/$ethname/address)" | ||
498 | + echo "BRIDGE=$netif" | ||
499 | + echo "NAME=$ethname" | ||
500 | + } >> /tmp/ifcfg/ifcfg-$ethname | ||
501 | + fi | ||
502 | + fi | ||
503 | + i=1 | ||
504 | + for ns in $(getargs nameserver); do | ||
505 | + echo "DNS${i}=${ns}" >> /tmp/ifcfg/ifcfg-$netif | ||
506 | + i=$((i+1)) | ||
507 | + done | ||
508 | +done | ||
509 | + | ||
510 | +# Pass network opts | ||
511 | +mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts | ||
512 | +mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient | ||
513 | +echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab | ||
514 | +echo "files /var/lib/dhclient" >> /run/initramfs/rwtab | ||
515 | +{ | ||
516 | + cp /tmp/net.* /run/initramfs/ | ||
517 | + cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf | ||
518 | + copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts | ||
519 | + cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient | ||
520 | +} > /dev/null 2>&1 | ||
521 | diff -Naur dracut-024/modules.d/80cms/cms-write-ifcfg.sh dracut-024-magellan/modules.d/80cms/cms-write-ifcfg.sh | ||
522 | --- dracut-024/modules.d/80cms/cms-write-ifcfg.sh 2012-10-16 14:31:06.000000000 +0000 | ||
523 | +++ dracut-024-magellan/modules.d/80cms/cms-write-ifcfg.sh 2012-10-28 20:26:49.477412947 +0000 | ||
524 | @@ -4,7 +4,7 @@ | ||
525 | |||
526 | type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh | ||
527 | |||
528 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts | ||
529 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts | ||
530 | |||
531 | function cms_write_config() | ||
532 | { | ||
533 | @@ -24,18 +24,18 @@ | ||
534 | |||
535 | uuid=$(cat /proc/sys/kernel/random/uuid) | ||
536 | |||
537 | - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE | ||
538 | + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE | ||
539 | |||
540 | strstr "$IPADDR" '*:*:*' && ipv6=1 | ||
541 | |||
542 | # to please NetworkManager on startup in loader before loader reconfigures net | ||
543 | - cat > /etc/sysconfig/network << EOF | ||
544 | + cat > /etc/conf.d/network << EOF | ||
545 | HOSTNAME=$HOSTNAME | ||
546 | EOF | ||
547 | if [ "$ipv6" ]; then | ||
548 | - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network | ||
549 | + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network | ||
550 | else | ||
551 | - echo "NETWORKING=yes" >> /etc/sysconfig/network | ||
552 | + echo "NETWORKING=yes" >> /etc/conf.d/network | ||
553 | fi | ||
554 | |||
555 | cat > $IFCFGFILE << EOF | ||
556 | @@ -97,7 +97,7 @@ | ||
557 | unset optstr | ||
558 | unset DNS1 | ||
559 | unset DNS2 | ||
560 | - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab | ||
561 | + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab | ||
562 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab | ||
563 | } | ||
564 | |||
565 | diff -Naur dracut-024/modules.d/95rootfs-block/mount-root.sh dracut-024-magellan/modules.d/95rootfs-block/mount-root.sh | ||
566 | --- dracut-024/modules.d/95rootfs-block/mount-root.sh 2012-10-16 14:31:06.000000000 +0000 | ||
567 | +++ dracut-024-magellan/modules.d/95rootfs-block/mount-root.sh 2012-10-28 20:26:49.478412948 +0000 | ||
568 | @@ -34,8 +34,8 @@ | ||
569 | |||
570 | READONLY= | ||
571 | fsckoptions= | ||
572 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then | ||
573 | - . "$NEWROOT"/etc/sysconfig/readonly-root | ||
574 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then | ||
575 | + . "$NEWROOT"/etc/conf.d/readonly-root | ||
576 | fi | ||
577 | |||
578 | if getargbool 0 "readonlyroot=" -y readonlyroot; then | ||
579 | @@ -58,8 +58,8 @@ | ||
580 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then | ||
581 | fsckoptions="-f $fsckoptions" | ||
582 | elif [ -f "$NEWROOT"/.autofsck ]; then | ||
583 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \ | ||
584 | - . "$NEWROOT"/etc/sysconfig/autofsck | ||
585 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \ | ||
586 | + . "$NEWROOT"/etc/conf.d/autofsck | ||
587 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then | ||
588 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" | ||
589 | fi | ||
590 | diff -Naur dracut-024/modules.d/95udev-rules/module-setup.sh dracut-024-magellan/modules.d/95udev-rules/module-setup.sh | ||
591 | --- dracut-024/modules.d/95udev-rules/module-setup.sh 2012-10-16 14:31:06.000000000 +0000 | ||
592 | +++ dracut-024-magellan/modules.d/95udev-rules/module-setup.sh 2012-10-28 20:26:49.478412948 +0000 | ||
593 | @@ -73,6 +73,13 @@ | ||
594 | [ -f /etc/arch-release ] && \ | ||
595 | inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh | ||
596 | |||
597 | + # magellan uses a special modprobe script too | ||
598 | + if [ -f /etc/mageversion ] | ||
599 | + then | ||
600 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh | ||
601 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist | ||
602 | + fi | ||
603 | + | ||
604 | inst_libdir_file "libnss_files*" | ||
605 | } | ||
606 | |||
607 | diff -Naur dracut-024/modules.d/95udev-rules/module-setup.sh.orig dracut-024-magellan/modules.d/95udev-rules/module-setup.sh.orig | ||
608 | --- dracut-024/modules.d/95udev-rules/module-setup.sh.orig 1970-01-01 00:00:00.000000000 +0000 | ||
609 | +++ dracut-024-magellan/modules.d/95udev-rules/module-setup.sh.orig 2012-10-16 14:31:06.000000000 +0000 | ||
610 | @@ -0,0 +1,78 @@ | ||
611 | +#!/bin/bash | ||
612 | +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- | ||
613 | +# ex: ts=8 sw=4 sts=4 et filetype=sh | ||
614 | + | ||
615 | +install() { | ||
616 | + local _i | ||
617 | + | ||
618 | + # Fixme: would be nice if we didn't have to know which rules to grab.... | ||
619 | + # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies | ||
620 | + # of the rules we want so that we just copy those in would be best | ||
621 | + dracut_install udevadm cat uname blkid \ | ||
622 | + /etc/udev/udev.conf | ||
623 | + | ||
624 | + [ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd | ||
625 | + for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /lib/systemd/systemd-udevd /sbin/udevd; do | ||
626 | + [ -x "$_i" ] || continue | ||
627 | + inst "$_i" | ||
628 | + | ||
629 | + if ! [[ -f ${initdir}/lib/systemd/systemd-udevd ]]; then | ||
630 | + ln -fs "$_i" ${initdir}/lib/systemd/systemd-udevd | ||
631 | + fi | ||
632 | + break | ||
633 | + done | ||
634 | + if ! [[ -e ${initdir}/lib/systemd/systemd-udevd ]]; then | ||
635 | + derror "Cannot find [systemd-]udevd binary!" | ||
636 | + exit 1 | ||
637 | + fi | ||
638 | + | ||
639 | + inst_rules 50-udev-default.rules 60-persistent-storage.rules \ | ||
640 | + 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \ | ||
641 | + 60-pcmcia.rules \ | ||
642 | + 50-udev.rules 95-late.rules \ | ||
643 | + 50-firmware.rules \ | ||
644 | + "$moddir/59-persistent-storage.rules" \ | ||
645 | + "$moddir/61-persistent-storage.rules" | ||
646 | + | ||
647 | + inst_dir /run/udev | ||
648 | + inst_dir /run/udev/rules.d | ||
649 | + | ||
650 | + { | ||
651 | + for i in cdrom tape dialout floppy; do | ||
652 | + if ! egrep -q "^$i:" "$initdir/etc/group" 2>/dev/null; then | ||
653 | + if ! egrep "^$i:" /etc/group 2>/dev/null; then | ||
654 | + case $i in | ||
655 | + cdrom) echo "$i:x:11:";; | ||
656 | + dialout) echo "$i:x:18:";; | ||
657 | + floppy) echo "$i:x:19:";; | ||
658 | + tape) echo "$i:x:33:";; | ||
659 | + esac | ||
660 | + fi | ||
661 | + fi | ||
662 | + done | ||
663 | + } >> "$initdir/etc/group" | ||
664 | + | ||
665 | + dracut_install -o \ | ||
666 | + ${udevdir}/ata_id \ | ||
667 | + ${udevdir}/cdrom_id \ | ||
668 | + ${udevdir}/create_floppy_devices \ | ||
669 | + ${udevdir}/edd_id \ | ||
670 | + ${udevdir}/firmware.sh \ | ||
671 | + ${udevdir}/firmware \ | ||
672 | + ${udevdir}/firmware.agent \ | ||
673 | + ${udevdir}/hotplug.functions \ | ||
674 | + ${udevdir}/fw_unit_symlinks.sh \ | ||
675 | + ${udevdir}/hid2hci \ | ||
676 | + ${udevdir}/path_id \ | ||
677 | + ${udevdir}/input_id \ | ||
678 | + ${udevdir}/scsi_id \ | ||
679 | + ${udevdir}/usb_id \ | ||
680 | + ${udevdir}/pcmcia-socket-startup \ | ||
681 | + ${udevdir}/pcmcia-check-broken-cis | ||
682 | + | ||
683 | + [ -f /etc/arch-release ] && \ | ||
684 | + inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh | ||
685 | + | ||
686 | + inst_libdir_file "libnss_files*" | ||
687 | +} | ||
688 | + | ||
689 | diff -Naur dracut-024/modules.d/97masterkey/masterkey.sh dracut-024-magellan/modules.d/97masterkey/masterkey.sh | ||
690 | --- dracut-024/modules.d/97masterkey/masterkey.sh 2012-10-16 14:31:06.000000000 +0000 | ||
691 | +++ dracut-024-magellan/modules.d/97masterkey/masterkey.sh 2012-10-28 20:26:49.478412948 +0000 | ||
692 | @@ -8,7 +8,7 @@ | ||
693 | # TORSEC group -- http://security.polito.it | ||
694 | # Roberto Sassu <roberto.sassu@polito.it> | ||
695 | |||
696 | -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" | ||
697 | +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" | ||
698 | MULTIKERNELMODE="NO" | ||
699 | PCRLOCKNUM=11 | ||
700 | |||
701 | diff -Naur dracut-024/modules.d/97masterkey/README dracut-024-magellan/modules.d/97masterkey/README | ||
702 | --- dracut-024/modules.d/97masterkey/README 2012-10-16 14:31:06.000000000 +0000 | ||
703 | +++ dracut-024-magellan/modules.d/97masterkey/README 2012-10-28 20:26:49.478412948 +0000 | ||
704 | @@ -39,7 +39,7 @@ | ||
705 | MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" | ||
706 | -------------------------------------------------------------------------- | ||
707 | |||
708 | -2) create the configuration file '/etc/sysconfig/masterkey' to override the | ||
709 | +2) create the configuration file '/etc/conf.d/masterkey' to override the | ||
710 | value of one or all variables; | ||
711 | |||
712 | 3) specify these parameters in the kernel command line: | ||
713 | diff -Naur dracut-024/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-024-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh | ||
714 | --- dracut-024/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-10-16 14:31:06.000000000 +0000 | ||
715 | +++ dracut-024-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-10-28 20:26:49.478412948 +0000 | ||
716 | @@ -8,7 +8,7 @@ | ||
717 | # TORSEC group -- http://security.polito.it | ||
718 | # Roberto Sassu <roberto.sassu@polito.it> | ||
719 | |||
720 | -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" | ||
721 | +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" | ||
722 | ECRYPTFSKEYTYPE="encrypted" | ||
723 | ECRYPTFSKEYDESC="1000100010001000" | ||
724 | ECRYPTFSKEYID="" | ||
725 | diff -Naur dracut-024/modules.d/98ecryptfs/README dracut-024-magellan/modules.d/98ecryptfs/README | ||
726 | --- dracut-024/modules.d/98ecryptfs/README 2012-10-16 14:31:06.000000000 +0000 | ||
727 | +++ dracut-024-magellan/modules.d/98ecryptfs/README 2012-10-28 20:26:49.478412948 +0000 | ||
728 | @@ -23,13 +23,13 @@ | ||
729 | ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" | ||
730 | -------------------------------------------------------------------------- | ||
731 | |||
732 | -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY | ||
733 | +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY | ||
734 | variable; | ||
735 | |||
736 | 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command | ||
737 | line. | ||
738 | |||
739 | -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify | ||
740 | +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify | ||
741 | # more options for mounting the eCryptfs filesystem: | ||
742 | |||
743 | ECRYPTFSSRCDIR: existent directory in the lower root filesystem; | ||
744 | @@ -39,7 +39,7 @@ | ||
745 | option is automatically added by the dracut script). | ||
746 | |||
747 | # Example of the configuration file: | ||
748 | ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- | ||
749 | +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- | ||
750 | ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" | ||
751 | ECRYPTFSSRCDIR="/secret" | ||
752 | ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" | ||
753 | diff -Naur dracut-024/modules.d/98integrity/evm-enable.sh dracut-024-magellan/modules.d/98integrity/evm-enable.sh | ||
754 | --- dracut-024/modules.d/98integrity/evm-enable.sh 2012-10-16 14:31:06.000000000 +0000 | ||
755 | +++ dracut-024-magellan/modules.d/98integrity/evm-enable.sh 2012-10-28 20:26:49.478412948 +0000 | ||
756 | @@ -9,7 +9,7 @@ | ||
757 | # Roberto Sassu <roberto.sassu@polito.it> | ||
758 | |||
759 | EVMSECFILE="${SECURITYFSDIR}/evm" | ||
760 | -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" | ||
761 | +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" | ||
762 | EVMKEYDESC="evm-key" | ||
763 | EVMKEYTYPE="encrypted" | ||
764 | EVMKEYID="" | ||
765 | diff -Naur dracut-024/modules.d/98integrity/ima-policy-load.sh dracut-024-magellan/modules.d/98integrity/ima-policy-load.sh | ||
766 | --- dracut-024/modules.d/98integrity/ima-policy-load.sh 2012-10-16 14:31:06.000000000 +0000 | ||
767 | +++ dracut-024-magellan/modules.d/98integrity/ima-policy-load.sh 2012-10-28 20:26:49.479412949 +0000 | ||
768 | @@ -9,8 +9,8 @@ | ||
769 | # Roberto Sassu <roberto.sassu@polito.it> | ||
770 | |||
771 | IMASECDIR="${SECURITYFSDIR}/ima" | ||
772 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" | ||
773 | -IMAPOLICY="/etc/sysconfig/ima-policy" | ||
774 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" | ||
775 | +IMAPOLICY="/etc/conf.d/ima-policy" | ||
776 | |||
777 | load_ima_policy() | ||
778 | { | ||
779 | diff -Naur dracut-024/modules.d/98integrity/README dracut-024-magellan/modules.d/98integrity/README | ||
780 | --- dracut-024/modules.d/98integrity/README 2012-10-16 14:31:06.000000000 +0000 | ||
781 | +++ dracut-024-magellan/modules.d/98integrity/README 2012-10-28 20:26:49.479412949 +0000 | ||
782 | @@ -20,7 +20,7 @@ | ||
783 | EVMKEY="/etc/keys/evm-trusted.blob" | ||
784 | -------------------------------------------------------------------------- | ||
785 | |||
786 | -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; | ||
787 | +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; | ||
788 | |||
789 | 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command | ||
790 | line. | ||
791 | @@ -33,8 +33,8 @@ | ||
792 | |||
793 | # Save the policy in a file. | ||
794 | |||
795 | -# Create the configuration file '/etc/sysconfig/ima' to override the path name of | ||
796 | +# Create the configuration file '/etc/conf.d/ima' to override the path name of | ||
797 | # the IMA custom policy. | ||
798 | -------------- '/etc/sysconfig/ima' (with the default value) ------------- | ||
799 | -IMAPOLICY="/etc/sysconfig/ima-policy" | ||
800 | +------------- '/etc/conf.d/ima' (with the default value) ------------- | ||
801 | +IMAPOLICY="/etc/conf.d/ima-policy" | ||
802 | ------------------------------------------------------------------------- | ||
803 | diff -Naur dracut-024/modules.d/98usrmount/mount-usr.sh dracut-024-magellan/modules.d/98usrmount/mount-usr.sh | ||
804 | --- dracut-024/modules.d/98usrmount/mount-usr.sh 2012-10-16 14:31:06.000000000 +0000 | ||
805 | +++ dracut-024-magellan/modules.d/98usrmount/mount-usr.sh 2012-10-28 20:26:49.479412949 +0000 | ||
806 | @@ -19,7 +19,7 @@ | ||
807 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then | ||
808 | _fsckoptions="-f $_fsckoptions" | ||
809 | elif [ -f "$NEWROOT"/.autofsck ]; then | ||
810 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck | ||
811 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck | ||
812 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then | ||
813 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" | ||
814 | fi |