From 71cfa2e2259bc914e80decfdb66623f7e63d2f44 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 12 Jan 2010 15:08:54 +0100
Subject: [PATCH] dmsquash: add nasty hack for cdroms

Some CDROMs do not generate a label symlink and have to be read from.
---
 modules.d/90dmsquash-live/cdrom-hack.sh          | 6 ++++++
 modules.d/90dmsquash-live/install                | 1 +
 modules.d/90dmsquash-live/parse-dmsquash-live.sh | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100755 modules.d/90dmsquash-live/cdrom-hack.sh

diff --git a/modules.d/90dmsquash-live/cdrom-hack.sh b/modules.d/90dmsquash-live/cdrom-hack.sh
new file mode 100755
index 000000000..ad1a2205e
--- /dev/null
+++ b/modules.d/90dmsquash-live/cdrom-hack.sh
@@ -0,0 +1,6 @@
+#!/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 ac5e35559..7326945b2 100755
--- a/modules.d/90dmsquash-live/install
+++ b/modules.d/90dmsquash-live/install
@@ -20,3 +20,4 @@ inst_hook pre-udev 30 "$moddir/dmsquash-live-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 646da362b..0641dde2b 100755
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
@@ -30,11 +30,12 @@ case "$liveroot" in
 	root="${root#live:}"
 	root="live:/dev/disk/by-uuid/${root#UUID=}"
         rootok=1 ;;
-    /dev/*)
-	root="live:${root}"
+    live:/dev/*)
         rootok=1 ;;
 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"
-- 
2.47.2