Attachment 573850 Details for Bug 740280 – Mount live device on /mnt/live, link it to /dev/live

[patch] Mount live device on /mnt/live, link it to /dev/live

livedev.patch (text/plain), 1.51 KB, created by Frederick Grose on 2012-03-30 01:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frederick Grose

Created: 2012-03-30 01:00:24 UTC

Size: 1.51 KB

patch

obsolete

>commit 1580cddaea504efd68c5e10fee70e09d7e81d86b
>Author: Frederick Grose <fgrose@sugarlabs.org>
>Date:   Thu Mar 29 16:27:30 2012 -0400
>
>    Mount live device on /mnt/live, link it to /dev/live
>    
>    This enables the mounting of /LiveOS/home.img, if present.
>
>diff --git a/fedora-live-base.ks b/fedora-live-base.ks
>index 0b14fec..0cf0fb2 100644
>--- a/fedora-live-base.ks
>+++ b/fedora-live-base.ks
>@@ -88,10 +88,22 @@ touch /.liveimg-configured
> # Make sure we don't mangle the hardware clock on shutdown
> ln -sf /dev/null /etc/systemd/system/hwclock-save.service
> 
>+findmount() {
>+    local info=()
>+    while read -a info; do
>+        if [[ ${info[4]} == $1 ]]; then
>+            echo ${info[8]}
>+            break;
>+        fi
>+        done < /proc/self/mountinfo
>+}
>+
> # mount live image
>-if [ -b \`readlink -f /dev/live\` ]; then
>+livedev=$(findmount /run/initramfs/live)
>+if [[ -b $livedev ]]; then
>    mkdir -p /mnt/live
>-   mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live
>+   mount -o ro $livedev /mnt/live 2>/dev/null || mount $livedev /mnt/live
>+   ln -s $livedev /dev/live
> fi
> 
> livedir="LiveOS"
>@@ -220,7 +232,7 @@ if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
> # io errors due to not being able to get files...
> #cat /sbin/halt > /dev/null
> #cat /sbin/reboot > /dev/null
>-#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1
>+#/usr/sbin/eject -p -m \$livedev >/dev/null 2>&1
> #echo "Please remove the CD from your drive and press Enter to finish restarting"
> #read -t 30 < /dev/console
> FOE

Actions: View | Diff

Attachments on bug 740280: 573850 | 573985 | 581139 | 583372