diff --git a/modules.d/90dmsquash-live/cdrom-hack.sh b/modules.d/90dmsquash-live/cdrom-hack.sh new file mode 100755 index 00000000..ad1a2205 --- /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 ac5e3555..7326945b 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 646da362..0641dde2 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"