retitle 239390 Should not install ipchains and pppoe
severity 325251 normal
merge 325251 239390
tags 239390 + patch
thanks
The three bugs are all about the same two issues (ipchains and pppoe),
and this patch (based on patch from Sven Luther), solves all of them.
The first part make sure only m68k gets ipchains installed, and the
second removes pppoe.
diff -ur debootstrap-0.3.1.7/etch debootstrap-0.3.1.8/etch
--- debootstrap-0.3.1.7/etch Thu Sep 15 16:48:46 2005
+++ debootstrap-0.3.1.8/etch Tue Oct 18 17:57:49 2005
@@ -18,9 +18,7 @@
required="base-files base-passwd bash bsdutils coreutils libacl1 libattr1
debianutils diff dpkg dselect libblkid1 e2fsprogs e2fslibs libcomerr2 libss2
libuuid1 findutils grep gzip hostname libcap1 libdb1-compat libdb3 libncurses5
libnewt0.51 libpam-modules libpam-runtime libpam0g login makedev mawk mount
ncurses-base ncurses-bin passwd perl-base procps sed slang1a-utf8 initscripts
sysvinit sysv-rc tar util-linux libgcc1 gcc-3.3-base libstdc++5 zlib1g $LIBC6"
if doing_variant - || doing_variant fakechroot; then
- if [ "$ARCH" = "alpha" -o "$ARCH" = "m68k" ]; then
- IPFWTOOL="ipchains"
- elif [ "$ARCH" = "powerpc" -o "$ARCH" = sparc ]; then
+ if [ "$ARCH" = "m68k" ]; then
IPFWTOOL="ipchains iptables"
else
IPFWTOOL=iptables
@@ -28,7 +26,7 @@
required="$required debconf debconf-i18n liblocale-gettext-perl
libtext-wrapi18n-perl libtext-charwidth-perl libtext-iconv-perl"
- base="adduser apt apt-utils libdb4.2 base-config aptitude
libsigc++-1.2-5c102 bsdmainutils console-common console-tools libconsole
console-data cpio cron dhcp-client ed libgnutls11 libgcrypt11 libgpg-error0
libncursesw5 libopencdk8 libtasn1-2 fdutils gettext-base groff-base ifupdown
info klogd libssl0.9.7 liblzo1 liblockfile1 libpcre3 libwrap0 logrotate man-db
libgdbm3 manpages nano net-tools netbase netkit-inetd iputils-ping nvi ppp
pppconfig pppoe pppoeconf libpcap0.7 sysklogd tasksel libtextwrap1 tcpd telnet
wget libpopt0 modutils whiptail $IPFWTOOL"
+ base="adduser apt apt-utils libdb4.2 base-config aptitude
libsigc++-1.2-5c102 bsdmainutils console-common console-tools libconsole
console-data cpio cron dhcp-client ed libgnutls11 libgcrypt11 libgpg-error0
libncursesw5 libopencdk8 libtasn1-2 fdutils gettext-base groff-base ifupdown
info klogd libssl0.9.7 liblzo1 liblockfile1 libpcre3 libwrap0 logrotate man-db
libgdbm3 manpages nano net-tools netbase netkit-inetd iputils-ping nvi ppp
pppconfig pppoeconf libpcap0.7 sysklogd tasksel libtextwrap1 tcpd telnet wget
libpopt0 modutils whiptail $IPFWTOOL"
# libthings
drop i386 required "libperl5.8"
@@ -58,9 +59,9 @@
# base-config depends on console-tools and console-data
# so we can't exclude them although they are useless on s390
add s390 base "s390-tools telnetd devfsd"
- drop s390 base "console-tools-libs fdutils ppp pppconfig pppoe pppoeconf"
+ drop s390 base "console-tools-libs fdutils ppp pppconfig pppoeconf"
add s390x base "s390-tools telnetd devfsd"
- drop s390x base "console-tools-libs fdutils ppp pppconfig pppoe
pppoeconf"
+ drop s390x base "console-tools-libs fdutils ppp pppconfig pppoeconf"
elif doing_variant buildd; then
base="apt binutils cpio cpp cpp-3.3 dpkg-dev g++ g++-3.3 gcc gcc-3.3
${LIBC6}-dev libdb4.2 libgdbm3 libstdc++5-3.3-dev linux-kernel-headers make
patch perl perl-modules"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
