]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
dracut: Update to 005.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Mar 2010 00:01:51 +0000 (01:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Mar 2010 00:01:51 +0000 (01:01 +0100)
pkgs/core/dracut/dracut.nm
pkgs/core/dracut/patches/dracut-004-emergency.patch [deleted file]
pkgs/core/dracut/patches/dracut-004-firmware.patch [deleted file]

index 78cd1118dcbb6d6dd7914e551652e27b5b7fc0c0..e7aa89a3bdffb1f645ca60a5205054aab713c8ec 100644 (file)
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = dracut
-PKG_VER        = 004
+PKG_VER        = 005
 PKG_REL        = 0
 
 PKG_MAINTAINER =
diff --git a/pkgs/core/dracut/patches/dracut-004-emergency.patch b/pkgs/core/dracut/patches/dracut-004-emergency.patch
deleted file mode 100644 (file)
index 4f1d67f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644 (file)
index b838f83..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-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 \