Hi guys,
One thing that was bugging me when I was trying to build on anduin is
that the unprivelaged user is hardcoded to lfs everywhere. Normally
this isn't a problem, but on anduin, I don't have privelages to add
and delete users. Well, maybe I do, but I shouldn't do it.
In order to build as my normal user, I had to hack up LFS/master.sh
and common/common-functions. What I figured would be easier was if the
user and group were defined in the Makefile. Then you could use
make LUSER=dnicholson LGROUP=dnicholson
I changed all the wrt functions to use these values. This method has
the added benefit that you could toss out all the special clfs
functions that only change the user. I added the above variables to
LFS/config and CLFS/config.
This probably broke HLFS and CLFS2 (which have their own functions for
handling this and the values of user can't be overriden in the
Makefile). It's just proof of concept, though.
--
Dan
Index: LFS/master.sh
===================================================================
--- LFS/master.sh (revision 2873)
+++ LFS/master.sh (working copy)
@@ -29,13 +29,13 @@
021-addinguser: 020-creatingtoolsdir
@\$(call echo_message, Building)
- @if [ ! -d /home/lfs ]; then \\
- groupadd lfs; \\
- useradd -s /bin/bash -g lfs -m -k /dev/null lfs; \\
+ @if [ ! -d /home/\$(LUSER) ]; then \\
+ groupadd \$(LGROUP); \\
+ useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
else \\
touch user-lfs-exist; \\
fi;
- @chown lfs \$(MOUNT_PT)/tools && \\
+ @chown \$(LUSER) \$(MOUNT_PT)/tools && \\
chmod a+wt \$(MOUNT_PT)/sources && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -43,20 +43,20 @@
022-settingenvironment: 021-addinguser
@\$(call echo_message, Building)
- @if [ -f /home/lfs/.bashrc -a ! -f /home/lfs/.bashrc.XXX ]; then \\
- mv /home/lfs/.bashrc /home/lfs/.bashrc.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bashrc -a ! -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv /home/\$(LUSER)/.bashrc /home/\$(LUSER)/.bashrc.XXX; \\
fi;
- @if [ -f /home/lfs/.bash_profile -a ! -f /home/lfs/.bash_profile.XXX ]; then \\
- mv /home/lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile -a ! -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile /home/\$(LUSER)/.bash_profile.XXX; \\
fi;
- @echo "set +h" > /home/lfs/.bashrc && \\
- echo "umask 022" >> /home/lfs/.bashrc && \\
- echo "LFS=\$(MOUNT_PT)" >> /home/lfs/.bashrc && \\
- echo "LC_ALL=POSIX" >> /home/lfs/.bashrc && \\
- echo "PATH=/tools/bin:/bin:/usr/bin" >> /home/lfs/.bashrc && \\
- echo "export LFS LC_ALL PATH" >> /home/lfs/.bashrc && \\
- echo "source $JHALFSDIR/envars" >> /home/lfs/.bashrc && \\
- chown lfs:lfs /home/lfs/.bashrc && \\
+ @echo "set +h" > /home/\$(LUSER)/.bashrc && \\
+ echo "umask 022" >> /home/\$(LUSER)/.bashrc && \\
+ echo "LFS=\$(MOUNT_PT)" >> /home/\$(LUSER)/.bashrc && \\
+ echo "LC_ALL=POSIX" >> /home/\$(LUSER)/.bashrc && \\
+ echo "PATH=/tools/bin:/bin:/usr/bin" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export LFS LC_ALL PATH" >> /home/\$(LUSER)/.bashrc && \\
+ echo "source $JHALFSDIR/envars" >> /home/\$(LUSER)/.bashrc && \\
+ chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bashrc && \\
touch envars && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -365,6 +365,8 @@
SRC= /sources
MOUNT_PT= $BUILDDIR
PKG_LST= $PKG_LST
+LUSER= $LUSER
+LGROUP= $LGROUP
include makefile-functions
@@ -406,8 +408,8 @@
clean-chapter4:
-if [ ! -f user-lfs-exist ]; then \\
- userdel lfs; \\
- rm -rf /home/lfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
rm -rf \$(MOUNT_PT)/tools
rm -f /tools
@@ -435,13 +437,13 @@
restore-lfs-env:
@\$(call echo_message, Building)
- @if [ -f /home/lfs/.bashrc.XXX ]; then \\
- mv -f /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\
+ @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv -f /home/\$(LUSER)/.bashrc.XXX /home/\$(LUSER)/.bashrc; \\
fi;
- @if [ -f /home/lfs/.bash_profile.XXX ]; then \\
- mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile.XXX /home/\$(LUSER)/.bash_profile; \\
fi;
- @chown lfs:lfs /home/lfs/.bash* && \\
+ @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bash* && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
@@ -453,8 +455,8 @@
@-umount \$(MOUNT_PT)/dev/pts
@-umount \$(MOUNT_PT)/dev
@-if [ ! -f user-lfs-exist ]; then \\
- userdel lfs; \\
- rm -rf /home/lfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
restart_code:
Index: LFS/config
===================================================================
--- LFS/config (revision 2873)
+++ LFS/config (working copy)
@@ -6,6 +6,10 @@
#
#####
+#--- Unprivileged user and group name
+LUSER=lfs
+LGROUP=lfs
+
#--- Location of fstab file (if empty, a template is created)
FSTAB=
Index: CLFS/master.sh
===================================================================
--- CLFS/master.sh (revision 2873)
+++ CLFS/master.sh (working copy)
@@ -41,43 +41,43 @@
025-addinguser: 024-creatingcrossdir
@\$(call echo_message, Building)
- @if [ ! -d /home/clfs ]; then \\
- groupadd clfs; \\
- useradd -s /bin/bash -g clfs -m -k /dev/null clfs; \\
+ @if [ ! -d /home/\$(LUSER) ]; then \\
+ groupadd \$(LGROUP); \\
+ useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
else \\
touch user-clfs-exist; \\
fi;
- @chown clfs \$(MOUNT_PT) && \\
- chown clfs \$(MOUNT_PT)/tools && \\
- chown clfs \$(MOUNT_PT)/cross-tools && \\
- chown clfs \$(MOUNT_PT)/sources && \\
+ @chown \$(LUSER) \$(MOUNT_PT) && \\
+ chown \$(LUSER) \$(MOUNT_PT)/tools && \\
+ chown \$(LUSER) \$(MOUNT_PT)/cross-tools && \\
+ chown \$(LUSER) \$(MOUNT_PT)/sources && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
026-settingenvironment: 025-addinguser
@\$(call echo_message, Building)
- @if [ -f /home/clfs/.bashrc -a ! -f /home/clfs/.bashrc.XXX ]; then \\
- mv /home/clfs/.bashrc /home/clfs/.bashrc.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bashrc -a ! -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv /home/\$(LUSER)/.bashrc /home/\$(LUSER)/.bashrc.XXX; \\
fi;
- @if [ -f /home/clfs/.bash_profile -a ! -f /home/clfs/.bash_profile.XXX ]; then \\
- mv /home/clfs/.bash_profile /home/clfs/.bash_profile.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile -a ! -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile /home/\$(LUSER)/.bash_profile.XXX; \\
fi;
- @echo "set +h" > /home/clfs/.bashrc && \\
- echo "umask 022" >> /home/clfs/.bashrc && \\
- echo "CLFS=\$(MOUNT_PT)" >> /home/clfs/.bashrc && \\
- echo "LC_ALL=POSIX" >> /home/clfs/.bashrc && \\
- echo "PATH=/cross-tools/bin:/bin:/usr/bin" >> /home/clfs/.bashrc && \\
- echo "export CLFS LC_ALL PATH" >> /home/clfs/.bashrc && \\
- echo "" >> /home/clfs/.bashrc && \\
- echo "unset CFLAGS" >> /home/clfs/.bashrc && \\
- echo "unset CXXFLAGS" >> /home/clfs/.bashrc && \\
- echo "" >> /home/clfs/.bashrc && \\
- echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> /home/clfs/.bashrc && \\
- echo "export CLFS_TARGET=\"${TARGET}\"" >> /home/clfs/.bashrc && \\
- echo "export CLFS_TARGET32=\"${TARGET32}\"" >> /home/clfs/.bashrc && \\
- echo "source $JHALFSDIR/envars" >> /home/clfs/.bashrc
- @chown clfs:clfs /home/clfs/.bashrc && \\
+ @echo "set +h" > /home/\$(LUSER)/.bashrc && \\
+ echo "umask 022" >> /home/\$(LUSER)/.bashrc && \\
+ echo "CLFS=\$(MOUNT_PT)" >> /home/\$(LUSER)/.bashrc && \\
+ echo "LC_ALL=POSIX" >> /home/\$(LUSER)/.bashrc && \\
+ echo "PATH=/cross-tools/bin:/bin:/usr/bin" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS LC_ALL PATH" >> /home/\$(LUSER)/.bashrc && \\
+ echo "" >> /home/\$(LUSER)/.bashrc && \\
+ echo "unset CFLAGS" >> /home/\$(LUSER)/.bashrc && \\
+ echo "unset CXXFLAGS" >> /home/\$(LUSER)/.bashrc && \\
+ echo "" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS_TARGET=\"${TARGET}\"" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS_TARGET32=\"${TARGET32}\"" >> /home/\$(LUSER)/.bashrc && \\
+ echo "source $JHALFSDIR/envars" >> /home/\$(LUSER)/.bashrc
+ @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bashrc && \\
touch envars && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -1012,6 +1012,8 @@
SRC= /sources
MOUNT_PT= $BUILDDIR
PKG_LST= $PKG_LST
+LUSER= $LUSER
+LGROUP= $LGROUP
include makefile-functions
@@ -1064,8 +1066,8 @@
clean-chapter2:
-if [ ! -f user-clfs-exist ]; then \\
- userdel clfs; \\
- rm -rf /home/clfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
rm -rf \$(MOUNT_PT)/tools
rm -f /tools
@@ -1092,13 +1094,13 @@
restore-clfs-env:
@\$(call echo_message, Building)
- @if [ -f /home/clfs/.bashrc.XXX ]; then \\
- mv -f /home/clfs/.bashrc.XXX /home/clfs/.bashrc; \\
+ @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv -f /home/\$(LUSER)/.bashrc.XXX /home/\$(LUSER)/.bashrc; \\
fi;
- @if [ -f /home/clfs/.bash_profile.XXX ]; then \\
- mv /home/clfs/.bash_profile.XXX /home/clfs/.bash_profile; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile.XXX /home/\$(LUSER)/.bash_profile; \\
fi;
- @chown clfs:clfs /home/clfs/.bash* && \\
+ @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bash* && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
@@ -1110,8 +1112,8 @@
@-umount \$(MOUNT_PT)/sys
@-umount \$(MOUNT_PT)/proc
@-if [ ! -f user-clfs-exist ]; then \\
- userdel clfs; \\
- rm -rf /home/clfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
EOF
@@ -1146,8 +1148,8 @@
clean-jhalfs:
-if [ ! -f user-clfs-exist ]; then \\
- userdel clfs; \\
- rm -rf /home/clfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
rm -rf \$(MOUNT_PT)/tools
rm -f /tools
@@ -1177,13 +1179,13 @@
restore-clfs-env:
@\$(call echo_message, Building)
- @if [ -f /home/clfs/.bashrc.XXX ]; then \\
- mv -fv /home/clfs/.bashrc.XXX /home/clfs/.bashrc; \\
+ @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv -fv /home/\$(LUSER)/.bashrc.XXX /home/\$(LUSER)/.bashrc; \\
fi;
- @if [ -f /home/clfs/.bash_profile.XXX ]; then \\
- mv -v /home/clfs/.bash_profile.XXX /home/clfs/.bash_profile; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv -v /home/\$(LUSER)/.bash_profile.XXX /home/\$(LUSER)/.bash_profile; \\
fi;
- @chown clfs:clfs /home/clfs/.bash* && \\
+ @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bash* && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
Index: CLFS/config
===================================================================
--- CLFS/config (revision 2873)
+++ CLFS/config (working copy)
@@ -38,6 +38,10 @@
# NOTE: not all combinations are 'bootable' yet.
METHOD=chroot
+#--- Unprivileged user and group name
+LUSER=clfs
+LGROUP=clfs
+
#--- Location of fstab file (if empty, a template is created)
FSTAB=
Index: CLFS2/master.sh
===================================================================
--- CLFS2/master.sh (revision 2873)
+++ CLFS2/master.sh (working copy)
@@ -67,42 +67,42 @@
025-addinguser: 023-creatingtoolsdir
@\$(call echo_message, Building)
- @if [ ! -d /home/clfs ]; then \\
- groupadd clfs; \\
- useradd -s /bin/bash -g clfs -m -k /dev/null clfs; \\
+ @if [ ! -d /home/\$(LUSER) ]; then \\
+ groupadd \$(LGROUP); \\
+ useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
else \\
touch user-clfs-exist; \\
fi;
- @chown clfs \$(MOUNT_PT) && \\
- chown clfs \$(MOUNT_PT)/tools && \\
- chown clfs \$(MOUNT_PT)/sources
+ @chown \$(LUSER) \$(MOUNT_PT) && \\
+ chown \$(LUSER) \$(MOUNT_PT)/tools && \\
+ chown \$(LUSER) \$(MOUNT_PT)/sources
@touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
026-settingenvironment: 025-addinguser
@\$(call echo_message, Building)
- @if [ -f /home/clfs/.bashrc -a ! -f /home/clfs/.bashrc.XXX ]; then \\
- mv /home/clfs/.bashrc /home/clfs/.bashrc.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bashrc -a ! -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv /home/\$(LUSER)/.bashrc /home/\$(LUSER)/.bashrc.XXX; \\
fi;
- @if [ -f /home/clfs/.bash_profile -a ! -f /home/clfs/.bash_profile.XXX ]; then \\
- mv /home/clfs/.bash_profile /home/clfs/.bash_profile.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile -a ! -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile /home/\$(LUSER)/.bash_profile.XXX; \\
fi;
- @echo "set +h" > /home/clfs/.bashrc && \\
- echo "umask 022" >> /home/clfs/.bashrc && \\
- echo "CLFS=\$(MOUNT_PT)" >> /home/clfs/.bashrc && \\
- echo "LC_ALL=POSIX" >> /home/clfs/.bashrc && \\
- echo "PATH=\$(MOUNT_PT)/cross-tools/bin:/bin:/usr/bin" >> /home/clfs/.bashrc && \\
- echo "export CLFS LC_ALL PATH" >> /home/clfs/.bashrc && \\
- echo "" >> /home/clfs/.bashrc && \\
- echo "unset CFLAGS" >> /home/clfs/.bashrc && \\
- echo "unset CXXFLAGS" >> /home/clfs/.bashrc && \\
- echo "" >> /home/clfs/.bashrc && \\
- echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> /home/clfs/.bashrc && \\
- echo "export CLFS_TARGET=\"${TARGET}\"" >> /home/clfs/.bashrc && \\
- echo "export CLFS_TARGET32=\"${TARGET32}\"" >> /home/clfs/.bashrc && \\
- echo "source $JHALFSDIR/envars" >> /home/clfs/.bashrc
- @chown clfs:clfs /home/clfs/.bashrc && \\
+ @echo "set +h" > /home/\$(LUSER)/.bashrc && \\
+ echo "umask 022" >> /home/\$(LUSER)/.bashrc && \\
+ echo "CLFS=\$(MOUNT_PT)" >> /home/\$(LUSER)/.bashrc && \\
+ echo "LC_ALL=POSIX" >> /home/\$(LUSER)/.bashrc && \\
+ echo "PATH=\$(MOUNT_PT)/cross-tools/bin:/bin:/usr/bin" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS LC_ALL PATH" >> /home/\$(LUSER)/.bashrc && \\
+ echo "" >> /home/\$(LUSER)/.bashrc && \\
+ echo "unset CFLAGS" >> /home/\$(LUSER)/.bashrc && \\
+ echo "unset CXXFLAGS" >> /home/\$(LUSER)/.bashrc && \\
+ echo "" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS_TARGET=\"${TARGET}\"" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export CLFS_TARGET32=\"${TARGET32}\"" >> /home/\$(LUSER)/.bashrc && \\
+ echo "source $JHALFSDIR/envars" >> /home/\$(LUSER)/.bashrc
+ @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bashrc && \\
touch envars
@touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -153,7 +153,7 @@
@touch \$(MOUNT_PT)/var/run/utmp \$(MOUNT_PT)/var/log/{btmp,lastlog,wtmp}
@chmod 664 \$(MOUNT_PT)/var/run/utmp \$(MOUNT_PT)/var/log/lastlog
- @chown -R clfs \$(MOUNT_PT)
+ @chown -R \$(LUSER) \$(MOUNT_PT)
@touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -210,12 +210,12 @@
#
# If $pkg_tarball isn't empty, we've got a package...
if [ "$pkg_tarball" != "" ] ; then
- wrt_Unpack_SetOwner "clfs" "$pkg_tarball"
+ wrt_Unpack_SetOwner "$LUSER" "$pkg_tarball"
# If using optimizations, write the instructions
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi
#
- wrt_ExecuteAsUser "clfs" "${this_script}" "${file}"
+ wrt_ExecuteAsUser "$LUSER" "${this_script}" "${file}"
#
[[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}"
#
@@ -308,12 +308,12 @@
#
# If $pkg_tarball isn't empty, we've got a package...
if [ "$pkg_tarball" != "" ] ; then
- wrt_Unpack_SetOwner "clfs" "$pkg_tarball"
+ wrt_Unpack_SetOwner "$LUSER" "$pkg_tarball"
# If using optimizations, write the instructions
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi
#
- wrt_ExecuteAsUser "clfs" "${this_script}" "${file}"
+ wrt_ExecuteAsUser "$LUSER" "${this_script}" "${file}"
#
[[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}"
#
@@ -374,9 +374,9 @@
wrt_target "${this_script}" "$PREV"
#
# If $pkg_tarball isn't empty, we've got a package...
- [[ "$pkg_tarball" != "" ]] && wrt_Unpack_SetOwner "clfs" "$pkg_tarball"
+ [[ "$pkg_tarball" != "" ]] && wrt_Unpack_SetOwner "$LUSER" "$pkg_tarball"
#
- wrt_ExecuteAsUser "clfs" "${this_script}" "${file}"
+ wrt_ExecuteAsUser "$LUSER" "${this_script}" "${file}"
#
[[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}"
#
@@ -436,17 +436,17 @@
wrt_target "${this_script}" "$PREV"
#
# If $pkg_tarball isn't empty, we've got a package...
- [[ "$pkg_tarball" != "" ]] && wrt_Unpack_SetOwner "clfs" "$pkg_tarball"
+ [[ "$pkg_tarball" != "" ]] && wrt_Unpack_SetOwner "$LUSER" "$pkg_tarball"
#
# Select a script execution method
case $this_script in
*fstab*) if [[ -n "$FSTAB" ]]; then
wrt_copy_fstab "${this_script}"
else
- wrt_ExecuteAsUser "clfs" "${this_script}" "${file}"
+ wrt_ExecuteAsUser "$LUSER" "${this_script}" "${file}"
fi
;;
- *) wrt_ExecuteAsUser "clfs" "${this_script}" "${file}"
+ *) wrt_ExecuteAsUser "$LUSER" "${this_script}" "${file}"
;;
esac
#
@@ -495,6 +495,8 @@
SRC= /sources
MOUNT_PT= $BUILDDIR
PKG_LST= $PKG_LST
+LUSER= $LUSER
+LGROUP= $LGROUP
include makefile-functions
@@ -528,21 +530,21 @@
restore-clfs-env:
@\$(call echo_message, Building)
- @if [ -f /home/clfs/.bashrc.XXX ]; then \\
- mv -f /home/clfs/.bashrc.XXX /home/clfs/.bashrc; \\
+ @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv -f /home/\$(LUSER)/.bashrc.XXX /home/\$(LUSER)/.bashrc; \\
fi;
- @if [ -f /home/clfs/.bash_profile.XXX ]; then \\
- mv /home/clfs/.bash_profile.XXX /home/clfs/.bash_profile; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile.XXX /home/\$(LUSER)/.bash_profile; \\
fi;
- @chown clfs:clfs /home/clfs/.bash* && \\
+ @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bash* && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
do-housekeeping:
@-if [ ! -f user-clfs-exist ]; then \\
- userdel clfs; \\
- rm -rf /home/clfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
EOF
Index: CLFS2/config
===================================================================
--- CLFS2/config (revision 2873)
+++ CLFS2/config (working copy)
@@ -21,6 +21,10 @@
#--------------------------------
# >>>> MULTILIB 32/64 <<<<
+#--- Unprivileged user and group name
+LUSER=clfs
+LGROUP=clfs
+
#--- Location of fstab file (if empty, a template is created)
FSTAB=
Index: HLFS/master.sh
===================================================================
--- HLFS/master.sh (revision 2873)
+++ HLFS/master.sh (working copy)
@@ -85,7 +85,7 @@
@echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)" > envars
EOF
) >> $MKFILE.tmp
- wrt_ExecuteAsUser "hlfs" "$toolchain" "$this_script"
+ wrt_ExecuteAsUser "$LUSER" "$toolchain" "$this_script"
;;
esac
#
@@ -140,38 +140,38 @@
021-addinguser: 020-creatingtoolsdir
@\$(call echo_message, Building)
- @if [ ! -d /home/hlfs ]; then \\
- groupadd hlfs; \\
- useradd -s /bin/bash -g hlfs -m -k /dev/null hlfs; \\
+ @if [ ! -d /home/\$(LUSER) ]; then \\
+ groupadd \$(LGROUP); \\
+ useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
else \\
touch user-hlfs-exist; \\
fi;
- @chown hlfs \$(MOUNT_PT)/tools && \\
- chown hlfs \$(MOUNT_PT)/sources && \\
+ @chown \$(LUSER) \$(MOUNT_PT)/tools && \\
+ chown \$(LUSER) \$(MOUNT_PT)/sources && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
022-settingenvironment: 021-addinguser
@\$(call echo_message, Building)
- @if [ -f /home/hlfs/.bashrc -a ! -f /home/hlfs/.bashrc.XXX ]; then \\
- mv /home/hlfs/.bashrc /home/hlfs/.bashrc.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bashrc -a ! -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv /home/\$(LUSER)/.bashrc /home/\$(LUSER)/.bashrc.XXX; \\
fi;
- @if [ -f /home/hlfs/.bash_profile -a ! -f /home/hlfs/.bash_profile.XXX ]; then \\
- mv /home/hlfs/.bash_profile /home/hlfs/.bash_profile.XXX; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile -a ! -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile /home/\$(LUSER)/.bash_profile.XXX; \\
fi;
- @echo "set +h" > /home/hlfs/.bashrc && \\
- echo "umask 022" >> /home/hlfs/.bashrc && \\
- echo "HLFS=\$(MOUNT_PT)" >> /home/hlfs/.bashrc && \\
- echo "LC_ALL=POSIX" >> /home/hlfs/.bashrc && \\
- echo "PATH=/tools/bin:/bin:/usr/bin" >> /home/hlfs/.bashrc && \\
- echo "export HLFS LC_ALL PATH" >> /home/hlfs/.bashrc && \\
- echo "" >> /home/hlfs/.bashrc && \\
- echo "target=$(uname -m)-${TARGET}" >> /home/lfs/.bashrc && \\
- echo "ldso=/tools/lib/${LOADER}" >> /home/lfs/.bashrc && \\
- echo "export target ldso" >> /home/lfs/.bashrc && \\
- echo "source $JHALFSDIR/envars" >> /home/hlfs/.bashrc && \\
- chown hlfs:hlfs /home/hlfs/.bashrc && \\
+ @echo "set +h" > /home/\$(LUSER)/.bashrc && \\
+ echo "umask 022" >> /home/\$(LUSER)/.bashrc && \\
+ echo "HLFS=\$(MOUNT_PT)" >> /home/\$(LUSER)/.bashrc && \\
+ echo "LC_ALL=POSIX" >> /home/\$(LUSER)/.bashrc && \\
+ echo "PATH=/tools/bin:/bin:/usr/bin" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export HLFS LC_ALL PATH" >> /home/\$(LUSER)/.bashrc && \\
+ echo "" >> /home/\$(LUSER)/.bashrc && \\
+ echo "target=$(uname -m)-${TARGET}" >> /home/\$(LUSER)/.bashrc && \\
+ echo "ldso=/tools/lib/${LOADER}" >> /home/\$(LUSER)/.bashrc && \\
+ echo "export target ldso" >> /home/\$(LUSER)/.bashrc && \\
+ echo "source $JHALFSDIR/envars" >> /home/\$(LUSER)/.bashrc && \\
+ chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bashrc && \\
touch envars && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
@@ -246,13 +246,13 @@
# If $pkg_tarball isn't empty, we've got a package...
if [ "$pkg_tarball" != "" ] ; then
# Insert instructions for unpacking the package and to set the PKGDIR variable.
- wrt_Unpack_SetOwner "hlfs" "$pkg_tarball"
+ wrt_Unpack_SetOwner "$LUSER" "$pkg_tarball"
# If using optimizations, write the instructions
[[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi
# Insert date and disk usage at the top of the log file, the script run
# and date and disk usage again at the bottom of the log file.
- wrt_ExecuteAsUser "hlfs" "$this_script" "${file}"
+ wrt_ExecuteAsUser "$LUSER" "$this_script" "${file}"
# Remove the build directory(ies) except if the package build fails
# (so we can review config.cache, config.log, etc.)
@@ -379,7 +379,7 @@
# In the mount of kernel filesystems we need to set HLFS and not to use chroot.
case "${this_script}" in
*kernfs*)
- wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
+ wrt_RunAsRoot "$LUSER" "${this_script}" "${file}"
;;
*) # The rest of Chapter06
wrt_run_as_chroot1 "${this_script}" "${file}"
@@ -568,8 +568,8 @@
clean-chapter3:
-if [ ! -f user-hlfs-exist ]; then \\
- userdel hlfs; \\
- rm -rf /home/hlfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
rm -rf \$(MOUNT_PT)/tools
rm -f /tools
@@ -597,13 +597,13 @@
restore-hlfs-env:
@\$(call echo_message, Building)
- @if [ -f /home/hlfs/.bashrc.XXX ]; then \\
- mv -f /home/hlfs/.bashrc.XXX /home/hlfs/.bashrc; \\
+ @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
+ mv -f /home/\$(LUSER)/.bashrc.XXX /home/\$(LUSER)/.bashrc; \\
fi;
- @if [ -f /home/hlfs/.bash_profile.XXX ]; then \\
- mv /home/hlfs/.bash_profile.XXX /home/hlfs/.bash_profile; \\
+ @if [ -f /home/\$(LUSER)/.bash_profile.XXX ]; then \\
+ mv /home/\$(LUSER)/.bash_profile.XXX /home/\$(LUSER)/.bash_profile; \\
fi;
- @chown hlfs:hlfs /home/hlfs/.bash* && \\
+ @chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bash* && \\
touch \$@ && \\
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
@@ -615,8 +615,8 @@
@-umount \$(MOUNT_PT)/sys
@-umount \$(MOUNT_PT)/proc
@-if [ ! -f user-hlfs-exist ]; then \\
- userdel hlfs; \\
- rm -rf /home/hlfs; \\
+ userdel \$(LUSER); \\
+ rm -rf /home/\$(LUSER); \\
fi;
restart_code:
Index: HLFS/config
===================================================================
--- HLFS/config (revision 2873)
+++ HLFS/config (working copy)
@@ -12,6 +12,10 @@
#--- The host system has grsecurity options enabled? 0(no)/1(yes)
GRSECURITY_HOST=0
+#--- Unprivileged user and group name
+LUSER=hlfs
+LGROUP=hlfs
+
#--- Location of fstab file (if empty, a template is created)
FSTAB=
Index: common/common-functions
===================================================================
--- common/common-functions (revision 2873)
+++ common/common-functions (working copy)
@@ -254,6 +254,7 @@
#
case $script_name in
tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
+ linux-headers) echo $(grep "^linux-.*-rc" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
*) echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
esac
@@ -309,7 +310,7 @@
@\$(call unpack,$FILE)
@ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed '[EMAIL PROTECTED]/@@;s@/.*@@'\` && \\
echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
- chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
+ chown -R \$(LUSER) \$(MOUNT_PT)\$(SRC)/\$\$ROOT
EOF
) >> $MKFILE.tmp
}
@@ -329,7 +330,7 @@
@\$(call unpack,$FILE)
@ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed '[EMAIL PROTECTED]/@@;s@/.*@@'\` && \\
echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
- chown -R clfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
+ chown -R \$(LUSER) \$(MOUNT_PT)\$(SRC)/\$\$ROOT
EOF
) >> $MKFILE.tmp
}
@@ -379,7 +380,7 @@
(
cat << EOF
@echo "export TEST_LOG=$TESTLOGDIR/$TESTLOGFILE" >> envars && \\
- su - lfs -c "echo -e '\n\`date\`\n' >$TESTLOGDIR/$TESTLOGFILE"
+ su - \$(LUSER) -c "echo -e '\n\`date\`\n' >$TESTLOGDIR/$TESTLOGFILE"
EOF
) >> $MKFILE.tmp
}
@@ -416,7 +417,7 @@
local file=$2
(
cat << EOF
- @( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
+ @( time { su - \$(LUSER) -c "source /home/\$(LUSER)/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
EOF
) >> $MKFILE.tmp
@@ -444,7 +445,7 @@
local file=$2
(
cat << EOF
- @( time { su - clfs -c "source /home/clfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
+ @( time { su - \$(LUSER) -c "source /home/\$(LUSER)/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
EOF
) >> $MKFILE.tmp
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
