--- ../temp/netstation-8364-build/Makefile      2004-10-14 01:42:33.000000000 +0200
+++ Makefile    2005-01-04 09:49:24.000000000 +0100
@@ -1,6 +1,6 @@
 
 # SYSTYPE might be "Router" or "XTerm"
-SYSTYPE=XTerm
+SYSTYPE=Router
 
 INITRD=initrd
 INITRDMOUNT=initrd.mount
@@ -18,8 +18,8 @@
 RELEASE=sarge
 MIRROR=http://source.rfc822.org/debian
 
-KIMAGE=kernel-image-2.6.8.1-netstation_1.3_i386.deb
-KVERSION=2.6.8.1-netstation
+KIMAGE=kernel-image-2.6.9-netstation_4.2_i386.deb
+KVERSION=2.6.9-netstation
 KTYPE=2.6
 
 ADDPKG=ntp-simple hotplug debconf-english
@@ -27,10 +27,13 @@
 RMPKG=pcmcia-cs nvi cron at anacron logrotate exim mailx aptitude nano exim4 \
        exim4-daemon-light exim4-base exim4-config tasksel groff-base \
        man-db manpages fdutils ipchains info wget whiptail setserial \
-       libgnutls10 liblzo1 libgdbm3 libpcap0.7 libtextwrap1 \
-       libgpg-error0 libopencdk8 libgcrypt7 telnet \
+       libgnutls10 libgnutls11 liblzo1 libgdbm3 libtextwrap1 \
+       libgpg-error0 libopencdk8 libgcrypt7 libgcrypt11 telnet \
        liblocale-gettext-perl libtext-iconv-perl libtext-wrapi18n-perl \
-       libtext-charwidth-perl
+       libtext-charwidth-perl pppoeconf pppconfig
+
+# -libpcap0.7 => ppp pppoe :-(
+# +libgcrypt11
 
 STRIPMETHODS=strip-apt strip-dpkg2usr strip-apt2usr strip-locale \
        strip-man strip-doc strip-info strip-dev
@@ -48,7 +51,9 @@
 
 ifeq ($(SYSTYPE), Router)
 ADDPKG+=ssh iproute whois dhcp3-server ntp-simple ntpdate bind9 diff \
-       patch stunnel nmap iptraf vim iptables
+       patch stunnel nmap iptraf vim iptables less screen
+MAKEDEVROOTFS+=ttyS0
+MAKEDEVINITRD+=ttyS0
 endif
 
 ifeq ($(SYSTYPE), XTerm)
@@ -65,7 +70,7 @@
 rootfs: stamps rootfs-debootstrap rootfs-installpkg rootfs-removepkg \
        rootfs-keymap rootfs-createfstab rootfs-disablefsck \
        rootfs-installmodules rootfs-earlyboot $(ROOTFSEXTRA) \
-       rootfs-strip rootfs-create
+       rootfs-strip rootfs-enable-serialconsole rootfs-create
 
 clean:
        if [ -d $(ROOTFS)/proc/1 ]; then \
@@ -305,6 +310,15 @@
 
        touch stamps/rootfs-installpkg
 
+rootfs-enable-serialconsole: stamps/rootfs-enable-serialconsole
+stamps/rootfs-enable-serialconsole:
+       sed -e 's@^#\(T0:23:respawn:/sbin/getty -L ttyS0.*\)@\1@' \
+               $(ROOTFS)/etc/inittab > \
+               $(ROOTFS)/etc/inittab.tmp
+       mv $(ROOTFS)/etc/inittab.tmp \
+               $(ROOTFS)/etc/inittab
+       touch stamps/rootfs-enable-serialconsole
+
 rootfs-create: $(ROOTFS).$(ROOTFSTYPE)
 
 $(ROOTFS).squashfs: