Contents of /trunk/dracut/patches/dracut-010-magellan.patch
Parent Directory | Revision Log
Revision 1351 -
(show annotations)
(download)
Fri Jun 3 22:52:02 2011 UTC (13 years, 3 months ago) by niro
File size: 3540 byte(s)
Fri Jun 3 22:52:02 2011 UTC (13 years, 3 months ago) by niro
File size: 3540 byte(s)
-honor modprobe.sh to support magellan's way of modules blacklisting
1 | diff -Naur dracut-010/dracut dracut-010-magellan/dracut |
2 | --- dracut-010/dracut 2011-03-31 19:50:31.000000000 +0200 |
3 | +++ dracut-010-magellan/dracut 2011-06-04 00:07:56.000000000 +0200 |
4 | @@ -524,7 +524,7 @@ |
5 | unset item |
6 | |
7 | # make sure that library links are correct and up to date |
8 | -dracut_install /etc/ld.so.conf /etc/ld.so.conf.d/* |
9 | +dracut_install /etc/ld.so.conf |
10 | if ! ldconfig -r "$initdir"; then |
11 | if [[ $UID = 0 ]]; then |
12 | derror "ldconfig exited ungracefully" |
13 | diff -Naur dracut-010/dracut.conf.d/magellan.conf.example dracut-010-magellan/dracut.conf.d/magellan.conf.example |
14 | --- dracut-010/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 |
15 | +++ dracut-010-magellan/dracut.conf.d/magellan.conf.example 2011-06-04 00:06:08.000000000 +0200 |
16 | @@ -0,0 +1,10 @@ |
17 | +# /etc/dracut.conf.d/01-magellan.conf |
18 | +# Dracut config file customized for Magellan-Linux |
19 | + |
20 | +# |
21 | +# Modules |
22 | +# |
23 | + |
24 | +# i18n |
25 | +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefont:CONSOLEFONT" |
26 | + |
27 | diff -Naur dracut-010/dracut-gencmdline dracut-010-magellan/dracut-gencmdline |
28 | --- dracut-010/dracut-gencmdline 2011-03-31 19:50:31.000000000 +0200 |
29 | +++ dracut-010-magellan/dracut-gencmdline 2011-06-04 00:08:32.000000000 +0200 |
30 | @@ -101,7 +101,6 @@ |
31 | |
32 | NET_LIST="" |
33 | LD_SO_CONF=/etc/ld.so.conf |
34 | -LD_SO_CONF_D=/etc/ld.so.conf.d/ |
35 | |
36 | [ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd |
37 | |
38 | diff -Naur dracut-010/dracut.xml dracut-010-magellan/dracut.xml |
39 | --- dracut-010/dracut.xml 2011-03-31 19:50:31.000000000 +0200 |
40 | +++ dracut-010-magellan/dracut.xml 2011-06-04 00:09:58.000000000 +0200 |
41 | @@ -161,7 +161,7 @@ |
42 | <screen># lsinitrd /boot/initramfs-$(uname -r).img | less</screen> |
43 | <para>To display the contents of a file in the initramfs also use the <command>lsinitrd</command> tool:</para> |
44 | <screen># lsinitrd /boot/initramfs-$(uname -r).img /etc/ld.so.conf |
45 | -include ld.so.conf.d/*.conf</screen> |
46 | +include</screen> |
47 | </section> |
48 | <section> |
49 | <title>Adding dracut Modules</title> |
50 | diff -Naur dracut-010/Makefile dracut-010-magellan/Makefile |
51 | --- dracut-010/Makefile 2011-03-31 19:50:31.000000000 +0200 |
52 | +++ dracut-010-magellan/Makefile 2011-06-04 00:21:52.000000000 +0200 |
53 | @@ -48,6 +48,9 @@ |
54 | endif |
55 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf |
56 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d |
57 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf |
58 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d |
59 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut |
60 | install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions |
61 | install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger |
62 | cp -arx modules.d $(DESTDIR)$(pkglibdir) |
63 | diff -Naur dracut-010/modules.d/95udev-rules/module-setup.sh dracut-010-magellan/modules.d/95udev-rules/module-setup.sh |
64 | --- dracut-010/modules.d/95udev-rules/module-setup.sh 2011-03-31 19:50:31.000000000 +0200 |
65 | +++ dracut-010-magellan/modules.d/95udev-rules/module-setup.sh 2011-06-04 00:52:40.000000000 +0200 |
66 | @@ -53,6 +53,13 @@ |
67 | [ -f /etc/arch-release ] && \ |
68 | inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh |
69 | |
70 | + # magellan uses a special modprobe script too |
71 | + if [ -f /etc/mageversion ] |
72 | + then |
73 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh |
74 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist |
75 | + fi |
76 | + |
77 | for i in {"$libdir","$usrlibdir"}/libnss_files*; do |
78 | [ -e "$i" ] && dracut_install "$i" |
79 | done |