diff --git a/CLFS/master.sh b/CLFS/master.sh index 7354432..35d2773 100755 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -1335,10 +1335,6 @@ fi ( cat << EOF - -restart: - @echo "This feature does not exist for the CLFS makefile. (yet)" - restore-luser-env: @\$(call echo_message, Building) @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\ diff --git a/CLFS2/master.sh b/CLFS2/master.sh index 0e0654c..acc2c1c 100755 --- a/CLFS2/master.sh +++ b/CLFS2/master.sh @@ -499,9 +499,6 @@ LUSER: $cross_tools $basicsystem $bootscripttools $bootable ROOT: $chowning -restart: - @echo "This feature does not exist for the CLFS-2 makefile. (yet)" - restore-luser-env: @\$(call echo_message, Building) @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\ diff --git a/HLFS/master.sh b/HLFS/master.sh index 657ee17..f74f7ce 100755 --- a/HLFS/master.sh +++ b/HLFS/master.sh @@ -614,8 +614,6 @@ CHROOT: $chapter6 BOOT: $chapter7 -#restart: restart_code all - restore-luser-env: @\$(call echo_message, Building) @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\ @@ -641,45 +639,6 @@ do-housekeeping: rm -rf /home/\$(LUSER); \\ fi; -restart_code: - @echo ">>> This feature is experimental, BUGS may exist" - - @if [ ! -L /tools ]; then \\ - echo -e "\\nERROR::\\n /tools is NOT a symlink.. /tools must point to \$(MOUNT_PT)/tools\\n" && false;\\ - fi; - - @if [ ! -e /tools ]; then \\ - echo -e "\\nERROR::\\nThe target /tools points to does not exist.\\nVerify the target.. \$(MOUNT_PT)/tools\\n" && false;\\ - fi; - - @if ! stat -c %N /tools | grep "\$(MOUNT_PT)/tools" >/dev/null ; then \\ - echo -e "\\nERROR::\\nThe symlink \\"/tools\\" does not point to \\"\$(MOUNT_PT)/tools\\".\\nCorrect the problem and rerun\\n" && false;\\ - fi; - - @if [ -f ???-kernfs ]; then \\ - mkdir -pv \$(MOUNT_PT)/{proc,sys};\\ - if ! mount -l | "\$(MOUNT_PT)/dev" >/dev/null ; then \\ - mount -vt ramfs ramfs \$(MOUNT_PT)/dev;\\ - fi;\\ - if [ ! -e \$(MOUNT_PT)/dev/console ]; then \\ - mknod -m 600 \$(MOUNT_PT)/dev/console c 5 1;\\ - fi;\\ - if [ ! -e \$(MOUNT_PT)/dev/null ]; then \\ - mknod -m 666 \$(MOUNT_PT)/dev/null c 1 3;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/dev/pts" >/dev/null ; then \\ - mount -vt devpts -o gid=4,mode=620 devpts \$(MOUNT_PT)/dev/pts;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/dev/shm" >/dev/null ; then \\ - mount -vt tmpfs shm \$(MOUNT_PT)/dev/shm;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/proc" >/dev/null ; then \\ - mount -vt proc proc \$(MOUNT_PT)/proc;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/sys" >/dev/null ; then \\ - mount -vt sysfs sysfs \$(MOUNT_PT)/sys;\\ - fi;\\ - fi; EOF diff --git a/LFS/master.sh b/LFS/master.sh index 56dd6e0..ba556fd 100755 --- a/LFS/master.sh +++ b/LFS/master.sh @@ -498,8 +498,6 @@ CHROOT: $chapter6 BOOT: $chapter789 -restart: restart_code all - restore-luser-env: @\$(call echo_message, Building) @if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\ @@ -525,45 +523,6 @@ do_housekeeping: rm -rf /home/\$(LUSER); \\ fi; -restart_code: - @echo ">>> This feature is experimental, BUGS may exist" - - @if [ ! -L /tools ]; then \\ - echo -e "\\nERROR::\\n /tools is NOT a symlink.. /tools must point to \$(MOUNT_PT)/tools\\n" && false;\\ - fi; - - @if [ ! -e /tools ]; then \\ - echo -e "\\nERROR::\\nThe target /tools points to does not exist.\\nVerify the target.. \$(MOUNT_PT)/tools\\n" && false;\\ - fi; - - @if ! stat -c %N /tools | grep "\$(MOUNT_PT)/tools" >/dev/null ; then \\ - echo -e "\\nERROR::\\nThe symlink \\"/tools\\" does not point to \\"\$(MOUNT_PT)/tools\\".\\nCorrect the problem and rerun\\n" && false;\\ - fi; - - @if [ -f ???-kernfs ]; then \\ - mkdir -pv \$(MOUNT_PT)/{dev,proc,sys};\\ - if [ ! -e \$(MOUNT_PT)/dev/console ]; then \\ - mknod -m 600 \$(MOUNT_PT)/dev/console c 5 1;\\ - fi;\\ - if [ ! -e \$(MOUNT_PT)/dev/null ]; then \\ - mknod -m 666 \$(MOUNT_PT)/dev/null c 1 3;\\ - fi;\\ - if ! mount -l | grep bind >/dev/null ; then \\ - mount --bind /dev \$(MOUNT_PT)/dev;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/dev/pts" >/dev/null ; then \\ - mount -vt devpts devpts \$(MOUNT_PT)/dev/pts;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/dev/shm" >/dev/null ; then \\ - mount -vt tmpfs shm \$(MOUNT_PT)/dev/shm;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/proc" >/dev/null ; then \\ - mount -vt proc proc \$(MOUNT_PT)/proc;\\ - fi;\\ - if ! mount -l | grep "\$(MOUNT_PT)/sys" >/dev/null ; then \\ - mount -vt sysfs sysfs \$(MOUNT_PT)/sys;\\ - fi;\\ - fi; EOF ) >> $MKFILE