From 9e98910a7216d48f73cbb52fb3cf7075ceaa9df0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Jan 2010 09:20:43 +0000 Subject: [PATCH] * Obsolete. svn path=/nixos/trunk/; revision=19213 --- .../remote-install-scripts/install-launch.sh | 10 --- .../remote-install-scripts/install-script.sh | 87 ------------------- tests/remote-install-scripts/install-start.sh | 12 --- tests/remote-install-scripts/install-test.sh | 71 --------------- 4 files changed, 180 deletions(-) delete mode 100755 tests/remote-install-scripts/install-launch.sh delete mode 100755 tests/remote-install-scripts/install-script.sh delete mode 100755 tests/remote-install-scripts/install-start.sh delete mode 100755 tests/remote-install-scripts/install-test.sh diff --git a/tests/remote-install-scripts/install-launch.sh b/tests/remote-install-scripts/install-launch.sh deleted file mode 100755 index ed2b81b90c51..000000000000 --- a/tests/remote-install-scripts/install-launch.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -stop dhclient -ifconfig eth0 10.0.253.250 netmask 255.255.0.0 up - -chmod a+x install-script.sh install-start.sh -scp -i id_livedvd -o StrictHostKeyChecking=no install-script.sh 10.0.253.251: -scp -i id_livedvd -o StrictHostKeyChecking=no install-start.sh 10.0.253.251: -ssh -i id_livedvd -o StrictHostKeyChecking=no 10.0.253.251 bash ./install-start.sh - diff --git a/tests/remote-install-scripts/install-script.sh b/tests/remote-install-scripts/install-script.sh deleted file mode 100755 index 8bcadaaba562..000000000000 --- a/tests/remote-install-scripts/install-script.sh +++ /dev/null @@ -1,87 +0,0 @@ -dd if=/dev/zero of=/dev/sda bs=1048576 count=1 - -sfdisk /dev/sda -uM << EOF -,512,L -,1024,S -,,L -EOF - -mkfs.ext3 /dev/sda1 ; mkswap /dev/sda2 ; mkfs.ext3 /dev/sda3 - -mount /dev/sda3 /mnt ; mkdir /mnt/boot ; mount /dev/sda1 /mnt/boot - -mkdir -p /mnt/etc/nixos - -cat > /mnt/etc/nixos/configuration.nix </dev/null; do - sleep 1; - done - echo -e "Installation finished\nOK" | /var/run/current-system/sw/bin/socat stdio tcp:10.0.2.2:4424 | { - read; - if [ "\\\$REPLY" = "reboot" ] ; then - /var/run/current-system/sw/sbin/start ctrl-alt-delete; - fi; - } - end script - ''; - } - ]; - }; - - fonts = { - enableFontConfig = false; - }; - - environment = { - systemPackages = [ - pkgs.socat (pkgs.lowPrio pkgs.nixUnstable) - ]; - nix = pkgs.nixCustomFun (pkgs.nixUnstable.src) - "" - ["nix-reduce-build" "nix-http-export.cgi"] - ["--with-docbook-xsl=\\\${pkgs.docbook5_xsl}/xml/xsl/docbook/"]; - }; -} - -EOF - -nixos-install - -echo Installation finished - -start ctrl-alt-delete - diff --git a/tests/remote-install-scripts/install-start.sh b/tests/remote-install-scripts/install-start.sh deleted file mode 100755 index a8cb4baa422d..000000000000 --- a/tests/remote-install-scripts/install-start.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -nohup bash -c 'NIX_REMOTE= ./install-script.sh &>/dev/tty11' & - -sleep 1; - -chvt 11 || true; - -disown - -exit - diff --git a/tests/remote-install-scripts/install-test.sh b/tests/remote-install-scripts/install-test.sh deleted file mode 100755 index 8b68c6a3bb12..000000000000 --- a/tests/remote-install-scripts/install-test.sh +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh -i - -if test -z "$INSTALL_TEST_RUNNING" ; then - export INSTALL_TEST_RUNNING=1; - export ORIGINAL_NAME="$0"; - sh -i < "$ORIGINAL_NAME"; - exit; -fi; - -if ! eval ' ( sleep 0.1; exit 0; ) & fg ' ; then - echo "Failing job control test"; - exit; -fi; - -set -x - -echo "Installation starting.." > report - -nix-build -o socat /etc/nixos/nixpkgs -A socat || { echo "Failed to build socat" >&2 ; exit 2; }; -nix-build -o qemu /etc/nixos/nixpkgs -A ${QEMU_PACKAGE:-qemu} || { echo "Failed to build qemu" >&2 ; exit 2; }; - -echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report & - -if ( ! [ -d dvd/iso ] ) || ( [ -z "$USE_LEFTOVER_DVD" ] ); then - rm dvd - # unset NIXPKGS_CONFIG to reduce host -> image configuration leak - NIXPKGS_CONFIG= nix-build -o dvd /etc/nixos/nixos/installer/cd-dvd/closed-install.nix || - { echo "Failed to build LiveDVD" >&2 ; exit 2; }; -fi; - -if ( ! [ -f install-test.img ] ) || ( [ -z "$JUST_BOOT" ] ); then - rm install-test.img - ./qemu/bin/qemu-img create -f qcow2 install-test.img 5G - - ./qemu/bin/qemu --kernel-kqemu -m 512 -cdrom dvd/iso/nixos-*.iso -hda install-test.img -boot d -no-reboot & - ./socat/bin/socat tcp-listen:4425 tcp-listen:3737 & - sleep 1; - - sed -e '/^127[.]0[.]0[.]1/d; /^\[127[.]0[.]0[.]1/d' -i ~/.ssh/known_hosts || true; - - ( - echo "cat > install-script.sh < install-start.sh <