Changeset 7d4cc81 for HLFS/master.sh

Timestamp:

09/13/2006 08:04:46 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

496f8f3

Parents:

786e86c

Message:

Changes made to allow the generated makefile to be run from any account (with sudo privs)

File:

• HLFS/master.sh (modified) (4 diffs)

HLFS/master.sh

@@ -154 +154 @@
         echo "source $JHALFSDIR/envars" >> /home/\$(LUSER)/.bashrc && \\
         chown \$(LUSER):\$(LGROUP) /home/\$(LUSER)/.bashrc && \\
+        chmod -R a+wt \$(MOUNT_PT) && \\
         touch envars && \\
         chown \$(LUSER) envars && \\
@@ -556 +557 @@
   cat << EOF
 
-all:    mk_SETUP mk_LUSER mk_CHROOT mk_BOOT do-housekeeping
+all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT
+        @sudo make do-housekeeping
         @\$(call echo_finished,$VERSION)
 
+ck_UID:
+        @if [ \`id -u\` = "0" ]; then \\
+          echo "--------------------------------------------------"; \\
+          echo "You cannot run this makefile from the root account"; \\
+          echo "--------------------------------------------------"; \\
+          exit 1; \\
+        fi
 
 mk_SETUP:
@@ -567 +576 @@
 mk_LUSER: mk_SETUP
         @\$(call echo_SULUSER_request)
-        @( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
+        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
+        @sudo make restore-luser-env
         @touch \$@
 
-mk_CHROOT: mk_LUSER 060-kernfs 062-changingowner
+mk_SUDO: mk_LUSER
+        @sudo make SUDO
+        @touch \$@
+        
+mk_CHROOT: mk_SUDO 
         @mkdir \$(MOUNT_PT)/bin && \
         cd \$(MOUNT_PT)/bin && \
@@ -588 +602 @@
 
 LUSER:  $chapter5
+
+SUDO:   060-kernfs 062-changingowner
 
 CHROOT: $chapter6