From 76023cc05a69562f9ef2861ebc972364fcc3bda9 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Mar 2010 23:18:40 +0100
Subject: [PATCH] dracut: New package.

---
 pkgs/core/dracut/dracut.nm                    | 58 +++++++++++++++++++
 .../dracut/patches/dracut-004-emergency.patch | 19 ++++++
 .../dracut/patches/dracut-004-firmware.patch  | 19 ++++++
 3 files changed, 96 insertions(+)
 create mode 100644 pkgs/core/dracut/dracut.nm
 create mode 100644 pkgs/core/dracut/patches/dracut-004-emergency.patch
 create mode 100644 pkgs/core/dracut/patches/dracut-004-firmware.patch

diff --git a/pkgs/core/dracut/dracut.nm b/pkgs/core/dracut/dracut.nm
new file mode 100644
index 000000000..78cd1118d
--- /dev/null
+++ b/pkgs/core/dracut/dracut.nm
@@ -0,0 +1,58 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME       = dracut
+PKG_VER        = 004
+PKG_REL        = 0
+
+PKG_MAINTAINER =
+PKG_GROUP      = System/Boot
+PKG_URL        = http://sourceforge.net/apps/trac/dracut/wiki
+PKG_LICENSE    = GPLv2+
+PKG_SUMMARY    = Initramfs generator using udev.
+
+PKG_DEPS      += bash bzip2 cpio coreutils dmraid e2fsprogs gzip kbd lvm2 \
+	mdadm udev which
+
+define PKG_DESCRIPTION
+	dracut is a new, event-driven initramfs infrastructure based around udev.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.bz2
+
+define STAGE_PREPARE_CMDS
+	# All check scripts must be executeable
+	cd $(DIR_APP) && chmod 0755 modules.d/*/check
+endef
+
+define STAGE_BUILD
+	cd $(DIR_APP) && make WITH_SWITCH_ROOT=1
+endef
+
+define STAGE_INSTALL
+	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) WITH_SWITCH_ROOT=1 \
+		sbindir=/sbin sysconfdir=/etc mandir=/usr/share/man
+endef
diff --git a/pkgs/core/dracut/patches/dracut-004-emergency.patch b/pkgs/core/dracut/patches/dracut-004-emergency.patch
new file mode 100644
index 000000000..4f1d67fc4
--- /dev/null
+++ b/pkgs/core/dracut/patches/dracut-004-emergency.patch
@@ -0,0 +1,19 @@
+commit 5db587d7c118afc47b50b4872100b508c84646fa
+Author: Harald Hoyer <harald@redhat.com>
+Date:   Wed Jan 20 16:04:55 2010 +0100
+
+    init: fixed emergency_shell argument parsing
+
+diff --git a/modules.d/99base/init b/modules.d/99base/init
+index 8dc00a9..ab033a7 100755
+--- a/modules.d/99base/init
++++ b/modules.d/99base/init
+@@ -35,7 +35,7 @@ wait_for_loginit()
+ 
+ emergency_shell()
+ {
+-    if [ $1 = "-n" ]; then
++    if [ "$1" = "-n" ]; then
+         _rdshell_name=$2
+         shift 2 
+     else
diff --git a/pkgs/core/dracut/patches/dracut-004-firmware.patch b/pkgs/core/dracut/patches/dracut-004-firmware.patch
new file mode 100644
index 000000000..b838f831a
--- /dev/null
+++ b/pkgs/core/dracut/patches/dracut-004-firmware.patch
@@ -0,0 +1,19 @@
+diff -up dracut-004/modules.d/95udev-rules/install.fw dracut-004/modules.d/95udev-rules/install
+--- dracut-004/modules.d/95udev-rules/install.fw	2010-01-29 16:40:11.000000000 +0100
++++ dracut-004/modules.d/95udev-rules/install	2010-01-29 16:40:25.000000000 +0100
+@@ -15,7 +15,6 @@ inst_rules "$moddir/01-ignore.rules"
+ 
+ # for firmware loading
+ inst_rules 50-firmware.rules
+-dracut_install /lib/udev/firmware.sh
+ dracut_install cat uname
+ 
+ if [ ! -x /lib/udev/vol_id ]; then
+@@ -31,6 +30,7 @@ ata_id \
+ cdrom_id \
+ create_floppy_devices \
+ edd_id \
++firmware \
+ firmware.sh \
+ fw_unit_symlinks.sh \
+ hid2hci \
-- 
2.39.5