remove some debugging statements

svn path=/nixu/trunk/; revision=3716
This commit is contained in:
Armijn Hemel 2005-08-27 00:04:30 +00:00
parent 796f3bb691
commit a3ae8f4143

View File

@ -4,6 +4,8 @@ export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinu
kernel=@kernel@ kernel=@kernel@
storePaths=/mystorepaths
sysvinitPath=@sysvinitPath@ sysvinitPath=@sysvinitPath@
bootPath=@bootPath@ bootPath=@bootPath@
modutils=@modutils@ modutils=@modutils@
@ -82,7 +84,6 @@ mknod -m 0600 /dev/initctl p
targetdrive=/dev/hda targetdrive=/dev/hda
device=${targetdrive}1 device=${targetdrive}1
echo ext2 fs blaat `which mkfs.ext2`
mkfs.ext2 ${device} mkfs.ext2 ${device}
mkswap ${targetdrive}2 mkswap ${targetdrive}2
@ -198,8 +199,6 @@ do
echo "Looking for CDROM in: $i" echo "Looking for CDROM in: $i"
if mount -t iso9660 $i /cdrom >/dev/null 2>&1 if mount -t iso9660 $i /cdrom >/dev/null 2>&1
then then
echo "cdrom contents"
ls /cdrom
if test -f /cdrom/NIXOS if test -f /cdrom/NIXOS
then then
cddevice=$i cddevice=$i
@ -266,7 +265,10 @@ echo copying store
#cp -fva /nix/store/* $root/nix/store #cp -fva /nix/store/* $root/nix/store
tar cf - /nix/store | tar --directory=$root -xvf - tar cf - /nix/store | tar --directory=$root -xvf -
#echo registering valid paths... echo registering valid paths...
$NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths
#(while read storepath; do #(while read storepath; do
# echo PATH $storepath # echo PATH $storepath
# if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then # if ! $NIX_CMD_PATH/nix-store --isvalid $storepath 2> /dev/null; then
@ -336,7 +338,6 @@ chmod 644 $root/lib/modules/$version/modules.*
### Do funky stuff with grub here. ### Do funky stuff with grub here.
### ###
ln -s @kernel@/vmlinuz $root/boot/vmlinuz
ln -s @sysvinitPath@/sbin/init $root/sbin/init ln -s @sysvinitPath@/sbin/init $root/sbin/init
ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
ln -s @hotplug@/etc/hotplug $root/etc/hotplug ln -s @hotplug@/etc/hotplug $root/etc/hotplug