Annotation of /trunk/dracut/patches/dracut-014-magellan.patch
Parent Directory | Revision Log
Revision 2171 -
(hide annotations)
(download)
Tue May 7 11:19:52 2013 UTC (11 years, 4 months ago) by niro
File size: 5612 byte(s)
Tue May 7 11:19:52 2013 UTC (11 years, 4 months ago) by niro
File size: 5612 byte(s)
-more busybox-compat patches
1 | niro | 1637 | diff -Naur dracut-014_20120205/dracut.conf.d/magellan.conf.example dracut-014_20120205-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-014_20120205/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 | ||
3 | +++ dracut-014_20120205-magellan/dracut.conf.d/magellan.conf.example 2012-02-05 03:34:59.259982932 +0100 | ||
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-014_20120205/dracut-gencmdline dracut-014_20120205-magellan/dracut-gencmdline | ||
18 | --- dracut-014_20120205/dracut-gencmdline 2012-02-02 19:18:48.000000000 +0100 | ||
19 | +++ dracut-014_20120205-magellan/dracut-gencmdline 2012-02-05 03:34:59.259982932 +0100 | ||
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-014_20120205/Makefile dracut-014_20120205-magellan/Makefile | ||
53 | --- dracut-014_20120205/Makefile 2012-02-02 19:18:48.000000000 +0100 | ||
54 | +++ dracut-014_20120205-magellan/Makefile 2012-02-05 03:34:59.260982932 +0100 | ||
55 | @@ -38,6 +38,9 @@ | ||
56 | install -m 0755 lsinitrd $(DESTDIR)$(bindir)/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-014_20120205/modules.d/00loop/loop.sh dracut-014_20120205-magellan/modules.d/00loop/loop.sh | ||
66 | --- dracut-014_20120205/modules.d/00loop/loop.sh 1970-01-01 01:00:00.000000000 +0100 | ||
67 | +++ dracut-014_20120205-magellan/modules.d/00loop/loop.sh 2012-02-05 03:34:59.260982932 +0100 | ||
68 | @@ -0,0 +1,5 @@ | ||
69 | +#!/bin/sh | ||
70 | + | ||
71 | +modprobe loop | ||
72 | +modprobe cryptoloop | ||
73 | + | ||
74 | diff -Naur dracut-014_20120205/modules.d/00loop/module-setup.sh dracut-014_20120205-magellan/modules.d/00loop/module-setup.sh | ||
75 | --- dracut-014_20120205/modules.d/00loop/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 | ||
76 | +++ dracut-014_20120205-magellan/modules.d/00loop/module-setup.sh 2012-02-05 03:34:59.260982932 +0100 | ||
77 | @@ -0,0 +1,18 @@ | ||
78 | +#!/bin/bash | ||
79 | + | ||
80 | +check() { | ||
81 | + [ -f /etc/mageversion ] | ||
82 | +} | ||
83 | + | ||
84 | +depends() { | ||
85 | + return 0 | ||
86 | +} | ||
87 | + | ||
88 | +installkernel() { | ||
89 | + hostonly='' instmods loop cryptoloop | ||
90 | +} | ||
91 | + | ||
92 | +install() { | ||
93 | + inst_hook pre-udev 10 "$moddir"/loop.sh | ||
94 | +} | ||
95 | + | ||
96 | diff -Naur dracut-014_20120205/modules.d/40uvesafb/module-setup.sh dracut-014_20120205-magellan/modules.d/40uvesafb/module-setup.sh | ||
97 | --- dracut-014_20120205/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 | ||
98 | +++ dracut-014_20120205-magellan/modules.d/40uvesafb/module-setup.sh 2012-02-05 03:36:50.298982933 +0100 | ||
99 | @@ -0,0 +1,18 @@ | ||
100 | +#!/bin/bash | ||
101 | + | ||
102 | +check() { | ||
103 | + [ -x /sbin/v86d ] | ||
104 | +} | ||
105 | + | ||
106 | +depends() { | ||
107 | + return 0 | ||
108 | +} | ||
109 | + | ||
110 | +installkernel() { | ||
111 | + hostonly='' instmods uvesafb | ||
112 | +} | ||
113 | + | ||
114 | +install() { | ||
115 | + dracut_install /sbin/v86d | ||
116 | niro | 2171 | + inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh |
117 | niro | 1637 | +} |
118 | diff -Naur dracut-014_20120205/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-014_20120205-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh | ||
119 | --- dracut-014_20120205/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100 | ||
120 | +++ dracut-014_20120205-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-02-05 03:36:02.371982932 +0100 | ||
121 | @@ -0,0 +1,5 @@ | ||
122 | +#!/bin/sh | ||
123 | + | ||
124 | +if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then | ||
125 | + [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb | ||
126 | +fi | ||
127 | diff -Naur dracut-014_20120205/modules.d/95udev-rules/module-setup.sh dracut-014_20120205-magellan/modules.d/95udev-rules/module-setup.sh | ||
128 | --- dracut-014_20120205/modules.d/95udev-rules/module-setup.sh 2012-02-02 19:18:48.000000000 +0100 | ||
129 | +++ dracut-014_20120205-magellan/modules.d/95udev-rules/module-setup.sh 2012-02-05 03:34:59.260982932 +0100 | ||
130 | @@ -74,6 +74,13 @@ | ||
131 | [ -f /etc/arch-release ] && \ | ||
132 | inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh | ||
133 | |||
134 | + # magellan uses a special modprobe script too | ||
135 | + if [ -f /etc/mageversion ] | ||
136 | + then | ||
137 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh | ||
138 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist | ||
139 | + fi | ||
140 | + | ||
141 | for _i in {"$libdir","$usrlibdir"}/libnss_files*; do | ||
142 | [ -e "$_i" ] && dracut_install "$_i" | ||
143 | done |