From 257221bdc997265d8c09b22f7f7703187033b508 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Jun 17 2010 09:07:35 +0000 Subject: - version 006 --- diff --git a/.cvsignore b/.cvsignore index 208a4cd..c172c2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dracut-004.tar.bz2 +dracut-006.tar.bz2 diff --git a/0001-dracut.8-fixed-LUKS-paragraph.patch b/0001-dracut.8-fixed-LUKS-paragraph.patch deleted file mode 100644 index 3721010..0000000 --- a/0001-dracut.8-fixed-LUKS-paragraph.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7ea25f3a3426bd60c26e2deaf07f2c3918e65dcb Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 7 Apr 2010 11:17:46 +0200 -Subject: [PATCH 01/15] dracut.8: fixed LUKS paragraph - ---- - dracut.8 | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/dracut.8 b/dracut.8 -index 3ec9c4f..5220dea 100644 ---- a/dracut.8 -+++ b/dracut.8 -@@ -214,8 +214,9 @@ only activate the LUKS partitions with the given UUID - Any "luks-" of the LUKS UUID is removed before comparing to . - The comparisons also matches, if is only the beginning of the - LUKS UUID, so you don't have to specify the full UUID. -+.TP - .BR rd_NO_CRYPTTAB --do not check if LUKS partition is in /etc/crypttab -+do not check, if LUKS partition is in /etc/crypttab - - .SS MD - .TP --- -1.7.0.1 - diff --git a/0002-dracut.8-add-information-which-parameter-can-be-spec.patch b/0002-dracut.8-add-information-which-parameter-can-be-spec.patch deleted file mode 100644 index 5e6adaf..0000000 --- a/0002-dracut.8-add-information-which-parameter-can-be-spec.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d1bae3cd17d61c5e27b66690a6a383a9bd0c369e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 7 Apr 2010 15:55:14 +0200 -Subject: [PATCH 02/15] dracut.8: add information, which parameter can be specified multiple times - ---- - dracut.8 | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/dracut.8 b/dracut.8 -index 5220dea..57626fe 100644 ---- a/dracut.8 -+++ b/dracut.8 -@@ -132,9 +132,11 @@ do not honor special mount options for the root filesystem found in - .TP - .BR rdblacklist= - do not load kernel module -+This parameter can be specified multiple times. - .TP - .BR rdloaddriver= - force loading kernel module -+This parameter can be specified multiple times. - - .SS Debug - .TP -@@ -214,6 +216,7 @@ only activate the LUKS partitions with the given UUID - Any "luks-" of the LUKS UUID is removed before comparing to . - The comparisons also matches, if is only the beginning of the - LUKS UUID, so you don't have to specify the full UUID. -+This parameter can be specified multiple times. - .TP - .BR rd_NO_CRYPTTAB - do not check, if LUKS partition is in /etc/crypttab -@@ -230,7 +233,8 @@ no MD RAID for imsm/isw raids, use dmraid instead - ignore mdadm.conf included in initramfs - .TP - .BR rd_MD_UUID= "" --only activate the raid sets with the given UUID -+only activate the raid sets with the given UUID. -+This parameter can be specified multiple times. - - .SS DMRAID - .TP -@@ -238,7 +242,8 @@ only activate the raid sets with the given UUID - disable DM RAID detection - .TP - .BR rd_DM_UUID= "" --only activate the raid sets with the given UUID -+only activate the raid sets with the given UUID. -+This parameter can be specified multiple times. - - .SS Network - .TP -@@ -251,19 +256,22 @@ auto6: do IPv6 autoconfiguration - .TP - .BR ip= :{dhcp|on|any|dhcp6|auto6} - dhcp|on|any|dhcp6: get ip from dhcp server on a specific interface -- - auto6: do IPv6 autoconfiguration -+This parameter can be specified multiple times. -+ - .TP - .ad l - .BR ip= "\%\::[]\::\::\::\::\::{none|off}" - .ad - explicit network configuration. If you want do define a IPv6 address, put it in brackets (e.g. [2001:DB8::1]). -+This parameter can be specified multiple times. - .TP - .BR ifname= : - Assign network device name (ie eth0) to the NIC with MAC . - Note letters in the MAC-address must be lowercase! - Note that if you use this option you \fBmust\fR specify an ifname= argument - for all interfaces used in ip= or fcoe= arguments -+This parameter can be specified multiple times. - .TP - .BR bootdev= - specify network interface to use routing and netroot information from. -@@ -371,6 +379,7 @@ same syntax as the kernel module parameter (s390 only) - .ad - activate DASD device with the given adaptor device bus ID and setting the sysfs attributes - to the specified values -+This parameter can be specified multiple times. - - .SS ZFCP - .TP --- -1.7.0.1 - diff --git a/0003-dmraid-parse-different-error-messages.patch b/0003-dmraid-parse-different-error-messages.patch deleted file mode 100644 index faf27b4..0000000 --- a/0003-dmraid-parse-different-error-messages.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d693f34afb5f4fccb75e44da2fa8378a67a0e68e Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 13 Apr 2010 12:54:12 +0200 -Subject: [PATCH 03/15] dmraid: parse different error messages - ---- - modules.d/90dmraid/dmraid.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh -index 4e47e2d..dba655b 100755 ---- a/modules.d/90dmraid/dmraid.sh -+++ b/modules.d/90dmraid/dmraid.sh -@@ -10,7 +10,7 @@ DM_CLEANUP="no" - info "Scanning for dmraid devices $DM_RAIDS" - SETS=$(dmraid -c -s) - --if [ "$SETS" = "no raid disks" ]; then -+if [ "$SETS" = "no raid disks" -o "$SETS" = "no raid sets" ]; then - return - fi - --- -1.7.0.1 - diff --git a/0004-init-add-hacky-cdrom-polling-mechanism.patch b/0004-init-add-hacky-cdrom-polling-mechanism.patch deleted file mode 100644 index 4c2af06..0000000 --- a/0004-init-add-hacky-cdrom-polling-mechanism.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0e0bf830577b5538ed010cf1eb4b1a57578ac3bb Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 13 Apr 2010 13:50:33 +0200 -Subject: [PATCH 04/15] init: add hacky cdrom polling mechanism - ---- - modules.d/99base/init | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -diff --git a/modules.d/99base/init b/modules.d/99base/init -index ab7aafe..b9b6361 100755 ---- a/modules.d/99base/init -+++ b/modules.d/99base/init -@@ -186,8 +186,20 @@ while :; do - - # no more udev jobs and queues empty. - sleep 0.5 -+ -+ # dirty hack for some cdrom drives, -+ # which report no medium for quiet -+ # some time. -+ for cdrom in /sys/block/sr*; do -+ [ -e "$cdrom" ] || continue -+ # skip, if cdrom medium was already found -+ strstr "$(udevadm info --query=env --path=${cdrom##/sys})" \ -+ ID_CDROM_MEDIA && continue -+ echo change > "$cdrom" -+ done -+ - i=$(($i+1)) -- [ $i -gt 20 ] \ -+ [ $i -gt 40 ] \ - && { flock -s 9 ; emergency_shell "No root device found"; } 9>/.console_lock - done - unset job --- -1.7.0.1 - diff --git a/0005-add-module-btrfs.patch b/0005-add-module-btrfs.patch deleted file mode 100644 index 39267b9..0000000 --- a/0005-add-module-btrfs.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 58ffd15bfffddd593b1a8f29eb5935a0ce39d2dc Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 13 Apr 2010 14:03:05 +0200 -Subject: [PATCH 05/15] add module btrfs - ---- - modules.d/90btrfs/40-btrfs.rules | 7 +++++++ - modules.d/90btrfs/check | 10 ++++++++++ - modules.d/90btrfs/install | 4 ++++ - modules.d/95udev-rules/install | 2 +- - 4 files changed, 22 insertions(+), 1 deletions(-) - create mode 100644 modules.d/90btrfs/40-btrfs.rules - create mode 100755 modules.d/90btrfs/check - create mode 100755 modules.d/90btrfs/install - -diff --git a/modules.d/90btrfs/40-btrfs.rules b/modules.d/90btrfs/40-btrfs.rules -new file mode 100644 -index 0000000..e74ba1a ---- /dev/null -+++ b/modules.d/90btrfs/40-btrfs.rules -@@ -0,0 +1,7 @@ -+SUBSYSTEM!="block", GOTO="btrfs_end" -+ACTION!="add|change", GOTO="btrfs_end" -+ -+ENV{ID_FS_TYPE}=="btrfs", RUN+="/sbin/btrfs device scan $env{DEVNAME}" -+ -+LABEL="btrfs_end" -+ -diff --git a/modules.d/90btrfs/check b/modules.d/90btrfs/check -new file mode 100755 -index 0000000..2897d46 ---- /dev/null -+++ b/modules.d/90btrfs/check -@@ -0,0 +1,10 @@ -+#!/bin/bash -+ -+# We depend on udev-rules being loaded -+[ "$1" = "-d" ] && exit 0 -+ -+# if we don't have dmraid installed on the host system, no point -+# in trying to support it in the initramfs. -+which btrfs >/dev/null 2>&1 || exit 1 -+ -+exit 0 -diff --git a/modules.d/90btrfs/install b/modules.d/90btrfs/install -new file mode 100755 -index 0000000..130a84d ---- /dev/null -+++ b/modules.d/90btrfs/install -@@ -0,0 +1,4 @@ -+#!/bin/bash -+ -+inst_rules "$moddir/40-btrfs.rules" -+dracut_install btrfs -diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install -index ae64f3e..23693fe 100755 ---- a/modules.d/95udev-rules/install -+++ b/modules.d/95udev-rules/install -@@ -24,7 +24,7 @@ else - inst_rules "$moddir/59-persistent-storage-volid.rules" - fi - inst_rules "$moddir/61-persistent-storage.rules" -- -+ - for i in \ - ata_id \ - cdrom_id \ --- -1.7.0.1 - diff --git a/0006-teach-dmsquash-live-root-to-use-rootflags.patch b/0006-teach-dmsquash-live-root-to-use-rootflags.patch deleted file mode 100644 index e5265d0..0000000 --- a/0006-teach-dmsquash-live-root-to-use-rootflags.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fbf1b5b138df65dc6ff309c6d015e0e5c887aa0e Mon Sep 17 00:00:00 2001 -From: Joey Boggs -Date: Fri, 26 Mar 2010 10:01:16 -0400 -Subject: [PATCH 06/15] teach dmsquash-live-root to use rootflags - ---- - modules.d/90dmsquash-live/dmsquash-live-root | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root -index b1754dc..c98cdef 100755 ---- a/modules.d/90dmsquash-live/dmsquash-live-root -+++ b/modules.d/90dmsquash-live/dmsquash-live-root -@@ -172,7 +172,12 @@ if [ -b "$OSMIN_LOOPDEV" ]; then - echo "0 $( blockdev --getsz $BASE_LOOPDEV ) snapshot $BASE_LOOPDEV $OSMIN_LOOPDEV p 8" | dmsetup create --readonly live-osimg-min - fi - -+ROOTFLAGS="$(getarg rootflags)" -+if [ -n "$ROOTFLAGS" ]; then -+ ROOTFLAGS="-o $ROOTFLAGS" -+fi -+ - ln -s /dev/mapper/live-rw /dev/root --printf '/bin/mount /dev/mapper/live-rw %s\n' "$NEWROOT" > /mount/01-$$-live.sh -+printf '/bin/mount %s /dev/mapper/live-rw %s\n' "$ROOTFLAGS" "$NEWROOT" > /mount/01-$$-live.sh - - exit 0 --- -1.7.0.1 - diff --git a/0007-init-trigger-with-action-add.patch b/0007-init-trigger-with-action-add.patch deleted file mode 100644 index 4173f59..0000000 --- a/0007-init-trigger-with-action-add.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cd83e4c54d195e12f709fdda279efb15c7c6cbf3 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Apr 2010 16:36:30 +0200 -Subject: [PATCH 07/15] init: trigger with --action=add - ---- - modules.d/99base/init | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules.d/99base/init b/modules.d/99base/init -index b9b6361..4696915 100755 ---- a/modules.d/99base/init -+++ b/modules.d/99base/init -@@ -147,7 +147,7 @@ getarg 'rdbreak=pre-trigger' && emergency_shell -n pre-trigger "Break before pre - source_all pre-trigger - - # then the rest --udevadm trigger $udevtriggeropts >/dev/null 2>&1 -+udevadm trigger --action=add $udevtriggeropts >/dev/null 2>&1 - - getarg 'rdbreak=initqueue' && emergency_shell -n initqueue "Break before initqueue" - --- -1.7.0.1 - diff --git a/0008-add-missing-paragraph-for-add-drivers.patch b/0008-add-missing-paragraph-for-add-drivers.patch deleted file mode 100644 index 86a2b55..0000000 --- a/0008-add-missing-paragraph-for-add-drivers.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d2931339823a1ea3a8ea9d13a274720b7057aa83 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Apr 2010 17:50:39 +0200 -Subject: [PATCH 08/15] add missing paragraph for --add-drivers - ---- - dracut.8 | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/dracut.8 b/dracut.8 -index 57626fe..834c4f2 100644 ---- a/dracut.8 -+++ b/dracut.8 -@@ -28,8 +28,9 @@ omit a space-separated list of dracut modules. - add a space-separated list of dracut modules. - .TP - .BR \-d ", " \-\-drivers " \fILIST\fR" --specify a space-separated list of kernel modules to exclusively include# -+specify a space-separated list of kernel modules to exclusively include - in the initramfs. -+.TP - .BR \-\-add-drivers " \fILIST\fR" - specify a space-separated list of kernel modules to add to the initramfs. - .TP --- -1.7.0.1 - diff --git a/0009-manpage-addition-for-kernel-drivers.patch b/0009-manpage-addition-for-kernel-drivers.patch deleted file mode 100644 index b38b4bf..0000000 --- a/0009-manpage-addition-for-kernel-drivers.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9b17b085f3dbe1e48dfea2ed1b045fbbbc10d3d9 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Apr 2010 17:58:56 +0200 -Subject: [PATCH 09/15] manpage addition for kernel drivers - -The kernel modules have to be specified without the ".ko" suffix. ---- - dracut.8 | 2 ++ - dracut.conf.5 | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/dracut.8 b/dracut.8 -index 834c4f2..31a70fc 100644 ---- a/dracut.8 -+++ b/dracut.8 -@@ -30,9 +30,11 @@ add a space-separated list of dracut modules. - .BR \-d ", " \-\-drivers " \fILIST\fR" - specify a space-separated list of kernel modules to exclusively include - in the initramfs. -+The kernel modules have to be specified without the ".ko" suffix. - .TP - .BR \-\-add-drivers " \fILIST\fR" - specify a space-separated list of kernel modules to add to the initramfs. -+The kernel modules have to be specified without the ".ko" suffix. - .TP - .BR \-\-filesystems " \fILIST\fR" - specify a space-separated list of kernel filesystem modules to exclusively -diff --git a/dracut.conf.5 b/dracut.conf.5 -index 30bf16f..a781dfb 100644 ---- a/dracut.conf.5 -+++ b/dracut.conf.5 -@@ -26,10 +26,12 @@ Add a space-separated list of dracut modules. - .BR drivers= \%"[LIST]" - Specify a space-separated list of kernel modules to - exclusively include in the initramfs. -+The kernel modules have to be specified without the ".ko" suffix. - .TP - .BR add_drivers= \%"[LIST]" - Specify a space-separated list of kernel - modules to add to the initramfs. -+The kernel modules have to be specified without the ".ko" suffix. - .TP - .BR filesystems= \%"[LIST]" - Specify a space-separated list of kernel filesystem --- -1.7.0.1 - diff --git a/0010-dracut-add_drivers-from-the-command-line-should-add-.patch b/0010-dracut-add_drivers-from-the-command-line-should-add-.patch deleted file mode 100644 index 5968ffa..0000000 --- a/0010-dracut-add_drivers-from-the-command-line-should-add-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4828beb949f25d894351c7abbe6a4930a1d1d95c Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 14 Apr 2010 19:32:44 +0200 -Subject: [PATCH 10/15] dracut: add_drivers from the command line should add up to the conffile - ---- - dracut | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/dracut b/dracut -index b16e205..8c0adad 100755 ---- a/dracut -+++ b/dracut -@@ -143,7 +143,7 @@ fi - [[ $omit_dracutmodules_l ]] && omit_dracutmodules=$omit_dracutmodules_l - [[ $add_dracutmodules_l ]] && add_dracutmodules="$add_dracutmodules $add_dracutmodules_l" - [[ $drivers_l ]] && drivers=$drivers_l --[[ $add_drivers_l ]] && add_drivers=$add_drivers_l -+[[ $add_drivers_l ]] && add_drivers="$add_drivers $add_drivers_l" - [[ $filesystems_l ]] && filesystems=$filesystems_l - [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l - [[ $fw_dir_l ]] && fw_dir=$fw_dir_l --- -1.7.0.1 - diff --git a/0011-AUTHORS-updated.patch b/0011-AUTHORS-updated.patch deleted file mode 100644 index 431945e..0000000 --- a/0011-AUTHORS-updated.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ddbdebb9c855176831a74a727d5900ed3d86193b Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 15 Apr 2010 11:54:28 +0200 -Subject: [PATCH 11/15] AUTHORS: updated - ---- - AUTHORS | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/AUTHORS b/AUTHORS -index ebb4157..0b449de 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -1,7 +1,7 @@ - Harald Hoyer - Victor Lowther --Warren Togami - Philippe Seewer -+Warren Togami - Jeremy Katz - David Dillow - Andreas Thienemann -@@ -9,6 +9,7 @@ Hans de Goede - Peter Jones - Luca Berra - Marc Grimme -+Andrey Borzenkov - Bill Nottingham - Daniel Drake - David Cantrell -@@ -16,12 +17,13 @@ Lance Albertson - Michael Ploujnikov - Alan Jenkins - Dan Horák --Andrey Borzenkov -+Joey Boggs - Dave Jones - Konrad Rzeszutek Wilk - Luca Berra - Michal Schmidt - Mike Snitzer -+Mike Snitzer - Munehiro Matsuda - Peter Rajnoha - Quentin Armitage --- -1.7.0.1 - diff --git a/0012-kernel-modules-hardcode-sr_mod.patch b/0012-kernel-modules-hardcode-sr_mod.patch deleted file mode 100644 index 657e7b4..0000000 --- a/0012-kernel-modules-hardcode-sr_mod.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d4abad22883978f60bf4df030186fc92187c757f Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 15 Apr 2010 12:47:26 +0200 -Subject: [PATCH 12/15] kernel-modules: hardcode sr_mod - ---- - modules.d/90kernel-modules/installkernel | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/90kernel-modules/installkernel b/modules.d/90kernel-modules/installkernel -index 3416e7c..4848f2a 100755 ---- a/modules.d/90kernel-modules/installkernel -+++ b/modules.d/90kernel-modules/installkernel -@@ -5,8 +5,8 @@ if [[ -z $drivers ]]; then - - nm -uPA "$1" | egrep -q "$blockfuncs" - } -- hostonly='' instmods pcmcia sd_mod scsi_dh scsi_dh_rdac scsi_dh_emc -- hostonly='' instmods firewire-ohci -+ hostonly='' instmods sr_mod sd_mod scsi_dh scsi_dh_rdac scsi_dh_emc -+ hostonly='' instmods pcmcia firewire-ohci - - # install keyboard support - hostonly='' instmods atkbd i8042 usbhid hid-apple ehci-hcd ohci-hcd uhci-hcd --- -1.7.0.1 - diff --git a/0013-kernel-modules-only-remove-ocfs2-if-all-filesystems-.patch b/0013-kernel-modules-only-remove-ocfs2-if-all-filesystems-.patch deleted file mode 100644 index 641c0e5..0000000 --- a/0013-kernel-modules-only-remove-ocfs2-if-all-filesystems-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e9e93e2ec6f58cfcd7e4680827b242a90a038710 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 15 Apr 2010 12:47:52 +0200 -Subject: [PATCH 13/15] kernel-modules: only remove ocfs2, if all filesystems are installed - ---- - modules.d/90kernel-modules/installkernel | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/modules.d/90kernel-modules/installkernel b/modules.d/90kernel-modules/installkernel -index 4848f2a..90b535e 100755 ---- a/modules.d/90kernel-modules/installkernel -+++ b/modules.d/90kernel-modules/installkernel -@@ -17,14 +17,15 @@ if [[ -z $drivers ]]; then - if ! [[ $hostonly ]]; then - if [[ -z $filesystems ]]; then - instmods '=fs' -+ # hardcoded list of exceptions -+ # to save a lot of space -+ rm -fr ${initdir}/lib/modules/*/kernel/fs/ocfs2 - else - instmods $filesystems - fi - else - hostonly='' instmods $(get_fs_type "/dev/block/$(find_root_block_device)") - fi -- # hardcoded list of exceptions -- rm -fr ${initdir}/lib/modules/*/kernel/fs/ocfs2 - else - hostonly='' instmods $drivers $filesystems - fi --- -1.7.0.1 - diff --git a/0014-dracut.spec-add-btrfs-module.patch b/0014-dracut.spec-add-btrfs-module.patch deleted file mode 100644 index 993aeb5..0000000 --- a/0014-dracut.spec-add-btrfs-module.patch +++ /dev/null @@ -1,24 +0,0 @@ -From fede5bbcdad4b35baba06eb5c5aebc0df4aa0347 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Thu, 15 Apr 2010 14:38:38 +0200 -Subject: [PATCH 14/15] dracut.spec: add btrfs module - ---- - dracut.spec | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/dracut.spec b/dracut.spec -index c4bc00d..e2b6f44 100644 ---- a/dracut.spec -+++ b/dracut.spec -@@ -180,6 +180,7 @@ rm -rf $RPM_BUILD_ROOT - %{_datadir}/dracut/modules.d/10rpmversion - %{_datadir}/dracut/modules.d/50plymouth - %{_datadir}/dracut/modules.d/60xen -+%{_datadir}/dracut/modules.d/90btrfs - %{_datadir}/dracut/modules.d/90crypt - %{_datadir}/dracut/modules.d/90dm - %{_datadir}/dracut/modules.d/90dmraid --- -1.7.0.1 - diff --git a/0015-Use-pigz-for-gzipping-if-available.patch b/0015-Use-pigz-for-gzipping-if-available.patch deleted file mode 100644 index 4111bcd..0000000 --- a/0015-Use-pigz-for-gzipping-if-available.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c91570782c2aa9128f204a21e5d2b516658febae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Thu, 18 Mar 2010 21:41:22 +0200 -Subject: [PATCH 15/15] Use pigz for gzipping if available. - ---- - dracut | 3 ++- - dracut-catimages | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dracut b/dracut -index 8c0adad..0ae07f2 100755 ---- a/dracut -+++ b/dracut -@@ -303,7 +303,8 @@ if [[ $do_strip = yes ]] ; then - done - fi - --( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet |gzip -9 > "$outfile"; ) -+type pigz &>/dev/null && gzip=pigz || gzip=gzip -+( cd "$initdir"; find . |cpio -R 0:0 -H newc -o --quiet |$gzip -9 > "$outfile"; ) - if [ $? -ne 0 ]; then - derror "dracut: creation of $outfile failed" - exit 1 -diff --git a/dracut-catimages b/dracut-catimages -index b19f20a..d49d0e2 100755 ---- a/dracut-catimages -+++ b/dracut-catimages -@@ -102,7 +102,8 @@ fi - if [[ ! $no_overlay ]]; then - ofile="$imagedir/90-overlay.img" - dinfo "Creating image $ofile from directory $overlay" -- ( cd "$overlay"; find . |cpio --quiet -H newc -o |gzip -9 > "$ofile"; ) -+ type pigz &>/dev/null && gzip=pigz || gzip=gzip -+ ( cd "$overlay"; find . |cpio --quiet -H newc -o |$gzip -9 > "$ofile"; ) - fi - - if [[ ! $no_imagedir ]]; then --- -1.7.0.1 - diff --git a/dracut.spec b/dracut.spec index 6d71666..e1b87fa 100644 --- a/dracut.spec +++ b/dracut.spec @@ -19,8 +19,8 @@ %endif Name: dracut -Version: 005 -Release: 2%{?rdist} +Version: 006 +Release: 1%{?rdist} Summary: Initramfs generator using udev Group: System Environment/Base License: GPLv2+ @@ -28,22 +28,6 @@ URL: http://apps.sourceforge.net/trac/dracut/wiki # Source can be generated by # http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=snapshot;h=%{?dashgittag};sf=tgz Source0: dracut-%{version}%{?dashgittag}.tar.bz2 - -Patch1: 0001-dracut.8-fixed-LUKS-paragraph.patch -Patch2: 0002-dracut.8-add-information-which-parameter-can-be-spec.patch -Patch3: 0003-dmraid-parse-different-error-messages.patch -Patch4: 0004-init-add-hacky-cdrom-polling-mechanism.patch -Patch5: 0005-add-module-btrfs.patch -Patch6: 0006-teach-dmsquash-live-root-to-use-rootflags.patch -Patch7: 0007-init-trigger-with-action-add.patch -Patch8: 0008-add-missing-paragraph-for-add-drivers.patch -Patch9: 0009-manpage-addition-for-kernel-drivers.patch -Patch10: 0010-dracut-add_drivers-from-the-command-line-should-add-.patch -Patch11: 0011-AUTHORS-updated.patch -Patch12: 0012-kernel-modules-hardcode-sr_mod.patch -Patch13: 0013-kernel-modules-only-remove-ocfs2-if-all-filesystems-.patch -Patch15: 0015-Use-pigz-for-gzipping-if-available.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} > 12 || 0%{?rhel} >= 6 @@ -57,36 +41,28 @@ Obsoletes: libbdevid-python <= 6.0.93 Obsoletes: dracut-kernel < 005 Provides: dracut-kernel = %{version}-%{release} -Requires: udev -Requires: util-linux-ng -Requires: module-init-tools >= 3.7-9 -Requires: cpio +Requires: bash +Requires: bzip2 Requires: coreutils +Requires: cpio +Requires: dash +Requires: filesystem >= 2.1.0 Requires: findutils -Requires: binutils Requires: grep -Requires: which +Requires: gzip +Requires: initscripts >= 8.63-1 +Requires: kbd Requires: mktemp >= 1.5-5 +Requires: module-init-tools >= 3.7-9 Requires: mount -Requires: bash -Requires: dash -Requires: /bin/sh -Requires: fileutils, gzip, tar -Requires: lvm2 >= 2.02.33-9, dhclient -Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1 -Requires: e2fsprogs >= 1.38-12, coreutils -Requires: mdadm, elfutils-libelf -Requires(pre): plymouth >= 0.8.0-0.2009.29.09.19.1 Requires: plymouth >= 0.8.0-0.2009.29.09.19.1 -Requires: cryptsetup-luks -Requires: file -Requires: bzip2 -Requires: dmraid -Requires: kbd -Requires: plymouth-scripts +Requires: sed +Requires: tar +Requires: udev +Requires: util-linux-ng >= 2.16 +Requires: which %if ! 0%{?with_switch_root} -Requires: util-linux-ng >= 2.16 BuildArch: noarch %endif @@ -102,6 +78,7 @@ Summary: Dracut modules to build a dracut initramfs with network support Requires: %{name} = %{version}-%{release} Requires: rpcbind nfs-utils Requires: iscsi-initiator-utils +Requires: dhclient %if %{with_nbd} Requires: nbd %endif @@ -140,7 +117,7 @@ all purpose initramfs with dracut. %package tools Summary: Dracut tools to build the local initramfs Requires: coreutils cryptsetup-luks device-mapper -Requires: diffutils dmraid findutils gawk grep lvm2 +Requires: diffutils dmraid findutils grep lvm2 gawk Requires: module-init-tools sed Requires: cpio gzip @@ -150,21 +127,6 @@ This package contains tools to assemble the local initrd and host configuration. %prep %setup -q -n %{name}-%{version}%{?dashgittag} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch15 -p1 - %build make WITH_SWITCH_ROOT=0%{?with_switch_root} @@ -226,10 +188,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dracut/modules.d/95dasd %{_datadir}/dracut/modules.d/95dasd_mod %{_datadir}/dracut/modules.d/95zfcp -%{_datadir}/dracut/modules.d/95znet %{_datadir}/dracut/modules.d/95terminfo %{_datadir}/dracut/modules.d/95udev-rules %{_datadir}/dracut/modules.d/95uswsusp +%{_datadir}/dracut/modules.d/98selinux %{_datadir}/dracut/modules.d/98syslog %{_datadir}/dracut/modules.d/99base # logfile needs no logrotate, because it gets overwritten @@ -245,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dracut/modules.d/95nbd %{_datadir}/dracut/modules.d/95nfs %{_datadir}/dracut/modules.d/45ifcfg +%{_datadir}/dracut/modules.d/95znet %files fips %defattr(-,root,root,0755) @@ -267,7 +230,55 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog -* Thu Apr 15 2010 Harald Hoyer 005-2 +* Thu Jun 17 2010 Harald Hoyer 006-1 +- version 006 + +* Fri Jun 11 2010 Harald Hoyer +- Remove requirements, which are not really needed +Resolves: rhbz#598509 +- fixed copy of network config to /dev/.initramfs/ (patch 146) +Resolves: rhbz#594649 +- more password beauty (patch 142) +Resolves: rhbz#561092 +- support multiple iSCSI disks (patch 143) +Resolves: rbhz#580190 +- fixed selinux=0 (patch 130) +Resolves: rhbz#593080 +- add support for booting LVM snapshot root volume (patch 145) +Resolves: rbhz#602723 +- remove hardware field from BOOTIF= (patch 148) +Resolves: rhbz#599593 +- add aes kernel modules and fix crypt handling (patch 137, patch 140 and patch 147) +Resolves: rhbz#600170 + +* Thu May 27 2010 Harald Hoyer +- fixed Requirements +- fixed autoip6 +Resolves: rhbz#538388 +- fixed multipath +Resolves: rhbz#595719 + +* Thu May 06 2010 Harald Hoyer +- only display short password messages +Resolves: rhbz#561092 + +* Thu May 06 2010 Harald Hoyer +- fixed dracut manpages +Resolves: rhbz#589109 +- use ccw-init and ccw rules from s390utils +Resolves: rhbz#533494 +- fixed fcoe +Resolves: rhbz#486244 +- various other bugfixes seen in Fedora + +* Tue Apr 20 2010 Harald Hoyer +- fixed network with multiple nics +- fixed nfsidmap paths +- do not run blkid on non active container raids +- fixed cdrom polling mechanism +- update to latest git + +* Thu Apr 15 2010 Harald Hoyer - fixed dracut manpages - dmraid parse different error messages - add cdrom polling mechanism for slow cdroms @@ -278,9 +289,27 @@ rm -rf $RPM_BUILD_ROOT - add sr_mod - use pigz instead of gzip, if available -* Fri Mar 19 2010 Harald Hoyer 005-1 +* Thu Mar 25 2010 Harald Hoyer +- removed firmware requirements (rhbz#572634) +- add /etc/dracut.conf.d +- Resolves: rhbz#572634 + +* Fri Mar 19 2010 Harald Hoyer - version 005 +* Fri Mar 19 2010 Harald Hoyer +- fixed rpmlint errors (rhbz#570547) +- removed firmware package from dracut-kernel (rhbz#572634) +- add dcb support to dracut's FCoE support (rhbz#563794) +- force install some modules in hostonly mode (rhbz#573094) +- various other bugfixes +- Resolves: rhbz#570547, rhbz#572634, rhbz#563794, rhbz#573094 + +* Thu Feb 18 2010 Harald Hoyer 004-15 +- fixed "selinux=0" booting (rhbz#566376) +- fixed internal IFS handling +- Resolves: rhbz#566376 + * Fri Jan 29 2010 Harald Hoyer 004-5 - fixed firmware.sh bug (#559975 #559597) diff --git a/sources b/sources index 296bf28..73069fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c10b32b0b6402f740079f0d8728829bf dracut-005.tar.bz2 +016052b57001789ec2acf89d382a82f5 dracut-006.tar.bz2