From: Harald Hoyer <harald@redhat.com>
Date: Mon, 15 Feb 2010 08:55:20 +0000 (+0100)
Subject: removed cdrom hack for live CDs
X-Git-Tag: 005~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1cf0b1750be8fc65939f746793219cdd40f72c13;p=platform%2Fupstream%2Fdracut.git

removed cdrom hack for live CDs

The hack does not work reliable for CDROMs with the firmware bug.
We have really to fix cdrom_id.
---

diff --git a/modules.d/90dmsquash-live/cdrom-hack.sh b/modules.d/90dmsquash-live/cdrom-hack.sh
deleted file mode 100755
index ad1a220..0000000
--- a/modules.d/90dmsquash-live/cdrom-hack.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -e /dev/sr0 ] && {
-	blkid /dev/sr0;
-	blkid /dev/sr0;
-} 2>/dev/null
diff --git a/modules.d/90dmsquash-live/install b/modules.d/90dmsquash-live/install
index 7600158..ad1d29c 100755
--- a/modules.d/90dmsquash-live/install
+++ b/modules.d/90dmsquash-live/install
@@ -21,4 +21,3 @@ inst_hook pre-udev 30 "$moddir/dmsquash-liveiso-genrules.sh"
 inst "$moddir/dmsquash-live-root" "/sbin/dmsquash-live-root"
 # should probably just be generally included
 inst_rules 60-cdrom_id.rules
-inst "$moddir/cdrom-hack.sh" /sbin/cdrom-hack.sh
diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
index 81181f5..24b854e 100755
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
@@ -39,7 +39,5 @@ case "$liveroot" in
 esac
 info "root was $root, liveroot is now $liveroot"
 
-[ $rootok = "1" ] && initqueue --settled /sbin/cdrom-hack.sh
-
 # make sure that init doesn't complain
 [ -z "$root" ] && root="live"