From d0f8d023e06d4d25e85ee0ceff96955cbe8a24d3 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Mon, 25 Apr 2016 20:40:39 -0400
Subject: fixup! Cdrom duplication

---
 old-school/grok-block   |  3 +--
 old-school/mdadm-dup.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/old-school/grok-block b/old-school/grok-block
index 3f61c4a..006a090 100755
--- a/old-school/grok-block
+++ b/old-school/grok-block
@@ -173,8 +173,7 @@ then
   if ! mountpoint -q /cdrom; then
     mkdir -p /cdrom
     . mdadm-dup.sh
-    mount_cdrom "$DEVNAME" && bootdone samizdat-cdrom
-#   (retry_mount -t iso9660 -r "$DEVNAME" /cdrom && bootdone samizdat-cdrom) &
+    dup_mount_cdrom "$DEVNAME" /cdrom && bootdone samizdat-cdrom
   fi
 else
   grok_block &
diff --git a/old-school/mdadm-dup.sh b/old-school/mdadm-dup.sh
index 27a39ca..b1bcd33 100644
--- a/old-school/mdadm-dup.sh
+++ b/old-school/mdadm-dup.sh
@@ -41,7 +41,8 @@ dm_snapshot_teardown()
                 read _ _ snapshot ro_dev rw_dev _ _
                 [ "$snapshot" = snapshot ]      || exit 1
                 dmsetup remove "$dev"           || exit 1
-                # errors ignored because the loop dev can be automatically removed upon disuse already
+                # errors ignored because the loop dev can be configured to be
+                # automatically removed upon disuse
                 losetup -d /dev/block/"$rw_dev" || true
                 eject /dev/block/"$ro_dev"      || exit 1
             ) || return
@@ -58,11 +59,11 @@ wait_for_dm_device()
     done
 }
 
-mount_cdrom()
+dup_mount_cdrom()
 {
-    local cdrom_dev="$1"
+    local cdrom_dev="$1" mountpoint="$2"
 
-    local sectors md_dev=/dev/md0 cdrom_rw_file=/"${cdrom_dev##*/}".rw
+    local sectors md_dev=/dev/md55 cdrom_rw_file=/"${cdrom_dev##*/}".rw
 
     sectors=$(get_cdrom_sizelimit "$cdrom_dev") || return
 
@@ -72,7 +73,7 @@ mount_cdrom()
     dd if=/dev/zero of="$cdrom_rw_file" bs=1K count=32 || return
     cdrom_rw_dev=$(dm_snapshot "$cdrom_dev" "$cdrom_rw_file" "$sectors") || return
     mdadm_dup "$cdrom_rw_dev" "$md_dev" "$sectors" || return
-    mount -t iso9660 -r $md_dev /cdrom
+    mount -t iso9660 -r $md_dev "$mountpoint"
 }
 
 get_cdrom_sizelimit()
-- 
cgit v1.2.3