Contents of /trunk/dracut/patches/dracut-010-magellan-2.patch
Parent Directory | Revision Log
Revision 1353 -
(show annotations)
(download)
Sat Jun 4 14:33:55 2011 UTC (13 years, 3 months ago) by niro
File size: 3457 byte(s)
Sat Jun 4 14:33:55 2011 UTC (13 years, 3 months ago) by niro
File size: 3457 byte(s)
-added dracut patches against dracur-011_pre from git 0e6a94b3290f2eebe26bc7fa99130704acfeeae8
1 | diff -Naur dracut-010/dracut.conf.d/magellan.conf.example dracut-010-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-010/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 |
3 | +++ dracut-010-magellan/dracut.conf.d/magellan.conf.example 2011-06-04 16:30:27.000000000 +0200 |
4 | @@ -0,0 +1,12 @@ |
5 | +# /etc/dracut.conf.d/01-magellan.conf |
6 | +# Dracut config file customized for Magellan-Linux |
7 | + |
8 | +# |
9 | +# Modules |
10 | +# |
11 | + |
12 | +# i18n |
13 | +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefont:CONSOLEFONT" |
14 | +add_dracutmodules+=" shutdown" |
15 | +stdloglvl=3 |
16 | +prefix=/run/initramfs |
17 | diff -Naur dracut-010/dracut-gencmdline dracut-010-magellan/dracut-gencmdline |
18 | --- dracut-010/dracut-gencmdline 2011-06-04 16:28:47.000000000 +0200 |
19 | +++ dracut-010-magellan/dracut-gencmdline 2011-06-04 16:31:55.000000000 +0200 |
20 | @@ -103,7 +103,7 @@ |
21 | LD_SO_CONF=/etc/ld.so.conf |
22 | LD_SO_CONF_D=/etc/ld.so.conf.d/ |
23 | |
24 | -[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd |
25 | +[ -e /etc/conf.d/mkinitrd ] && . /etc/conf.d/mkinitrd |
26 | |
27 | CONFMODS="$MODULES" |
28 | MODULES="" |
29 | @@ -599,6 +599,9 @@ |
30 | shift |
31 | done |
32 | |
33 | +# HACK: always pass a kernel version |
34 | +[ -z "$kernel" ] && kernel=$(uname -r) |
35 | + |
36 | [ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab) |
37 | [ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab) |
38 | [ -z "$rootopts" ] && rootopts="defaults" |
39 | @@ -697,8 +700,10 @@ |
40 | fi |
41 | |
42 | # output local keyboard/18n settings |
43 | -[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard |
44 | -[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n |
45 | +[ -e /etc/conf.d/keymap ] && . /etc/conf.d/keymap |
46 | +[ -e /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont |
47 | +[ -n "$KEYMAP" ] && KEYTABLE="$KEYMAP" |
48 | +[ -n "$CONSOLEFONT" ] && SYSFONT="$CONSOLEFONT" |
49 | |
50 | for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do |
51 | val=$(eval echo \$$i) |
52 | diff -Naur dracut-010/Makefile dracut-010-magellan/Makefile |
53 | --- dracut-010/Makefile 2011-06-04 16:28:47.000000000 +0200 |
54 | +++ dracut-010-magellan/Makefile 2011-06-04 16:32:54.000000000 +0200 |
55 | @@ -37,6 +37,9 @@ |
56 | install -m 0755 lsinitrd $(DESTDIR)$(sbindir)/lsinitrd |
57 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf |
58 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d |
59 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf |
60 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d |
61 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut |
62 | install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions |
63 | install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger |
64 | cp -arx modules.d $(DESTDIR)$(pkglibdir) |
65 | diff -Naur dracut-010/modules.d/95udev-rules/module-setup.sh dracut-010-magellan/modules.d/95udev-rules/module-setup.sh |
66 | --- dracut-010/modules.d/95udev-rules/module-setup.sh 2011-06-04 16:28:47.000000000 +0200 |
67 | +++ dracut-010-magellan/modules.d/95udev-rules/module-setup.sh 2011-06-04 16:33:21.000000000 +0200 |
68 | @@ -58,6 +58,13 @@ |
69 | [ -f /etc/arch-release ] && \ |
70 | inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh |
71 | |
72 | + # magellan uses a special modprobe script too |
73 | + if [ -f /etc/mageversion ] |
74 | + then |
75 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh |
76 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist |
77 | + fi |
78 | + |
79 | for _i in {"$libdir","$usrlibdir"}/libnss_files*; do |
80 | [ -e "$_i" ] && dracut_install "$_i" |
81 | done |