[Debconf-video-commits] r557 - fai-config/doc/src
Eric Dantan Rzewnicki
edrz-guest at alioth.debian.org
Thu Jul 22 17:06:10 UTC 2010
Author: edrz-guest
Date: 2010-07-22 17:06:09 +0000 (Thu, 22 Jul 2010)
New Revision: 557
Added:
fai-config/doc/src/penultimate_setup.sh
Modified:
fai-config/doc/src/create_usbstick_howto.txt
fai-config/doc/src/final_setup.sh
fai-config/doc/src/preseed.cfg
Log:
Split final_setup.sh into two pieces since we have to reboot anyway.
Modified: fai-config/doc/src/create_usbstick_howto.txt
===================================================================
--- fai-config/doc/src/create_usbstick_howto.txt 2010-07-22 16:48:51 UTC (rev 556)
+++ fai-config/doc/src/create_usbstick_howto.txt 2010-07-22 17:06:09 UTC (rev 557)
@@ -9,14 +9,14 @@
copy the following files to /mnt:
-sudo cp vmlinuz initrd.gz syslinux.cfg debian-505-i386-businesscard.iso preseed.cfg final_setup.sh ac583520.asc /mnt
+sudo cp vmlinuz initrd.gz syslinux.cfg debian-505-i386-businesscard.iso preseed.cfg penultimate_setup.sh ac583520.asc /mnt
vmlinuz # see current directory (taken from http://ftp.nl.debian.org/debian/dists/lenny/main/installer-i386/current/images/hd-media/ )
initrd.gz # see current directory (taken from from http://ftp.nl.debian.org/debian/dists/lenny/main/installer-i386/current/images/hd-media/ )
syslinux.cfg # see current directory :) defines language and preseed file url
debian-505-i386-businesscard.iso # take it from http://cdimage.debian.org/debian-cd/5.0.5/i386/iso-cd/ !
preseed.cfg # see current directory
-final_setup.sh # see current directory
+penultimate_setup.sh # see current directory
ac583520.asc # h01gers public key
sudo umount /dev/sdb1
@@ -44,7 +44,7 @@
Using pxeboot installer
-----------------------
--Adjust preseed.cfg to wget final_setup.sh from svn. There is an example in the
+-Adjust preseed.cfg to wget penultimate_setup.sh from svn. There is an example in the
comment at the end of that file.
-Make preseed.cfg available via http some.where.
-Add a stanza such as the following to your pxeboot environment:
Modified: fai-config/doc/src/final_setup.sh
===================================================================
--- fai-config/doc/src/final_setup.sh 2010-07-22 16:48:51 UTC (rev 556)
+++ fai-config/doc/src/final_setup.sh 2010-07-22 17:06:09 UTC (rev 557)
@@ -8,45 +8,13 @@
# country=UNIX
LANG=C
-# distribution we are using
-DISTRO=squeeze
-
-# hardcode mirror to use
-MIRROR=ftp.us.debian.org
-#
-## either use local mirror or ftp.de.debian.org
-#apt-get install file
-#TMPFILE=`mktemp -p /tmp`
-#if $( wget -q http://mirror/debian/dists/$DISTRO/Release.gpg -O $TMPFILE && file $TMPFILE | grep PGP > /dev/null ) ; then MIRROR=mirror
-#elif $(wget -q http://ftp.de.debian.org/debian/dists/$DISTRO/Release.gpg -O $TMPFILE && file $TMPFILE | grep PGP > /dev/null ) ; then MIRROR=ftp.de.debian.org
-#else echo cannot reach a mirror, aborting && exit 1 ; fi
-#rm $TMPFILE
-
-
-# which arch are we running on? (needed for sources.list)
-ARCH=`dpkg --print-architecture`
-
# install fai clients and recommended stuff
export DEBCONF_FRONTEND=noninteractive
export DEBIAN_FRONTEND=noninteractive
-apt-get -y install fai-client subversion
-# overwrite existing sources.lists, provide sensible defaults
-echo "#deb http://$MIRROR/debian/ $DISTRO main contrib non-free
-#deb http://security.debian.org/ $DISTRO/updates main contrib non-free
-
-deb http://snapshot.debian.org/archive/debian/20100704T132725Z/ squeeze main
-
-deb http://db.debconf.org/dc-admin/archive/ $DISTRO/$ARCH/
-deb http://db.debconf.org/dc-admin/archive/ $DISTRO/all/
-" > /etc/apt/sources.list
-
-# upgrade to squeeze snapshort
-apt-get update
-apt-get -y install apt
-apt-get -y install linux-image-2.6.32-5-686-bigmem
echo "y" | apt-get -y upgrade
-apt-get -y dist-upgrade
+echo "y" | apt-get -y dist-upgrade
+apt-get -y install fai-client subversion
# configure fai
echo 'FAI_CONFIG_SRC="svn://svn.debian.org/svn/debconf-video/fai-config"' >> /etc/fai/fai.conf # crude hack - last entry has precedence :)
@@ -55,11 +23,10 @@
fai -N softupdate
# display errors
-echo "cat /var/log/fai/current/error.log:"
-cat /var/log/fai/current/error.log
+echo "cat /var/log/fai/last/error.log:"
+cat /var/log/fai/last/error.log
# done
echo
echo "'fai -N softupdate' done."
echo
-
Added: fai-config/doc/src/penultimate_setup.sh
===================================================================
--- fai-config/doc/src/penultimate_setup.sh (rev 0)
+++ fai-config/doc/src/penultimate_setup.sh 2010-07-22 17:06:09 UTC (rev 557)
@@ -0,0 +1,39 @@
+#! /bin/bash
+
+#
+# Copyright 2006-2010 Holger Levsen
+# released under the GPLv=2
+#
+
+# country=UNIX
+LANG=C
+
+# distribution we are using
+DISTRO=squeeze
+
+# hardcode mirror to use
+MIRROR=mirror.cc.columbia.edu
+
+# which arch are we running on? (needed for sources.list)
+ARCH=`dpkg --print-architecture`
+
+# overwrite existing sources.lists, provide sensible defaults
+echo "#deb http://$MIRROR/debian/ $DISTRO main contrib non-free
+#deb http://security.debian.org/ $DISTRO/updates main contrib non-free
+
+deb http://snapshot.debian.org/archive/debian/20100704T132725Z/ squeeze main
+
+deb http://db.debconf.org/dc-admin/archive/ $DISTRO/$ARCH/
+deb http://db.debconf.org/dc-admin/archive/ $DISTRO/all/
+" > /etc/apt/sources.list
+
+# begin upgrade to squeeze snapshot
+export DEBCONF_FRONTEND=noninteractive
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get -y install apt
+apt-get -y install linux-image-2.6.32-5-686-bigmem
+
+# grab next stage
+wget http://svn.debian.org/viewsvn/debconf-video/fai-config/doc/src/final_setup.sh
+mv final_settup.sh /root
Modified: fai-config/doc/src/preseed.cfg
===================================================================
--- fai-config/doc/src/preseed.cfg 2010-07-22 16:48:51 UTC (rev 556)
+++ fai-config/doc/src/preseed.cfg 2010-07-22 17:06:09 UTC (rev 557)
@@ -285,9 +285,9 @@
# directly, or use the apt-install and in-target commands to easily install
# packages and run commands in the target system.
#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
-d-i preseed/late_command string cp /hd-media/final_setup.sh /target/root/ ; in-target sh /root/final_setup.sh
+d-i preseed/late_command string cp /hd-media/penultimate_setup.sh /target/root/ ; in-target sh /root/penultimate_setup.sh
#### For pxeboot installs, comment out the line above and uncomment the
#### line below.
-#d-i preseed/late_command string in-target wget http://svn.debian.org/viewsvn/debconf-video/fai-config/doc/src/final_setup.sh ; in-target sh /final_setup.sh ; in-target mv /final_setup.sh /root
+#d-i preseed/late_command string in-target wget http://svn.debian.org/viewsvn/debconf-video/fai-config/doc/src/penultimate_setup.sh ; in-target sh /penultimate_setup.sh
More information about the Debconf-video-commits
mailing list