Changeset 8ebf154

Timestamp:

11/17/2005 09:21:39 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

ebd1409

Parents:

d13460c

Message:

Triying to manage the cases where the lfs user is already present in the host.

File:

• jhalfs (modified) (6 diffs)

jhalfs

@@ -328 +328 @@
 chapter4_Makefiles() {
 #----------------------------#
+
+# If /home/lfs is already present in the host, we asume that the
+# lfs user and group are also presents in the host, and a backup
+# of their bash init files is made.
 (
     cat << EOF
@@ -339 +343 @@
 021-addinguser:  020-creatingtoolsdir
         @\$(call echo_message, Building)
-        @groupadd lfs && \\
-        useradd -s /bin/bash -g lfs -m -k /dev/null lfs && \\
-        chown lfs \$(LFS)/tools && \\
+        @if [ ! -d /home/lfs ]; then \\
+                groupadd lfs; \\
+                useradd -s /bin/bash -g lfs -m -k /dev/null lfs; \\
+        fi;
+        @chown lfs \$(LFS)/tools && \\
         chown lfs \$(LFS)/sources && \\
         touch \$@
@@ -347 +353 @@
 022-settingenvironment:  021-addinguser
         @\$(call echo_message, Building)
+        @if [ -f /home/lfs/.bashrc -a ! -f /home/lfs/.bashrc.XXX ]; then \\
+                mv -v /home/lfs/.bashrc /home/lfs/.bashrc.XXX; \\
+        fi;
+        @if [ -f /home/lfs/.bash_profile  -a ! -f /home/lfs/.bash_profile.XXX ]; then \\
+                mv -v /home/lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\
+        fi;
         @echo "set +h" > /home/lfs/.bashrc && \\
         echo "umask 022" >> /home/lfs/.bashrc && \\
@@ -820 +832 @@
 chapter4:  020-creatingtoolsdir 021-addinguser 022-settingenvironment
 
-chapter5:  chapter4 $chapter5
+chapter5:  chapter4 $chapter5 restore-lfs-env
 
 chapter6:  chapter5 $chapter6
@@ -841 +853 @@
 clean-chapter5:
         rm -rf \$(LFS)/tools/*
-        rm -f $chapter5
+        rm -f $chapter5 restore-lfs-env
         cd logs && rm -f $chapter5 && cd ..
   
@@ -858 +870 @@
         cd logs && rm -f $chapter789 && cd ..
 
+restore-lfs-env:
+        @\$(call echo_message, Building)
+        @if [ -f /home/lfs/.bashrc.XXX ]; then \\
+                mv -fv /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\
+        fi;
+        @if [ -f /home/lfs/.bash_profile.XXX ]; then \\
+                mv -v /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
+        fi;
+        @chown lfs:lfs /home/lfs/.bash* && \\
+        @touch \$@
 
 EOF