From b2c77429273dc03fe3165f134f84c0ce1d01dafc Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Wed, 6 Nov 2013 21:44:09 +0000
Subject: [PATCH] Revert a previous fix, which could not work when user clfs
 did not exist yet

---
 CLFS/master.sh                | 3 +++
 common/libs/func_install_blfs | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CLFS/master.sh b/CLFS/master.sh
index b6bb2f0..3332d1a 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -70,6 +70,9 @@ cat << EOF
 	echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc
 	@chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
 	chmod a+wt \$(MOUNT_PT) && \\
+	if [ -d \$(MOUNT_PT)/var ]; then \\
+	  chown -R \$(LUSER) \$(MOUNT_PT)/var; \\
+	fi && \\
 	touch envars && \\
 	chown \$(LUSER):\$(LGROUP) envars
 	@\$(call housekeeping)
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index 8cd47d8..3f34915 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -32,11 +32,6 @@ sed -i s@trunk/BOOK@$BLFS_TREE@ \
 sudo make -j1 -C $BUILDDIR$BLFS_ROOT TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
     $BUILDDIR$BLFS_ROOT/packages.xml
 
-# Now /var and /var/lib are owned by root. This is an issue when building
-# CLFS with method=boot, because system dirs creation is made by user, who
-# then cannot create /var/lock and the such.
-sudo chown -R $LUSER $BUILDDIR/var
-
 # Because the BLFS Makefile is supposed to be used in chroot (or booted)
 # mode, the tracking file has wrong path for DTD. Change it:
 sudo sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml