summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2010-03-03 18:10:33 -0800
committerBob Gilligan <gilligan@vyatta.com>2010-03-04 16:02:57 -0800
commitf2e6dcfcf47849973de2f6164ea722da67174a36 (patch)
tree85e2951f47fb19cd9e0f99089232b9d81c936ec1 /templates
parentd39d4d8dd2e9dd4c5952686dd6067d74b521cf52 (diff)
downloadvyatta-op-f2e6dcfcf47849973de2f6164ea722da67174a36.tar.gz
vyatta-op-f2e6dcfcf47849973de2f6164ea722da67174a36.zip
Bugfix 5404: Handle RAID resynchronization on image-installed systems.
(cherry picked from commit 24ff6a1929e0fad20bc87bafddb840deb8f87f6a)
Diffstat (limited to 'templates')
-rw-r--r--templates/add/raid/node.tag/member/node.tag/node.def9
1 files changed, 8 insertions, 1 deletions
diff --git a/templates/add/raid/node.tag/member/node.tag/node.def b/templates/add/raid/node.tag/member/node.tag/node.def
index b30c313..b526e1e 100644
--- a/templates/add/raid/node.tag/member/node.tag/node.def
+++ b/templates/add/raid/node.tag/member/node.tag/node.def
@@ -37,8 +37,15 @@ run:
echo "Unable to add member to RAID set"
fi
+ mounted_on_root=0
mounted_on=`mount | grep "^/dev/${raid_set}" | awk '{ print $3 }'`
- if [ "$mounted_on" = "/" ]; then
+ for dir in $mounted_on ; do
+ if [ "$dir" = "/" -o "$dir" = "/live/image" ]; then
+ mounted_on_root=1
+ fi
+ done
+
+ if [ $mounted_on_root -eq 1 ]; then
echo
echo "Warning: RAID set ${raid_set} holds the root filesystem."
echo "To make the new disk bootable, the boot program will be"