diff --git a/CLFS/master.sh b/CLFS/master.sh index a64608a..97f2ad4 100755 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -20,9 +20,9 @@ host_prep_Makefiles() { # Initialization of the system cat << EOF 023-creatingtoolsdir: @\$(call echo_message, Building) - @mkdir -v \$(MOUNT_PT)/tools && \\ - rm -fv /tools && \\ - ln -sv \$(MOUNT_PT)/tools / + @mkdir \$(MOUNT_PT)/tools && \\ + rm -f /tools && \\ + ln -s \$(MOUNT_PT)/tools / @if [ ! -d \$(MOUNT_PT)/sources ]; then \\ mkdir \$(MOUNT_PT)/sources; \\ fi; @@ -31,8 +31,8 @@ cat << EOF 024-creatingcrossdir: 023-creatingtoolsdir @mkdir -v \$(MOUNT_PT)/cross-tools && \\ - rm -fv /cross-tools && \\ - ln -sv \$(MOUNT_PT)/cross-tools / + rm -f /cross-tools && \\ + ln -s \$(MOUNT_PT)/cross-tools / @touch \$@ 025-addinguser: 024-creatingcrossdir @@ -52,10 +52,10 @@ cat << EOF 026-settingenvironment: 025-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; \\ + mv /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; \\ + mv /home/lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\ fi; @echo "set +h" > /home/lfs/.bashrc && \\ echo "umask 022" >> /home/lfs/.bashrc && \\ @@ -1090,10 +1090,10 @@ clean-chapter4: restore-lfs-env: @\$(call echo_message, Building) @if [ -f /home/lfs/.bashrc.XXX ]; then \\ - mv -fv /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\ + mv -f /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; \\ + mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\ fi; @chown lfs:lfs /home/lfs/.bash* && \\ touch \$@ diff --git a/HLFS/master.sh b/HLFS/master.sh index 38ab547..9c1da30 100755 --- a/HLFS/master.sh +++ b/HLFS/master.sh @@ -30,9 +30,9 @@ chapter3_Makefiles() { # Initialization of the system cat << EOF 020-creatingtoolsdir: @\$(call echo_message, Building) - @mkdir -v \$(MOUNT_PT)/tools && \\ - rm -fv /tools && \\ - ln -sv \$(MOUNT_PT)/tools / + @mkdir \$(MOUNT_PT)/tools && \\ + rm -f /tools && \\ + ln -s \$(MOUNT_PT)/tools / @if [ ! -d \$(MOUNT_PT)/sources ]; then \\ mkdir \$(MOUNT_PT)/sources; \\ fi; @@ -54,10 +54,10 @@ cat << EOF 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; \\ + mv /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; \\ + mv /home/lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\ fi; @echo "set +h" > /home/lfs/.bashrc && \\ echo "umask 022" >> /home/lfs/.bashrc && \\ @@ -572,10 +572,10 @@ clean-chapter7: restore-lfs-env: @\$(call echo_message, Building) @if [ -f /home/lfs/.bashrc.XXX ]; then \\ - mv -fv /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\ + mv -f /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; \\ + mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\ fi; @chown lfs:lfs /home/lfs/.bash* && \\ touch \$@ diff --git a/LFS/master.sh b/LFS/master.sh index 18913ba..880b07a 100755 --- a/LFS/master.sh +++ b/LFS/master.sh @@ -443,7 +443,7 @@ restore-lfs-env: mv -f /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\ fi; @if [ -f /home/lfs/.bash_profile.XXX ]; then \\ - mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\ + mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\ fi; @chown lfs:lfs /home/lfs/.bash* && \\ touch \$@ @@ -487,7 +487,7 @@ restart_code: if ! mount -l | grep "$\(MOUNT_PT)/sys" >/dev/null ; then \\ mount -vt sysfs sysfs \$(MOUNT_PT)/sys;\\ fi;\\ - fi; + fi; EOF ) >> $MKFILE