Annotation of /trunk/dracut/patches/dracut-016-magellan-4.patch
Parent Directory | Revision Log
Revision 1674 -
(hide annotations)
(download)
Sat Mar 3 11:20:09 2012 UTC (12 years, 6 months ago) by niro
File size: 4632 byte(s)
Sat Mar 3 11:20:09 2012 UTC (12 years, 6 months ago) by niro
File size: 4632 byte(s)
-refactor patches
1 | niro | 1674 | diff -Naur dracut-016/dracut.conf.d/magellan.conf.example dracut-016-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-016/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 | ||
3 | +++ dracut-016-magellan/dracut.conf.d/magellan.conf.example 2012-02-18 14:00:33.646982932 +0100 | ||
4 | @@ -0,0 +1,14 @@ | ||
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 | +realinitpath="/usr/bin/systemd" | ||
18 | +install_items+=" nano /etc/nanorc lsmod ps grep cat rm openvt " | ||
19 | diff -Naur dracut-016/dracut-gencmdline dracut-016-magellan/dracut-gencmdline | ||
20 | --- dracut-016/dracut-gencmdline 2012-02-15 18:05:34.000000000 +0100 | ||
21 | +++ dracut-016-magellan/dracut-gencmdline 2012-02-18 13:17:15.019982932 +0100 | ||
22 | @@ -103,7 +103,7 @@ | ||
23 | LD_SO_CONF=/etc/ld.so.conf | ||
24 | LD_SO_CONF_D=/etc/ld.so.conf.d/ | ||
25 | |||
26 | -[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd | ||
27 | +[ -e /etc/conf.d/mkinitrd ] && . /etc/conf.d/mkinitrd | ||
28 | |||
29 | CONFMODS="$MODULES" | ||
30 | MODULES="" | ||
31 | @@ -599,6 +599,9 @@ | ||
32 | shift | ||
33 | done | ||
34 | |||
35 | +# HACK: always pass a kernel version | ||
36 | +[ -z "$kernel" ] && kernel=$(uname -r) | ||
37 | + | ||
38 | [ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab) | ||
39 | [ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab) | ||
40 | [ -z "$rootopts" ] && rootopts="defaults" | ||
41 | @@ -697,8 +700,10 @@ | ||
42 | fi | ||
43 | |||
44 | # output local keyboard/18n settings | ||
45 | -[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard | ||
46 | -[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n | ||
47 | +[ -e /etc/conf.d/keymap ] && . /etc/conf.d/keymap | ||
48 | +[ -e /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont | ||
49 | +[ -n "$KEYMAP" ] && KEYTABLE="$KEYMAP" | ||
50 | +[ -n "$CONSOLEFONT" ] && SYSFONT="$CONSOLEFONT" | ||
51 | |||
52 | for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do | ||
53 | val=$(eval echo \$$i) | ||
54 | diff -Naur dracut-016/Makefile dracut-016-magellan/Makefile | ||
55 | --- dracut-016/Makefile 2012-02-15 18:05:34.000000000 +0100 | ||
56 | +++ dracut-016-magellan/Makefile 2012-02-18 13:17:15.019982932 +0100 | ||
57 | @@ -38,6 +38,9 @@ | ||
58 | install -m 0755 lsinitrd $(DESTDIR)$(bindir)/lsinitrd | ||
59 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf | ||
60 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d | ||
61 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf | ||
62 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d | ||
63 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut | ||
64 | install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions | ||
65 | install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger | ||
66 | install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore | ||
67 | diff -Naur dracut-016/modules.d/40uvesafb/module-setup.sh dracut-016-magellan/modules.d/40uvesafb/module-setup.sh | ||
68 | --- dracut-016/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 | ||
69 | +++ dracut-016-magellan/modules.d/40uvesafb/module-setup.sh 2012-02-18 13:17:15.020982932 +0100 | ||
70 | @@ -0,0 +1,18 @@ | ||
71 | +#!/bin/bash | ||
72 | + | ||
73 | +check() { | ||
74 | + [ -x /sbin/v86d ] | ||
75 | +} | ||
76 | + | ||
77 | +depends() { | ||
78 | + return 0 | ||
79 | +} | ||
80 | + | ||
81 | +installkernel() { | ||
82 | + hostonly='' instmods uvesafb | ||
83 | +} | ||
84 | + | ||
85 | +install() { | ||
86 | + dracut_install /sbin/v86d | ||
87 | + inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh | ||
88 | +} | ||
89 | diff -Naur dracut-016/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-016-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh | ||
90 | --- dracut-016/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100 | ||
91 | +++ dracut-016-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-02-18 13:17:15.020982932 +0100 | ||
92 | @@ -0,0 +1,5 @@ | ||
93 | +#!/bin/sh | ||
94 | + | ||
95 | +if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then | ||
96 | + [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb | ||
97 | +fi | ||
98 | diff -Naur dracut-016/modules.d/95udev-rules/module-setup.sh dracut-016-magellan/modules.d/95udev-rules/module-setup.sh | ||
99 | --- dracut-016/modules.d/95udev-rules/module-setup.sh 2012-02-15 18:05:34.000000000 +0100 | ||
100 | +++ dracut-016-magellan/modules.d/95udev-rules/module-setup.sh 2012-02-18 13:17:15.020982932 +0100 | ||
101 | @@ -74,6 +74,13 @@ | ||
102 | [ -f /etc/arch-release ] && \ | ||
103 | inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh | ||
104 | |||
105 | + # magellan uses a special modprobe script too | ||
106 | + if [ -f /etc/mageversion ] | ||
107 | + then | ||
108 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh | ||
109 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist | ||
110 | + fi | ||
111 | + | ||
112 | for _i in {"$libdir","$usrlibdir"}/libnss_files*; do | ||
113 | [ -e "$_i" ] && dracut_install "$_i" | ||
114 | done |