changeset 790:188a182b1a7f

Remove some leftover /tools residue.
author Rob Landley <rob@landley.net>
date Mon, 06 Jul 2009 05:26:21 -0500
parents dde700454fbe
children b9fa1da23205
files sources/native/sbin/init.sh sources/toys/run-emulator.sh
diffstat 2 files changed, 5 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/sources/native/sbin/init.sh	Sun Jul 05 23:59:57 2009 -0500
+++ b/sources/native/sbin/init.sh	Mon Jul 06 05:26:21 2009 -0500
@@ -1,33 +1,17 @@
 #!/bin/sh
 
-# If you're doing a Linux From Scratch build, the /tools directory is
-# sufficient.  (Start by installing kernel headers and building a C library.)
-
 # Otherwise, building source packages wants things like /bin/bash and
 # running the results wants /lib/ld-uClibc.so.0, so set up some directories
 # and symlinks to let you easily compile source packages.
 
-# Add /tools to $PATH if it's not there
-
-if [ -d tools/bin ] && [ -z "$(echo :$PATH | tools/bin/grep :/tools/bin)" ]
-then
-  [ -z "$PATH" ] && PATH=/tools/bin || PATH="$PATH":/tools/bin
-  export PATH
-fi
 export HOME=/home
 
-# Create some temporary directories at the root level
-mkdir -p  proc sys dev etc tmp home
-[ ! -e bin ] && ln -s tools/bin bin
-[ ! -e lib ] && ln -s tools/lib lib
-[ ! -e usr ] && ln -s tools usr
-
 # Populate /dev
 mountpoint -q sys || mount -t sysfs sys sys
 mountpoint -q dev || mount -t tmpfs -o noatime dev dev
 mdev -s
 
-# Mount /proc is there
+# Make sure /proc is there
 mountpoint -q proc || mount -t proc proc proc
 
 # If we're running under qemu, do some more setup
@@ -52,10 +36,10 @@
     mount -o noatime $HOMEDEV /home
   fi
 
-  mount -o noatime -t tmpfs /tmp /tmp
+  mount -t tmpfs /tmp /tmp
 
   echo Type exit when done.
-  exec /tools/bin/oneit -c /dev/"$(dmesg | sed -n '/^Kernel command line:/s@.* console=\(/dev/\)*\([^ ]*\).*@\2@p')" /tools/bin/ash
+  exec /bin/oneit -c /dev/"$(dmesg | sed -n '/^Kernel command line:/s@.* console=\(/dev/\)*\([^ ]*\).*@\2@p')" /bin/ash
 
 # If we're not PID 1, it's probably a chroot.
 else
@@ -64,7 +48,7 @@
   # Switch to a shell with command history.
 
   echo Type exit when done.
-  /tools/bin/ash
+  /bin/ash
   cd /
   umount ./dev
   umount ./home
--- a/sources/toys/run-emulator.sh	Sun Jul 05 23:59:57 2009 -0500
+++ b/sources/toys/run-emulator.sh	Mon Jul 06 05:26:21 2009 -0500
@@ -80,7 +80,7 @@
 
   # Prepare some environment variables for run-qemu.sh
 
-  DISTCC_PATH_PREFIX=/usr/distcc:/tools/distcc:
+  DISTCC_PATH_PREFIX=/usr/distcc:
   KERNEL_EXTRA="DISTCC_HOSTS=10.0.2.2:$PORT/$CPUS CPUS=$CPUS $KERNEL_EXTRA"
 fi