zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct bug which occurs when restarting chroot phase

Browse source
This commit is contained in:
George Boudreau 2006-09-14 00:14:37 +00:00
parent 7d4cc81f34
commit 496f8f3e30
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CLFS/master.sh
View file

@ -1224,10 +1224,12 @@ mk_SUDO: mk_TEMP
#---------------CHROOT JAIL #---------------CHROOT JAIL
mk_SYSTOOLS: mk_SUDO mk_SYSTOOLS: mk_SUDO
@mkdir \$(MOUNT_PT)/bin && \\ @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
cd \$(MOUNT_PT)/bin && \\ mkdir \$(MOUNT_PT)/bin; \\
ln -sf /tools/bin/bash bash; ln -sf bash sh cd \$(MOUNT_PT)/bin && \\
@sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chroot/082-createfiles ln -svf /tools/bin/bash bash; ln -sf bash sh; \\
fi;
@sudo sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chroot/082-createfiles
@\$(call echo_CHROOT_request) @\$(call echo_CHROOT_request)
@\$(call echo_PHASE, Chroot systools) @\$(call echo_PHASE, Chroot systools)
@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make SYSTOOLS") @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make SYSTOOLS")

10
HLFS/master.sh
View file

@ -584,10 +584,12 @@ mk_SUDO: mk_LUSER
@touch \$@ @touch \$@
mk_CHROOT: mk_SUDO mk_CHROOT: mk_SUDO
@mkdir \$(MOUNT_PT)/bin && \ @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
cd \$(MOUNT_PT)/bin && \ mkdir \$(MOUNT_PT)/bin; \\
ln -sf /tools/bin/bash bash; ln -sf bash sh cd \$(MOUNT_PT)/bin && \\
@sed -e 's|^ln -vs|ln -svf|' -i \$(CMDSDIR)/chapter06/064-createfiles ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
fi;
@sudo sed -e 's|^ln -sv|ln -svf|' -i $(CMDSDIR)/chapter06/064-createfiles
@\$(call echo_CHROOT_request) @\$(call echo_CHROOT_request)
@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT") @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
@touch \$@ @touch \$@

12
LFS/master.sh
View file

@ -467,11 +467,13 @@ mk_SUDO: mk_LUSER
# Also change the original symlink creation to include (f)orce to prevent failure due to # Also change the original symlink creation to include (f)orce to prevent failure due to
# pre-existing links. # pre-existing links.
# #
mk_CHROOT: mk_LUSER mk_CHROOT: mk_SUDO
@mkdir \$(MOUNT_PT)/bin && \\ @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
cd \$(MOUNT_PT)/bin && \\ mkdir \$(MOUNT_PT)/bin; \\
ln -sf /tools/bin/bash bash; ln -sf bash sh cd \$(MOUNT_PT)/bin && \\
@sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chapter06/063-createfiles ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
fi;
@sudo sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chapter06/063-createfiles
@\$(call echo_CHROOT_request) @\$(call echo_CHROOT_request)
@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT") @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
@sudo restore-luser-env @sudo restore-luser-env