sarge support?

[Niall Young]

On Thu, 31 Jul 2003, Niall Young wrote:

> On Thu, 03 Apr 2003, Thomas Lange wrote:
>
> > Since FAI is not tested with sarge (even it's in this repository) you
> > should use it for woody when a stability is a major goal.
>
> Is anyone else working on sarge yet?  I've just started tinkering,
> trying to get fai-bootcd 0.3 working with it.

It seems to work ok, just needed minor changes to make-fai-nfsroot
and debootstrap 0.1.17.30's /usr/lib/debootstrap/scripts/sarge (which
is most probably fixed in sid's 0.2.2-0.1).  Patches are below.

I was able to build an fai-bootcd, no idea if a regular floppy/nfs install
needs further patches or if I've missed something, seemed to work fine.

Niall Young                                    Chime Communications Pty Ltd
niall at chime.net.au                            Level 6, 263 Adelaide Terrace
Ph: (+61) 08 9213 1330 / 0408 192 797         Perth, Western Australia 6000

    "Happy Quarter-of-a-century to my big sis Kylie, who turns ?? today"
                                        -- Lauren Metropolis, May 2003


--- /usr/sbin/make-fai-nfsroot.orig	2003-08-05 02:46:37.000000000 +0800
+++ /usr/sbin/make-fai-nfsroot	2003-08-05 02:47:06.000000000 +0800
@@ -31,7 +31,7 @@
 # defined with $NFSROOT_PACKAGES in fai.conf
 packages="dhcp3-client ssh portmap file rdate cfengine cvs bootpc rsync wget
 rsh-client less dump reiserfsprogs dpkg-dev ext2resize strace hdparm parted
-dnsutils ntpdate dosfstools sysutils dialog discover mdetect si libnet-perl"
+dnsutils ntpdate dosfstools sysutils dialog discover mdetect libnet-perl"

 PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin

@@ -293,6 +293,7 @@

     cp /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver
     $ROOTCMD apt-get update
+    $ROOTCMD apt-get -fyu install
     $ROOTCMD apt-get check
     rm -rf $NFSROOT/etc/apm
     mount -t proc /proc $NFSROOT/proc


--- /usr/lib/debootstrap/scripts/sarge	2003-08-04 06:24:44.000000000 +0800
+++ /usr/lib/debootstrap/scripts/sarge.fixed	2003-08-04 06:17:03.000000000 +0800
@@ -5,7 +5,7 @@

     required="base-files base-passwd bash bsdutils coreutils debconf debianutils diff dpkg dselect libblkid1 e2fsprogs findutils grep gzip hostname libcap1 libc6 libdb1-compat libdb2 libdb3 libgdbmg1 libncurses5 libnewt0.51 libpam-modules libpam-runtime libpam0g libperl5.8 libpopt0 libreadline4 libstdc++2.10-glibc2.2 login makedev mawk modutils mount ncurses-base ncurses-bin passwd perl-base procps sed slang1 slang1a-utf8 initscripts sysvinit sysv-rc tar util-linux whiptail libgcc1 gcc-3.2-base gcc-3.3-base libstdc++5"

-    base="adduser apt apt-utils at base-config bsdmainutils console-common console-tools console-tools-libs console-data cpio cron dhcp-client ed exim fdutils gettext-base groff-base ifupdown info klogd libident libldap2 liblockfile1 libpcre3 libsasl7 libwrap0 logrotate mailx man-db manpages modconf nano net-tools netbase netkit-inetd netkit-ping nvi ppp pppconfig pppoe pppoeconf libpcap0.7 sysklogd tasksel tcpd telnet libtext-iconv-perl $additional"
+    base="adduser apt apt-utils at base-config bsdmainutils console-common console-tools libconsole console-data cpio cron dhcp-client ed exim fdutils gettext-base groff-base ifupdown info klogd libident libldap2 liblockfile1 libpcre3 libsasl7 libwrap0 logrotate mailx man-db manpages modconf nano net-tools netbase netkit-inetd netkit-ping nvi ppp pppconfig pppoe pppoeconf libpcap0.7 sysklogd tasksel tcpd telnet libtext-iconv-perl $additional"

     without_package () {
         echo "$2" | tr ' ' '\n' | grep -v "^$1$" | tr '\n' ' '