From 8298a399e8eb93bfba00724d4645c36e842c80d5 Mon Sep 17 00:00:00 2001
From: Kirill A. Shutemov <kirill@shutemov.name>
Date: Thu, 11 Nov 2010 12:27:39 +0200
Subject: [PATCH] Use /dev/initrd-root instad of /dev/root to avoid name collisions

LVM udev-rules try to create /dev/<VG> directory for every volume
group to store symlinks to logical volumes.

make-initrd uses /dev/root to store symlink to root blockdev. It can
couse collision if user creates volume group named 'root'.

Let's use less common symlink name to void it.

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
 data/lib/handlers/050-rootdev                  |    4 ++--
 features/nfsroot/data/lib/handlers/070-nfsroot |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/lib/handlers/050-rootdev b/data/lib/handlers/050-rootdev
index 7c390df..5d47755 100755
--- a/data/lib/handlers/050-rootdev
+++ b/data/lib/handlers/050-rootdev
@@ -11,7 +11,7 @@ handler() {
 	fi
 
 	message "Mount '$INIT_ROOT' as $rootmnt"
-	ln -s "$INIT_ROOT" /dev/root
+	ln -s "$INIT_ROOT" /dev/initrd-root
 }
 
 roflag=-w
@@ -19,7 +19,7 @@ roflag=-w
 
 rc=0
 for e in "$eventdir"/rootdev/*; do
-	[ -f "$e" ] && [ ! -e /dev/root ] ||
+	[ -f "$e" ] && [ ! -e /dev/initrd-root ] ||
 		break
 
 	( . "$e"; handler; ) ||
diff --git a/features/nfsroot/data/lib/handlers/070-nfsroot b/features/nfsroot/data/lib/handlers/070-nfsroot
index 694f820..11c56b8 100755
--- a/features/nfsroot/data/lib/handlers/070-nfsroot
+++ b/features/nfsroot/data/lib/handlers/070-nfsroot
@@ -25,12 +25,12 @@ handler() {
 	nfsmount -o nolock $roflag $NFSOPTS "$NFSROOT" "$rootmnt" ||
 		return 0
 	message "Mount '$NFSROOT' as $rootmnt"
-	ln -s /dev/nfs /dev/root
+	ln -s /dev/nfs /dev/initrd-root
 }
 
 rc=0
 for e in "$eventdir"/nfsroot/*; do
-	[ -f "$e" ] && [ ! -e /dev/root ] ||
+	[ -f "$e" ] && [ ! -e /dev/initrd-root ] ||
 		break
 
 	( . "$e"; handler; ) ||
-- 
1.7.3.2