diff --git a/fill-disk.sh b/fill-disk.sh index d7860316e4a..f384d15d7ec 100755 --- a/fill-disk.sh +++ b/fill-disk.sh @@ -15,7 +15,7 @@ mount -t sysfs sys /sys # consoles -mknod -m 0600 /dev/console c 5 1 +#mknod -m 0600 /dev/console c 5 1 mknod -m 0600 /dev/ttyS0 c 4 64 mknod -m 0600 /dev/ttyS1 c 4 65 mknod -m 0600 /dev/ttyS2 c 4 66 @@ -49,13 +49,15 @@ mknod -m 0644 /dev/urandom c 1 9 echo "blaat" -if ! test -n "$1" -then - echo "need harddisk device for installing!" - exit -else - device=$1 -fi +#if ! test -n "$1" +#then +# echo "need harddisk device for installing!" +# exit +#else +# device=$1 +#fi + +device=/dev/hda1 make_dir() { mode=$1 @@ -75,7 +77,9 @@ root=/tmp/mnt mkdir -p /tmp/mnt -mount $device /tmp/mnt +mount -t ext2 $device /tmp/mnt + +cd /sys; echo * # mkdir -p /nix # mkdir -p /nixpkgs/trunk/pkgs diff --git a/make-disk.sh b/make-disk.sh index ba964d09c0e..7b2f20781f7 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -44,6 +44,7 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni #echo $nixDeps > $storePaths utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))) +coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))) bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)) coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)) @@ -131,13 +132,13 @@ echo creating ramdisk rm -f ${initrd} cp ${archivesDir}/scripts/fill-disk.sh ${initdir}/init cp ${bash}/bin/* ${initdir}/bin -#cp -f /nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash ${initdir}/bin/sh chmod u+x ${initdir}/init cp -fau --parents ${bashdeps} ${initdir} cp -fau --parents ${utilLinux} ${initdir} +cp -fau --parents ${coreUtils} ${initdir} -#(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd} -(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd} +(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd} +#(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd} cp ${initrd} ${archivesDir}/isolinux