r3750 - in jhalfs/trunk: CLFS common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed Nov 6 13:44:09 PST 2013


Author: pierre
Date: Wed Nov  6 13:44:09 2013
New Revision: 3750

Log:
Revert a previous fix, which could not work when user clfs did not exist yet

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/common/libs/func_install_blfs

Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh	Wed Nov  6 12:55:27 2013	(r3749)
+++ jhalfs/trunk/CLFS/master.sh	Wed Nov  6 13:44:09 2013	(r3750)
@@ -70,6 +70,9 @@
 	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)

Modified: jhalfs/trunk/common/libs/func_install_blfs
==============================================================================
--- jhalfs/trunk/common/libs/func_install_blfs	Wed Nov  6 12:55:27 2013	(r3749)
+++ jhalfs/trunk/common/libs/func_install_blfs	Wed Nov  6 13:44:09 2013	(r3750)
@@ -32,11 +32,6 @@
 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



More information about the alfs-log mailing list