From 089b43617501b19b94523b2211877841ed09e70e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Jul 2003 09:12:52 +0000 Subject: [PATCH] * Deleted the sys directory. --- sys/bootstrap | 86 --------------------------------------------------- sys/makedisk | 11 ------- sys/mountloop | 8 ----- sys/runsystem | 5 --- sys/settings | 2 -- sys/start | 38 ----------------------- 6 files changed, 150 deletions(-) delete mode 100755 sys/bootstrap delete mode 100755 sys/makedisk delete mode 100755 sys/mountloop delete mode 100755 sys/runsystem delete mode 100644 sys/settings delete mode 100755 sys/start diff --git a/sys/bootstrap b/sys/bootstrap deleted file mode 100755 index f6aa16c86..000000000 --- a/sys/bootstrap +++ /dev/null @@ -1,86 +0,0 @@ -#! /bin/sh - -. ./settings - -if ! ./mountloop; then - exit 1 -fi - -# Cleanup. -rm -rf $target/dev -rm -rf $target/proc - -# Create the basic directory structure. -mkdir $target -mkdir $target/dev -mkdir $target/proc -mkdir $target/pkg -mkdir $target/pkg/sys -mkdir $target/pkg/sys/bin -mkdir $target/pkg/sys/var -mkdir $target/mnt -mkdir $target/mnt/host -mkdir -m 1777 $target/tmp - -# Make package registrations. -pkgdb=$target/pkg/sys/var/pkginfo - -# Copy some programs and its libraries. -utils="/usr/bin/vi /bin/sh /bin/mount /bin/umount /bin/ls /bin/ln /bin/cp /bin/mv /bin/rm /bin/cat /bin/df /bin/pwd /usr/bin/ld /usr/bin/as /bin/sed /bin/chmod /bin/chown /usr/bin/expr /bin/mkdir /bin/rmdir /usr/bin/sort /usr/bin/uniq /bin/uname /usr/bin/grep /bin/sleep /bin/gzip /usr/bin/make /usr/bin/cmp /bin/date /usr/bin/tr /usr/bin/ar /usr/bin/ranlib /usr/bin/basename /usr/bin/less /usr/bin/md5sum /bin/tar ../src/nix" -bootlib=/pkg/prog-bootstrap/lib -bootbin=/pkg/prog-bootstrap/bin -mkdir -p $target/$bootlib -mkdir -p $target/$bootbin -cp -p $utils $target/$bootbin -libs=`ldd $utils | awk '{ print $3 }' | sort | uniq` -echo $libs -cp -p $libs $target/$bootlib -for i in libc.so.6 libdl.so.2 libpthread.so.0 librt.so.1 libresolv.so.2 ld-linux.so.2; do rm $target/$bootlib/$i; done -../src/nix -d $pkgdb regpkg 5703121fe19cbeeaee7edd659cf4a25b /pkg/prog-bootstrap - -mv $target/$bootbin/nix $target/pkg/sys/bin -../src/nix -d $pkgdb regpkg 36bcbb801f5052739af8220c6ea51434 /pkg/sys - -# Copy the bootstrap gcc. -echo Copying gcc... -rsync -a ../bootstrap/gcc/inst/pkg $target -../src/nix -d $pkgdb regpkg 02212b3dc4e50349376975367d433929 /pkg/gcc-bootstrap - -# Copy the bootstrap glibc. -echo Copying glibc... -glibcdir=/pkg/glibc-bootstrap -rsync -a ../bootstrap/glibc/inst/pkg $target -../src/nix -d $pkgdb regpkg c0ce03ee0bab298babbe7e3b6159d36c $glibcdir - -# Copy the bootstrap kernel header files. -echo Copying kernel headers... -kerneldir=/pkg/kernel-bootstrap -rsync -a ../bootstrap/kernel/inst/pkg $target -../src/nix -d $pkgdb regpkg 3dc8333a2c2b4d627b892755417acf89 $kerneldir - -# Compatibility. -rm -rf $target/lib -mkdir $target/lib -ln -sf $glibcdir/lib/ld-linux.so.2 $target/lib/ld-linux.so.2 - -rm -rf $target/bin -mkdir $target/bin -ln -sf $bootbin/sh $target/bin/sh - -# Build ld.so.cache. -ldsoconf=$target/$glibcdir/etc/ld.so.conf -echo $glibcdir/lib > $ldsoconf -echo $bootlib >> $ldsoconf -$target/$glibcdir/sbin/ldconfig -r $target - -# Source repository. -rm -f $target/src -ln -sf /mnt/host/`pwd`/../pkg $target/src - -# Copy boot script. -cp -p ./start $target/pkg/sys/bin - -# Done. -echo Done! -umount $target -rmdir $target diff --git a/sys/makedisk b/sys/makedisk deleted file mode 100755 index 3d6ec9a2c..000000000 --- a/sys/makedisk +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh - -. ./settings - -rm $image - -dd if=/dev/zero of=$image bs=1M count=1 seek=256 - -/sbin/mke2fs -F -j $image -/sbin/tune2fs -c 0 $image -/sbin/tune2fs -i 0 $image diff --git a/sys/mountloop b/sys/mountloop deleted file mode 100755 index 1d5fe32fc..000000000 --- a/sys/mountloop +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -. ./settings - -mkdir $target -if ! mount -o loop -t ext3 $image $target; then - exit 1 -fi diff --git a/sys/runsystem b/sys/runsystem deleted file mode 100755 index fd634bdcc..000000000 --- a/sys/runsystem +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh - -. ./settings - -linux ubd0=$image init=/pkg/sys/bin/start diff --git a/sys/settings b/sys/settings deleted file mode 100644 index 3968b609a..000000000 --- a/sys/settings +++ /dev/null @@ -1,2 +0,0 @@ -image=/var/tmp/nix.img -target=./loop diff --git a/sys/start b/sys/start deleted file mode 100755 index b36cde297..000000000 --- a/sys/start +++ /dev/null @@ -1,38 +0,0 @@ -#! /pkg/prog-bootstrap/bin/sh - -# This directory contains nix. -export PATH=/pkg/sys/bin - -# Add in the utilities needed for booting. -export PATH=$PATH:`nix getpkg 5703121fe19cbeeaee7edd659cf4a25b`/bin - -echo -echo Starting up... - -echo Mounting file systems... -mount -n -o remount,rw /dev/root / -mount -n -t proc none /proc -mount -n -t hostfs none /mnt/host - -echo Registering available sources... -( if cd /src; then - for i in *; do - nix reg $i - done - fi -) - -export PATH=`nix getpkg coreutils-4.5.7`/bin:$PATH - -echo -echo "=== starting interactive shell ===" - -sh - -echo -echo Shutting down... - -umount /proc -#sync -mount -n -o remount,ro /dev/root / -#sync