Changeset 30737ea8 for CLFS

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:

• CLFS/master.sh (modified) (11 diffs)

CLFS/master.sh

@@ -46 +46 @@
                 useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
         else \\
-                touch user-clfs-exist; \\
+                touch luser-exist; \\
         fi;
         @chown \$(LUSER) \$(MOUNT_PT) && \\
@@ -1054 +1054 @@
 chapter4:  chapter3 $temptools
 
-chapter5:  chapter4 $chroottools $testsuitetools
+chapter5:  chapter4 $chroottools restore-luser-env $testsuitetools
 
 chapter6:  chapter5 $basicsystem
@@ -1071 +1071 @@
 
 clean-chapter2:
-        -if [ ! -f user-clfs-exist ]; then \\
+        -if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\
                 rm -rf /home/\$(LUSER); \\
@@ -1079 +1079 @@
         rm -rf \$(MOUNT_PT)/cross-tools
         rm -f /cross-tools
-        rm -f envars user-clfs-exist
+        rm -f envars luser-exist
         rm -f 02* logs/02*.log
 
 clean-chapter3:
         rm -rf \$(MOUNT_PT)/tools/*
-        rm -f $cross_tools restore-clfs-env sources-dir
+        rm -f $cross_tools sources-dir
         cd logs && rm -f $cross_tools && cd ..
 
@@ -1098 +1098 @@
 
 
-restore-clfs-env:
+restore-luser-env:
         @\$(call echo_message, Building)
         @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -1117 +1117 @@
         @-umount \$(MOUNT_PT)/sys
         @-umount \$(MOUNT_PT)/proc
-        @-if [ ! -f user-clfs-exist ]; then \\
+        @-if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\
                 rm -rf /home/\$(LUSER); \\
@@ -1137 +1137 @@
         $temptools \
         $chroottools \
-        $boottools
+        $boottools restore-luser-env
         @\$(call echo_boot_finished,$VERSION)
 
@@ -1153 +1153 @@
 
 clean-jhalfs:
-        -if [ ! -f user-clfs-exist ]; then \\
+        -if [ ! -f luser-exist ]; then \\
                 userdel \$(LUSER); \\
                 rm -rf /home/\$(LUSER); \\
@@ -1161 +1161 @@
         rm -rf \$(MOUNT_PT)/cross-tools
         rm -f /cross-tools
-        rm -f envars user-clfs-exist
+        rm -f envars luser-exist
         rm -f 02* logs/02*.log
 
@@ -1167 +1167 @@
         rm -rf /tools/*
         rm -f $cross_tools && rm -f $temptools && rm -f $chroottools && rm -f $boottools
-        rm -f restore-clfs-env sources-dir
+        rm -f restore-luser-env sources-dir
         cd logs && rm -f $cross_tools && rm -f $temptools && rm -f $chroottools && rm -f $boottools && cd ..
 
@@ -1183 +1183 @@
 
 
-restore-clfs-env:
+restore-luser-env:
         @\$(call echo_message, Building)
         @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\