Because, espcially, of the ppp change in base, we urgently need this
new debootstrap. With Ethan's patches, I've put together 0.1.15.5.
It fixes many bugs but I need testing on it.
I build an i386 version, and source is at
<URL:http://people.debian.org/~aph/>.
On replies and reports, please CC me directly.
I also attach the diff from the .4 version.
debootstrap (0.1.15.5) unstable; urgency=high
.
* From Ethan Benson:
* pipe yes output into dpkg runs inside install_debs() this way on_exit
works in --boot-floppies mode. (Closes: #112842, #115481)
* Add libpcap0 to base, ppp depends on it now. (Closes: #114056)
.
* From Adam Di Carlo:
* Potato installation on non-i386 was broken, need libc6
(closes: #112778); however, there are other ways the Potato base
install doesn't represent quite what Potato boot-floppies would
consider base
* apply patch from Tommi Virtanen which improves the 'smallyes'
function; apparently this fixes a console-tools postinst loop,
although I haven't seen that (closes: #115581)
* get rid of some line continuators in potato and woody scripts, they
were obscuring some problems
--
...Adam Di Carlo..<[EMAIL PROTECTED]>...<URL:http://www.onshored.com/>
diff -Nur debootstrap-0.1.15.4/debian/changelog
debootstrap-0.1.15.5/debian/changelog
--- debootstrap-0.1.15.4/debian/changelog Sun Sep 23 16:11:04 2001
+++ debootstrap-0.1.15.5/debian/changelog Mon Oct 15 01:59:55 2001
@@ -1,3 +1,23 @@
+debootstrap (0.1.15.5) unstable; urgency=high
+
+ * From Ethan Benson:
+ * pipe yes output into dpkg runs inside install_debs() this way on_exit
+ works in --boot-floppies mode. (Closes: #112842, #115481)
+ * Add libpcap0 to base, ppp depends on it now. (Closes: #114056)
+
+ * From Adam Di Carlo:
+ * Potato installation on non-i386 was broken, need libc6
+ (closes: #112778); however, there are other ways the Potato base
+ install doesn't represent quite what Potato boot-floppies would
+ consider base
+ * apply patch from Tommi Virtanen which improves the 'smallyes'
+ function; apparently this fixes a console-tools postinst loop,
+ although I haven't seen that (closes: #115581)
+ * get rid of some line continuators in potato and woody scripts, they
+ were obscuring some problems
+
+ -- Adam Di Carlo <[EMAIL PROTECTED]> Mon, 15 Oct 2001 01:56:16 -0400
+
debootstrap (0.1.15.4) unstable; urgency=high
* more fixed for the benefits of boot-floppies
diff -Nur debootstrap-0.1.15.4/debootstrap debootstrap-0.1.15.5/debootstrap
--- debootstrap-0.1.15.4/debootstrap Sat Sep 22 12:29:12 2001
+++ debootstrap-0.1.15.5/debootstrap Mon Oct 15 01:19:15 2001
@@ -151,13 +151,8 @@
exit 0
fi
-if [ "$USE_BOOTFLOPPIES_INTERACTION" ]; then
- smallyes '' | install_debs
-else
- install_debs
-fi
+install_debs
if [ -e "$TARGET/etc/apt/sources.list" ]; then
rm -f "$TARGET/etc/apt/sources.list"
fi
-
diff -Nur debootstrap-0.1.15.4/functions debootstrap-0.1.15.5/functions
--- debootstrap-0.1.15.4/functions Sat Sep 22 12:29:12 2001
+++ debootstrap-0.1.15.5/functions Mon Oct 15 02:35:31 2001
@@ -2,8 +2,14 @@
############################################################### smallutils
smallyes() {
- YES="${1:-y}"
- while true ; do echo "$YES" ; done
+ if [ "$#" = "0" ]; then
+ YES=y
+ else
+ YES="$*"
+ fi
+ while true ; do
+ echo "$YES"
+ done
}
############################################################### interaction
diff -Nur debootstrap-0.1.15.4/potato debootstrap-0.1.15.5/potato
--- debootstrap-0.1.15.4/potato Sat Sep 22 12:29:12 2001
+++ debootstrap-0.1.15.5/potato Mon Oct 15 01:55:28 2001
@@ -3,15 +3,27 @@
download_style apt var-state
work_out_debs () {
- required="base-files base-passwd bash bsdutils debconf-tiny debianutils
diff dpkg e2fsprogs fileutils findutils grep gzip hostname ldso libdb2
libgdbmg1 libncurses5 libnewt0 libpam-modules libpam-runtime libpam0g libpopt0
libreadline4 libstdc++2.10 login makedev mawk modutils mount ncurses-base
ncurses-bin passwd perl-5.005-base perl-base procps sed shellutils slang1
sysklogd sysvinit tar textutils update util-linux whiptail"
+ required="base-files base-passwd bash bsdutils debconf-tiny debianutils
diff dpkg e2fsprogs fileutils findutils grep gzip hostname ldso libc6 libdb2
libgdbmg1 libncurses5 libnewt0 libpam-modules libpam-runtime libpam0g libpopt0
libreadline4 libstdc++2.10 login makedev mawk modutils mount ncurses-base
ncurses-bin passwd perl-5.005-base perl-base procps sed shellutils slang1
sysklogd sysvinit tar textutils update util-linux whiptail"
base="adduser ae apt base-config elvis-tiny fbset fdutils gettext-base
console-data console-tools console-tools-libs libdb2 libwrap0 locales modconf
netbase ftp ppp pppconfig pump tasksel tcpd textutils telnet xviddetect"
+ without_package () {
+ echo "$2" | tr ' ' '\n' | grep -v "^$1$" | tr '\n' ' '
+ }
+
+ LIBC6=libc6
+
case $ARCH in
+ "alpha")
+ required="$(without_package "libc6" "$required") libc6.1"
+ LIBC6="libc6.1"
+ ;;
"i386")
- required="$required libc6"
base="$base fdflush isapnptools lilo mbr pciutils pcmcia-cs psmisc
setserial syslinux"
;;
+ *)
+ # other arches may have special needs not yet represented here
+ # oh well, Potato is old
esac
all_debs="$required $base"
@@ -71,7 +83,7 @@
x_core_install dpkg
ln -s /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
- x_core_install libc6
+ x_core_install $LIBC6
smallyes '' | x_core_install perl-5.005-base
x_core_install mawk
@@ -89,8 +101,7 @@
in_target dpkg --configure --pending --force-configure-any --force-depends
- smallyes '' | repeat 5 in_target dpkg --force-auto-select
--force-overwrite \
- --skip-same-version --install $(debfor $base)
+ smallyes '' | repeat 5 in_target dpkg --force-auto-select
--force-overwrite --skip-same-version --install $(debfor $base)
mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
}
diff -Nur debootstrap-0.1.15.4/woody debootstrap-0.1.15.5/woody
--- debootstrap-0.1.15.4/woody Sun Sep 23 16:09:10 2001
+++ debootstrap-0.1.15.5/woody Mon Oct 15 01:55:40 2001
@@ -5,7 +5,7 @@
required="base-files base-passwd bash bsdutils debconf debianutils diff
dpkg e2fsprogs fileutils findutils grep gzip hostname libcap1 libc6 libdb2
libdb3 libgdbmg1 libncurses5 libnewt0 libpam-modules libpam-runtime libpam0g
libperl5.6 libpopt0 libreadline4 libstdc++2.10-glibc2.2 login makedev mawk
modutils mount ncurses-base ncurses-bin passwd perl-base procps sed shellutils
slang1 sysvinit tar textutils util-linux whiptail"
- 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 ipchains 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
sysklogd tasksel tcpd telnet"
+ 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 ipchains 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
libpcap0 sysklogd tasksel tcpd telnet"
without_package () {
echo "$2" | tr ' ' '\n' | grep -v "^$1$" | tr '\n' ' '
@@ -109,7 +109,11 @@
}
x_core_install () {
- in_target dpkg --force-depends --install $(debfor "$@")
+ if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
+ smallyes '' | in_target dpkg --force-depends --install $(debfor
"$@")
+ else
+ in_target dpkg --force-depends --install $(debfor "$@")
+ fi
}
x_feign_install dpkg
@@ -131,10 +135,11 @@
x_core_install mawk
x_core_install debconf
- repeat 5 in_target dpkg --force-depends --unpack $(debfor $required)
- # for p in $required; do
- # repeat 20 in_target dpkg --force-depends --unpack $(debfor $p)
- # done
+ if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
+ smallyes '' | repeat 5 in_target dpkg --force-depends --unpack $(debfor
$required)
+ else
+ repeat 5 in_target dpkg --force-depends --unpack $(debfor $required)
+ fi
mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
cp "$TARGET/bin/true" "$TARGET/sbin/start-stop-daemon"
@@ -142,7 +147,11 @@
setup_dselect_method apt
on_exit "in_target_nofail umount /dev/pts"
- in_target dpkg --configure --pending --force-configure-any --force-depends
+ if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
+ smallyes '' | in_target dpkg --configure --pending
--force-configure-any --force-depends
+ else
+ in_target dpkg --configure --pending --force-configure-any
--force-depends
+ fi
if [ ! -e "$TARGET/etc/exim/exim.conf" ]; then
mkdir -p "$TARGET/etc/exim"
@@ -151,8 +160,11 @@
info "Installing base packages"
- repeat 5 in_target dpkg --force-auto-select --force-overwrite \
- --force-confold --skip-same-version --install $(debfor $base)
+ if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
+ smallyes '' | repeat 5 in_target dpkg --force-auto-select
--force-overwrite --force-confold --skip-same-version --install $(debfor $base)
+ else
+ repeat 5 in_target dpkg --force-auto-select --force-overwrite
--force-confold --skip-same-version --install $(debfor $base)
+ fi
mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
