Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/dracut/patches/dracut-016-magellan.patch

    Contents of /trunk/dracut/patches/dracut-016-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1650 - (show annotations) (download)
    Sat Feb 18 02:35:36 2012 UTC (12 years, 2 months ago) by niro
    File size: 10589 byte(s) 
    -rediffed for dracut-016
    1 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 04:25:02.000982932 +0100
    4 @@ -0,0 +1,13 @@
    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 +realinitpath="/usr/lib/systemd/systemd"
    17 +install_items+=" vi /etc/virc ps grep cat rm openvt "
    18 diff -Naur dracut-016/dracut-gencmdline dracut-016-magellan/dracut-gencmdline
    19 --- dracut-016/dracut-gencmdline 2012-02-15 18:05:34.000000000 +0100
    20 +++ dracut-016-magellan/dracut-gencmdline 2012-02-18 04:24:09.407982932 +0100
    21 @@ -103,7 +103,7 @@
    22 LD_SO_CONF=/etc/ld.so.conf
    23 LD_SO_CONF_D=/etc/ld.so.conf.d/
    24
    25 -[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd
    26 +[ -e /etc/conf.d/mkinitrd ] && . /etc/conf.d/mkinitrd
    27
    28 CONFMODS="$MODULES"
    29 MODULES=""
    30 @@ -599,6 +599,9 @@
    31 shift
    32 done
    33
    34 +# HACK: always pass a kernel version
    35 +[ -z "$kernel" ] && kernel=$(uname -r)
    36 +
    37 [ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
    38 [ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab)
    39 [ -z "$rootopts" ] && rootopts="defaults"
    40 @@ -697,8 +700,10 @@
    41 fi
    42
    43 # output local keyboard/18n settings
    44 -[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
    45 -[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
    46 +[ -e /etc/conf.d/keymap ] && . /etc/conf.d/keymap
    47 +[ -e /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont
    48 +[ -n "$KEYMAP" ] && KEYTABLE="$KEYMAP"
    49 +[ -n "$CONSOLEFONT" ] && SYSFONT="$CONSOLEFONT"
    50
    51 for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do
    52 val=$(eval echo \$$i)
    53 diff -Naur dracut-016/Makefile dracut-016-magellan/Makefile
    54 --- dracut-016/Makefile 2012-02-15 18:05:34.000000000 +0100
    55 +++ dracut-016-magellan/Makefile 2012-02-18 04:24:09.408982932 +0100
    56 @@ -38,6 +38,9 @@
    57 install -m 0755 lsinitrd $(DESTDIR)$(bindir)/lsinitrd
    58 install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
    59 mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
    60 + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf
    61 + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
    62 + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut
    63 install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
    64 install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger
    65 install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
    66 diff -Naur dracut-016/Makefile.orig dracut-016-magellan/Makefile.orig
    67 --- dracut-016/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
    68 +++ dracut-016-magellan/Makefile.orig 2012-02-15 18:05:34.000000000 +0100
    69 @@ -0,0 +1,116 @@
    70 +VERSION=016
    71 +GITVERSION=$(shell [ -d .git ] && git rev-list --abbrev-commit -n 1 HEAD |cut -b 1-8)
    72 +
    73 +prefix ?= /usr
    74 +libdir ?= ${prefix}/lib
    75 +datadir ?= ${prefix}/share
    76 +pkglibdir ?= ${libdir}/dracut
    77 +sysconfdir ?= ${prefix}/etc
    78 +bindir ?= ${prefix}/bin
    79 +mandir ?= ${prefix}/share/man
    80 +
    81 +manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8 dracut-gencmdline.8
    82 +
    83 +.PHONY: install clean archive rpm testimage test all check AUTHORS doc
    84 +
    85 +doc: $(manpages) dracut.html
    86 +all: syncheck
    87 +
    88 +%: %.xml
    89 + xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
    90 +
    91 +dracut.html: dracut.xml $(manpages)
    92 + xsltproc -o dracut.html --xinclude -nonet \
    93 + --stringparam draft.mode yes \
    94 + --stringparam html.stylesheet http://docs.redhat.com/docs/en-US/Common_Content/css/default.css \
    95 + http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
    96 +
    97 +install: doc
    98 + mkdir -p $(DESTDIR)$(pkglibdir)
    99 + mkdir -p $(DESTDIR)$(bindir)
    100 + mkdir -p $(DESTDIR)$(sysconfdir)
    101 + mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
    102 + mkdir -p $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
    103 + install -m 0755 dracut $(DESTDIR)$(bindir)/dracut
    104 + install -m 0755 dracut-gencmdline $(DESTDIR)$(bindir)/dracut-gencmdline
    105 + install -m 0755 dracut-catimages $(DESTDIR)$(bindir)/dracut-catimages
    106 + install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
    107 + install -m 0755 lsinitrd $(DESTDIR)$(bindir)/lsinitrd
    108 + install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
    109 + mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
    110 + install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
    111 + install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger
    112 + install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
    113 + cp -arx modules.d $(DESTDIR)$(pkglibdir)
    114 + install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8
    115 + install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8
    116 + install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8
    117 + install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5
    118 + install -m 0644 dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.cmdline.7
    119 + ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
    120 + if [ -n "$(systemdsystemunitdir)" ]; then \
    121 + mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
    122 + install -m 0644 dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir); \
    123 + mkdir -p $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants; \
    124 + ln -s ../dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants/dracut-shutdown.service; \
    125 + fi
    126 +
    127 +clean:
    128 + $(RM) *~
    129 + $(RM) */*~
    130 + $(RM) */*/*~
    131 + $(RM) test-*.img
    132 + $(RM) dracut-*.rpm dracut-*.tar.bz2
    133 + $(RM) $(manpages) dracut.html
    134 + $(MAKE) -C test clean
    135 +
    136 +archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2
    137 +
    138 +dist: dracut-$(VERSION).tar.gz
    139 +
    140 +dracut-$(VERSION).tar.bz2:
    141 + git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |bzip2 > dracut-$(VERSION).tar.bz2
    142 +
    143 +dracut-$(VERSION).tar.gz:
    144 + git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |gzip > dracut-$(VERSION).tar.gz
    145 +
    146 +rpm: dracut-$(VERSION).tar.bz2
    147 + rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
    148 + cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
    149 + $$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
    150 + (cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
    151 + --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
    152 + --define "_rpmdir $$PWD" -ba dracut.spec; ) && \
    153 + ( mv "$$rpmbuild"/noarch/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )
    154 +
    155 +syncheck:
    156 + @ret=0;for i in dracut-initramfs-restore.sh dracut-logger \
    157 + modules.d/99base/init modules.d/*/*.sh; do \
    158 + [ "$${i##*/}" = "module-setup.sh" ] && continue; \
    159 + [ "$${i##*/}" = "caps.sh" ] && continue; \
    160 + dash -n "$$i" ; ret=$$(($$ret+$$?)); \
    161 + done;exit $$ret
    162 + @ret=0;for i in mkinitrd-dracut.sh dracut modules.d/02caps/caps.sh \
    163 + modules.d/*/module-setup.sh; do \
    164 + bash -n "$$i" ; ret=$$(($$ret+$$?)); \
    165 + done;exit $$ret
    166 +
    167 +check: all syncheck
    168 + $(MAKE) -C test check
    169 +
    170 +testimage: all
    171 + ./dracut -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
    172 + @echo wrote test-$(shell uname -r).img
    173 +
    174 +testimages: all
    175 + ./dracut -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
    176 + @echo wrote test-$(shell uname -r).img
    177 + ./dracut -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
    178 + @echo wrote test-dracut.img
    179 +
    180 +hostimage: all
    181 + ./dracut -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
    182 + @echo wrote test-$(shell uname -r).img
    183 +
    184 +AUTHORS:
    185 + git shortlog --numbered --summary -e |while read a rest; do echo $$rest;done > AUTHORS
    186 diff -Naur dracut-016/modules.d/00loop/loop.sh dracut-016-magellan/modules.d/00loop/loop.sh
    187 --- dracut-016/modules.d/00loop/loop.sh 1970-01-01 01:00:00.000000000 +0100
    188 +++ dracut-016-magellan/modules.d/00loop/loop.sh 2012-02-18 04:24:09.408982932 +0100
    189 @@ -0,0 +1,5 @@
    190 +#!/bin/sh
    191 +
    192 +modprobe loop
    193 +modprobe cryptoloop
    194 +
    195 diff -Naur dracut-016/modules.d/00loop/module-setup.sh dracut-016-magellan/modules.d/00loop/module-setup.sh
    196 --- dracut-016/modules.d/00loop/module-setup.sh 1970-01-01 01:00:00.000000000 +0100
    197 +++ dracut-016-magellan/modules.d/00loop/module-setup.sh 2012-02-18 04:24:09.408982932 +0100
    198 @@ -0,0 +1,18 @@
    199 +#!/bin/bash
    200 +
    201 +check() {
    202 + [ -f /etc/mageversion ]
    203 +}
    204 +
    205 +depends() {
    206 + return 0
    207 +}
    208 +
    209 +installkernel() {
    210 + hostonly='' instmods loop cryptoloop
    211 +}
    212 +
    213 +install() {
    214 + inst_hook pre-udev 10 "$moddir"/loop.sh
    215 +}
    216 +
    217 diff -Naur dracut-016/modules.d/40uvesafb/module-setup.sh dracut-016-magellan/modules.d/40uvesafb/module-setup.sh
    218 --- dracut-016/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100
    219 +++ dracut-016-magellan/modules.d/40uvesafb/module-setup.sh 2012-02-18 04:24:09.408982932 +0100
    220 @@ -0,0 +1,18 @@
    221 +#!/bin/bash
    222 +
    223 +check() {
    224 + [ -x /sbin/v86d ]
    225 +}
    226 +
    227 +depends() {
    228 + return 0
    229 +}
    230 +
    231 +installkernel() {
    232 + hostonly='' instmods uvesafb
    233 +}
    234 +
    235 +install() {
    236 + dracut_install /sbin/v86d
    237 + inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh
    238 +}
    239 diff -Naur dracut-016/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-016-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh
    240 --- dracut-016/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100
    241 +++ dracut-016-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-02-18 04:24:09.408982932 +0100
    242 @@ -0,0 +1,5 @@
    243 +#!/bin/sh
    244 +
    245 +if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then
    246 + [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb
    247 +fi
    248 diff -Naur dracut-016/modules.d/95udev-rules/module-setup.sh dracut-016-magellan/modules.d/95udev-rules/module-setup.sh
    249 --- dracut-016/modules.d/95udev-rules/module-setup.sh 2012-02-15 18:05:34.000000000 +0100
    250 +++ dracut-016-magellan/modules.d/95udev-rules/module-setup.sh 2012-02-18 04:24:09.408982932 +0100
    251 @@ -74,6 +74,13 @@
    252 [ -f /etc/arch-release ] && \
    253 inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh
    254
    255 + # magellan uses a special modprobe script too
    256 + if [ -f /etc/mageversion ]
    257 + then
    258 + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh
    259 + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist
    260 + fi
    261 +
    262 for _i in {"$libdir","$usrlibdir"}/libnss_files*; do
    263 [ -e "$_i" ] && dracut_install "$_i"
    264 done