Changeset 30737ea8 for LFS

Timestamp:

08/06/2006 10:59:36 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

fa58f81

Parents:

ef87eed

Message:

Renamed user-{c,h}lfs-exist to luser-exist.
Renamed restore-{c,h}lfs-env to restore-luser-env.

File:

• LFS/master.sh (modified) (7 diffs)

LFS/master.sh

@@ -14 +14 @@
   echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter4${R_arrow}"
 
-# If /home/lfs is already present in the host, we asume that the
+# If /home/$LUSER 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.
@@ -34 +34 @@
                 useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
         else \\
-                touch user-lfs-exist; \\
+                touch luser-exist; \\
         fi;
         @chown \$(LUSER) \$(MOUNT_PT)/tools && \\
@@ -403 +403 @@
 chapter4:  020-creatingtoolsdir 021-addinguser 022-settingenvironment
 
-chapter5:  chapter4 $chapter5 restore-lfs-env
+chapter5:  chapter4 $chapter5 restore-luser-env
 
 chapter6:  chapter5 $chapter6
@@ -417 +417 @@
 
 clean-chapter4:
-        -if [ ! -f user-lfs-exist ]; then \\
+        -if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\
                 rm -rf /home/\$(LUSER); \\
@@ -423 +423 @@
         rm -rf \$(MOUNT_PT)/tools
         rm -f /tools
-        rm -f envars user-lfs-exist
+        rm -f envars luser-exist
         rm -f 02* logs/02*.log
 
 clean-chapter5:
         rm -rf \$(MOUNT_PT)/tools/*
-        rm -f $chapter5 restore-lfs-env sources-dir
+        rm -f $chapter5 restore-luser-env sources-dir
         cd logs && rm -f $chapter5 && cd ..
 
@@ -445 +445 @@
         cd logs && rm -f $chapter789 && cd ..
 
-restore-lfs-env:
+restore-luser-env:
         @\$(call echo_message, Building)
         @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -464 +464 @@
         @-umount \$(MOUNT_PT)/dev/pts
         @-umount \$(MOUNT_PT)/dev
-        @-if [ ! -f user-lfs-exist ]; then \\
+        @-if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\
                 rm -rf /home/\$(LUSER); \\