This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via b3cd6e3382dd7145d5c2447599a4d91bb3295fef (commit) from 0972c65075108978eb7806867912db74cb0c3075 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b3cd6e3382dd7145d5c2447599a4d91bb3295fef Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 12 14:58:08 2011 +0100

dracut/installer: remove cdrom waiting loop that reset some drives.

-----------------------------------------------------------------------

Summary of changes: lfs/dracut | 3 ++- src/patches/dracut-006_remove_cdrom_wait.patch | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) create mode 100644 src/patches/dracut-006_remove_cdrom_wait.patch

Difference in files: diff --git a/lfs/dracut b/lfs/dracut index 726eedb..c9816bd 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # 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 # @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.patch

cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c .

diff --git a/src/patches/dracut-006_remove_cdrom_wait.patch b/src/patches/dracut-006_remove_cdrom_wait.patch new file mode 100644 index 0000000..23c084e --- /dev/null +++ b/src/patches/dracut-006_remove_cdrom_wait.patch @@ -0,0 +1,21 @@ +diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init +--- dracut-006.org/modules.d/99base/init 2010-06-17 10:46:29.000000000 +0200 ++++ dracut-006/modules.d/99base/init 2011-01-12 11:40:41.713190125 +0100 +@@ -190,17 +190,6 @@ + # 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/uevent" +- done +- + i=$(($i+1)) + [ $i -gt $RDRETRY ] \ + && { flock -s 9 ; emergency_shell "No root device found"; } 9>/.console_lock

hooks/post-receive -- IPFire 2.x development tree