From 6e0e3ceffbc20a30b37f808b284782085f23f933 Mon Sep 17 00:00:00 2001
From: Josh Wilsdon <jwilsdon@joyent.com>
Date: Fri, 31 Oct 2014 21:09:19 +0000
Subject: OS-3505 would like /var/ld lofs mounted into LX zones so crle is
 unnecessary Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

---
 usr/src/lib/brand/lx/zone/Makefile     | 7 +++++++
 usr/src/lib/brand/lx/zone/platform.xml | 2 ++
 2 files changed, 9 insertions(+)

(limited to 'usr/src')

diff --git a/usr/src/lib/brand/lx/zone/Makefile b/usr/src/lib/brand/lx/zone/Makefile
index 6e820bd506..d72586f9e1 100644
--- a/usr/src/lib/brand/lx/zone/Makefile
+++ b/usr/src/lib/brand/lx/zone/Makefile
@@ -51,6 +51,13 @@ $(POFILE): $(POFILES)
 _msg: $(MSGDOMAINPOFILE)
 
 install: $(PROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES) $(ROOTPROGS) $(SUBDIRS)
+	mkdir -p $(ROOT)/usr/lib/brand/lx/ld/64
+	crle -c $(ROOT)/usr/lib/brand/lx/ld/ld.config \
+		-l /native/lib:/native/usr/lib \
+		-s /native/lib/secure:/native/usr/lib/secure
+	crle -64 -c $(ROOT)/usr/lib/brand/lx/ld/64/ld.config \
+		-l /native/lib/64:/native/usr/lib/64 \
+		-s /native/lib/secure/64:/native/usr/lib/secure/64
 
 lint:
 
diff --git a/usr/src/lib/brand/lx/zone/platform.xml b/usr/src/lib/brand/lx/zone/platform.xml
index 120be70746..a586d7ae8f 100644
--- a/usr/src/lib/brand/lx/zone/platform.xml
+++ b/usr/src/lib/brand/lx/zone/platform.xml
@@ -51,6 +51,8 @@
 	    directory="/native/etc/netconfig" type="lofs" opt="ro" />
 	<global_mount special="/sbin"
 	    directory="/native/sbin" opt="ro,nodevices" type="lofs" />
+	<global_mount special="/usr/lib/brand/lx/ld" directory="/var/ld"
+	    opt="ro" type="lofs" />
 
 	<!-- Local filesystems to mount when booting the zone -->
 	<mount special="/native/dev" directory="/dev" type="lofs" />
-- 
cgit v1.2.3