|
Harald Hoyer |
9d5d75 |
From 8dd7bb48fcd9d19dd2d7cec2577cd2c6b414fd8b Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
9d5d75 |
From: Frederick Grose <fgrose@sugarlabs.org>
|
|
Harald Hoyer |
9d5d75 |
Date: Mon, 3 Sep 2018 19:41:58 -0400
|
|
Harald Hoyer |
9d5d75 |
Subject: [PATCH] dmsquash-live/apply-live-updates: Test proper file link.
|
|
Harald Hoyer |
9d5d75 |
|
|
Harald Hoyer |
9d5d75 |
Update flag link to /dev/root as required by commit
|
|
Harald Hoyer |
9d5d75 |
789668deb3e6f8584ffab964d2204ddcb75f0a06.
|
|
Harald Hoyer |
9d5d75 |
---
|
|
Harald Hoyer |
9d5d75 |
modules.d/90dmsquash-live/apply-live-updates.sh | 2 +-
|
|
Harald Hoyer |
9d5d75 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Harald Hoyer |
9d5d75 |
|
|
Harald Hoyer |
9d5d75 |
diff --git a/modules.d/90dmsquash-live/apply-live-updates.sh b/modules.d/90dmsquash-live/apply-live-updates.sh
|
|
Harald Hoyer |
9d5d75 |
index bcca761b..3df2d4ad 100755
|
|
Harald Hoyer |
9d5d75 |
--- a/modules.d/90dmsquash-live/apply-live-updates.sh
|
|
Harald Hoyer |
9d5d75 |
+++ b/modules.d/90dmsquash-live/apply-live-updates.sh
|
|
Harald Hoyer |
9d5d75 |
@@ -1,6 +1,6 @@
|
|
Harald Hoyer |
9d5d75 |
#!/bin/sh
|
|
Harald Hoyer |
9d5d75 |
|
|
Harald Hoyer |
9d5d75 |
-if [ -L /run/rootfsbase ] && [ -d /run/initramfs/live/updates -o -d /updates ]; then
|
|
Harald Hoyer |
9d5d75 |
+if [ -h /dev/root ] && [ -d /run/initramfs/live/updates -o -d /updates ]; then
|
|
Harald Hoyer |
9d5d75 |
info "Applying updates to live image..."
|
|
Harald Hoyer |
9d5d75 |
mount -o bind /run $NEWROOT/run
|
|
Harald Hoyer |
9d5d75 |
# avoid overwriting symlinks (e.g. /lib -> /usr/lib) with directories
|
|
Harald Hoyer |
9d5d75 |
|