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.
15 years ago · 1cf0b1750b
3 changed files with 0 additions and 9 deletions
--- a/modules.d/90dmsquash-live/cdrom-hack.sh
+++ b/modules.d/90dmsquash-live/cdrom-hack.sh
@ -1,6 +0,0 @@
				@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -e /dev/sr0 ] && {
-	blkid /dev/sr0;
-	blkid /dev/sr0;
-} 2>/dev/null
--- 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"
				@@ -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
--- 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
				@@ -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"