diff -Naur dracut-016/dracut.conf.d/magellan.conf.example dracut-016-magellan/dracut.conf.d/magellan.conf.example
--- dracut-016/dracut.conf.d/magellan.conf.example	1970-01-01 01:00:00.000000000 +0100
+++ dracut-016-magellan/dracut.conf.d/magellan.conf.example	2012-02-18 04:25:02.000982932 +0100
@@ -0,0 +1,13 @@
+# /etc/dracut.conf.d/01-magellan.conf
+# Dracut config file customized for Magellan-Linux
+
+#
+# Modules
+#
+
+# i18n
+i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefont:CONSOLEFONT"
+add_dracutmodules+=" shutdown"
+stdloglvl=3
+realinitpath="/usr/lib/systemd/systemd"
+install_items+=" vi /etc/virc ps grep cat rm openvt "
diff -Naur dracut-016/dracut-gencmdline dracut-016-magellan/dracut-gencmdline
--- dracut-016/dracut-gencmdline	2012-02-15 18:05:34.000000000 +0100
+++ dracut-016-magellan/dracut-gencmdline	2012-02-18 04:24:09.407982932 +0100
@@ -103,7 +103,7 @@
 LD_SO_CONF=/etc/ld.so.conf
 LD_SO_CONF_D=/etc/ld.so.conf.d/
 
-[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd
+[ -e /etc/conf.d/mkinitrd ] && . /etc/conf.d/mkinitrd
 
 CONFMODS="$MODULES"
 MODULES=""
@@ -599,6 +599,9 @@
     shift
 done
 
+# HACK: always pass a kernel version
+[ -z "$kernel" ] && kernel=$(uname -r)
+
 [ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
 [ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab)
 [ -z "$rootopts" ] && rootopts="defaults"
@@ -697,8 +700,10 @@
 fi
 
 # output local keyboard/18n settings
-[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard
-[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+[ -e /etc/conf.d/keymap ] && . /etc/conf.d/keymap
+[ -e /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont
+[ -n "$KEYMAP" ] && KEYTABLE="$KEYMAP"
+[ -n "$CONSOLEFONT" ] && SYSFONT="$CONSOLEFONT"
 
 for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do
     val=$(eval echo \$$i)
diff -Naur dracut-016/Makefile dracut-016-magellan/Makefile
--- dracut-016/Makefile	2012-02-15 18:05:34.000000000 +0100
+++ dracut-016-magellan/Makefile	2012-02-18 04:24:09.408982932 +0100
@@ -38,6 +38,9 @@
 	install -m 0755 lsinitrd $(DESTDIR)$(bindir)/lsinitrd
 	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
 	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
+	install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf
+	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
+	install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut
 	install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
 	install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger
 	install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
diff -Naur dracut-016/Makefile.orig dracut-016-magellan/Makefile.orig
--- dracut-016/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
+++ dracut-016-magellan/Makefile.orig	2012-02-15 18:05:34.000000000 +0100
@@ -0,0 +1,116 @@
+VERSION=016
+GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)
+
+prefix ?= /usr
+libdir ?= ${prefix}/lib
+datadir ?= ${prefix}/share
+pkglibdir ?= ${libdir}/dracut
+sysconfdir ?= ${prefix}/etc
+bindir ?= ${prefix}/bin
+mandir ?= ${prefix}/share/man
+
+manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
+
+.PHONY: install clean archive rpm testimage test all check AUTHORS doc
+
+doc: $(manpages) dracut.html
+all: syncheck
+
+%: %.xml
+	xsltproc -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+dracut.html: dracut.xml $(manpages)
+	xsltproc -o dracut.html --xinclude -nonet \
+		--stringparam draft.mode yes \
+		--stringparam html.stylesheet http://docs.redhat.com/docs/en-US/Common_Content/css/default.css \
+		http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl dracut.xml
+
+install: doc
+	mkdir -p $(DESTDIR)$(pkglibdir)
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(sysconfdir)
+	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
+	mkdir -p $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
+	install -m 0755 dracut $(DESTDIR)$(bindir)/dracut
+	install -m 0755 dracut-gencmdline $(DESTDIR)$(bindir)/dracut-gencmdline
+	install -m 0755 dracut-catimages $(DESTDIR)$(bindir)/dracut-catimages
+	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
+	install -m 0755 lsinitrd $(DESTDIR)$(bindir)/lsinitrd
+	install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
+	mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
+	install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
+	install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger
+	install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
+	cp -arx modules.d $(DESTDIR)$(pkglibdir)
+	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8
+	install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8
+	install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8
+	install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5
+	install -m 0644 dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.cmdline.7
+	ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
+	if [ -n "$(systemdsystemunitdir)" ]; then \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir); \
+		install -m 0644 dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir); \
+		mkdir -p $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants; \
+		ln -s ../dracut-shutdown.service $(DESTDIR)$(systemdsystemunitdir)/reboot.target.wants/dracut-shutdown.service; \
+	fi
+
+clean:
+	$(RM) *~
+	$(RM) */*~
+	$(RM) */*/*~
+	$(RM) test-*.img
+	$(RM) dracut-*.rpm dracut-*.tar.bz2
+	$(RM) $(manpages) dracut.html
+	$(MAKE) -C test clean
+
+archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2
+
+dist: dracut-$(VERSION).tar.gz
+
+dracut-$(VERSION).tar.bz2:
+	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |bzip2 > dracut-$(VERSION).tar.bz2
+
+dracut-$(VERSION).tar.gz:
+	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |gzip > dracut-$(VERSION).tar.gz
+
+rpm: dracut-$(VERSION).tar.bz2
+	rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
+	cp dracut-$(VERSION).tar.bz2 "$$rpmbuild"; \
+	$$src/git2spec.pl $(VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+	(cd "$$rpmbuild"; rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
+	        --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
+		--define "_rpmdir $$PWD" -ba dracut.spec; ) && \
+	( mv "$$rpmbuild"/noarch/*.rpm .; mv "$$rpmbuild"/*.src.rpm .;rm -fr "$$rpmbuild"; ls *.rpm )
+
+syncheck:
+	@ret=0;for i in dracut-initramfs-restore.sh dracut-logger \
+                        modules.d/99base/init modules.d/*/*.sh; do \
+                [ "$${i##*/}" = "module-setup.sh" ] && continue; \
+                [ "$${i##*/}" = "caps.sh" ] && continue; \
+		dash -n "$$i" ; ret=$$(($$ret+$$?)); \
+	done;exit $$ret
+	@ret=0;for i in mkinitrd-dracut.sh dracut modules.d/02caps/caps.sh \
+	                modules.d/*/module-setup.sh; do \
+		bash -n "$$i" ; ret=$$(($$ret+$$?)); \
+	done;exit $$ret
+
+check: all syncheck
+	$(MAKE) -C test check
+
+testimage: all
+	./dracut -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	@echo wrote  test-$(shell uname -r).img 
+
+testimages: all
+	./dracut -l -a debug --kernel-only -f test-kernel-$(shell uname -r).img $(shell uname -r)
+	@echo wrote  test-$(shell uname -r).img 
+	./dracut -l -a debug --no-kernel -f test-dracut.img $(shell uname -r)
+	@echo wrote  test-dracut.img 
+
+hostimage: all
+	./dracut -H -l -a debug -f test-$(shell uname -r).img $(shell uname -r)
+	@echo wrote  test-$(shell uname -r).img 
+
+AUTHORS:
+	git shortlog  --numbered --summary -e |while read a rest; do echo $$rest;done > AUTHORS
diff -Naur dracut-016/modules.d/00loop/loop.sh dracut-016-magellan/modules.d/00loop/loop.sh
--- dracut-016/modules.d/00loop/loop.sh	1970-01-01 01:00:00.000000000 +0100
+++ dracut-016-magellan/modules.d/00loop/loop.sh	2012-02-18 04:24:09.408982932 +0100
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+modprobe loop
+modprobe cryptoloop
+
diff -Naur dracut-016/modules.d/00loop/module-setup.sh dracut-016-magellan/modules.d/00loop/module-setup.sh
--- dracut-016/modules.d/00loop/module-setup.sh	1970-01-01 01:00:00.000000000 +0100
+++ dracut-016-magellan/modules.d/00loop/module-setup.sh	2012-02-18 04:24:09.408982932 +0100
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+check() {
+    [ -f /etc/mageversion ]
+}
+
+depends() {
+    return 0
+}
+
+installkernel() {
+    hostonly='' instmods loop cryptoloop
+}
+
+install() {
+    inst_hook pre-udev 10 "$moddir"/loop.sh
+}
+
diff -Naur dracut-016/modules.d/40uvesafb/module-setup.sh dracut-016-magellan/modules.d/40uvesafb/module-setup.sh
--- dracut-016/modules.d/40uvesafb/module-setup.sh	1970-01-01 01:00:00.000000000 +0100
+++ dracut-016-magellan/modules.d/40uvesafb/module-setup.sh	2012-02-18 04:24:09.408982932 +0100
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+check() {
+   [ -x /sbin/v86d ]
+}
+
+depends() {
+   return 0
+}
+
+installkernel() {
+   hostonly='' instmods uvesafb
+}
+
+install() {
+   dracut_install /sbin/v86d
+   inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh
+}
diff -Naur dracut-016/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-016-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh
--- dracut-016/modules.d/40uvesafb/uvesafb-pretrigger.sh	1970-01-01 01:00:00.000000000 +0100
+++ dracut-016-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh	2012-02-18 04:24:09.408982932 +0100
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then
+   [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb
+fi
diff -Naur dracut-016/modules.d/95udev-rules/module-setup.sh dracut-016-magellan/modules.d/95udev-rules/module-setup.sh
--- dracut-016/modules.d/95udev-rules/module-setup.sh	2012-02-15 18:05:34.000000000 +0100
+++ dracut-016-magellan/modules.d/95udev-rules/module-setup.sh	2012-02-18 04:24:09.408982932 +0100
@@ -74,6 +74,13 @@
     [ -f /etc/arch-release ] && \
         inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh
 
+    # magellan uses a special modprobe script too
+    if [ -f /etc/mageversion ]
+    then
+        [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh
+        [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist
+    fi
+
     for _i in {"$libdir","$usrlibdir"}/libnss_files*; do
         [ -e "$_i" ] && dracut_install "$_i"
     done