PATCH: hppa support in boot-floppies
Hi,
This patch adds to the partial hppa support already in b-f. The
documentation certainly needs more work, but I do produce working
images with these patches.
Cheers,
Richard
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/Makefile boot-floppies-deb-head-work/Makefile
--- boot-floppies-debian-cvs/Makefile Mon Jun 11 09:51:45 2001
+++ boot-floppies-deb-head-work/Makefile Tue Jun 12 13:53:45 2001
@@ -154,7 +154,13 @@
ifeq ($(architecture), mipsel)
$(MAKE) root.bin root.tar.gz
else
+ifeq ($(architecture), hppa)
+ $(MAKE) resc288032serial.bin drivers32serial.tgz
+ $(MAKE) resc288032sti.bin drivers32sti.tgz
+ $(MAKE) resc288064serial.bin drivers64serial.tgz
+else
echo unsupported architecture: $(architecture); false
+endif
endif
endif
endif
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/defaults.ent boot-floppies-deb-head-work/documentation/defaults.ent
--- boot-floppies-debian-cvs/documentation/defaults.ent Mon Jun 4 15:21:04 2001
+++ boot-floppies-deb-head-work/documentation/defaults.ent Tue Jun 12 16:08:39 2001
@@ -37,6 +37,7 @@
<!entity % mips "IGNORE"><!-- ARCHMAGIC do not remove -->
<!entity % mipsel "IGNORE"><!-- ARCHMAGIC do not remove -->
<!entity % powerpc "IGNORE"><!-- ARCHMAGIC do not remove -->
+<!entity % hppa "IGNORE"><!-- ARCHMAGIC do not remove -->
<!entity % sparc "IGNORE"><!-- ARCHMAGIC do not remove -->
<!-- proper nouns for architectures -->
@@ -48,6 +49,7 @@
<![ %mips [ <!entity arch-title "Mips" > ]]>
<![ %mipsel [ <!entity arch-title "Mipsel" > ]]>
<![ %powerpc [ <!entity arch-title "PowerPC" > ]]>
+<![ %hppa [ <!entity arch-title "PA/RISC" > ]]>
<![ %sparc [ <!entity arch-title "SPARC" > ]]>
<!-- languages list; this is used for architecture-specific
@@ -85,6 +87,8 @@
<!entity % not-mipsel "INCLUDE">
<![ %powerpc [ <!entity % not-powerpc "IGNORE"> ]]>
<!entity % not-powerpc "INCLUDE">
+<![ %hppa [ <!entity % not-hppa "IGNORE"> ]]>
+ <!entity % not-hppa "INCLUDE">
<![ %sparc [ <!entity % not-sparc "IGNORE"> ]]>
<!entity % not-sparc "INCLUDE">
@@ -120,6 +124,7 @@
<![ %mips [ <!entity num-of-distrib-pkgs "2900"> ]]>
<![ %mipsel [ <!entity num-of-distrib-pkgs "2900"> ]]>
<![ %powerpc [ <!entity num-of-distrib-pkgs "3600"> ]]>
+<![ %hppa [ <!entity num-of-distrib-pkgs "3900"> ]]>
<![ %sparc [ <!entity num-of-distrib-pkgs "3700"> ]]>
<!-- whether this architecture supports boot from CD -->
@@ -245,6 +250,7 @@
<!-- mips images 2.3.0-2001-04-15 -->
<!-- mipsel images 2.3.0-2001-06-04 -->
<!-- powerpc images 2.2.19-2000-12-03 -->
+<!-- hppa images 2.4.0-2001-06-12 -->
<!-- sparc images 2.2.20-2000-12-03 -->
<![ %alpha [
@@ -528,6 +534,15 @@
'>
]]>
+<!-- hppa rescue images 2.4.0-2001-06-12 -->
+<![ %hppa [
+ <!entity rescue-images '
+ <url id="&downloadable-file;32serial/images-1.44/rescue.bin">
+ <tag><url id="&downloadable-file;32sti/images-1.44/rescue.bin">
+ <tag><url id="&downloadable-file;64serial/images-1.44/rescue.bin">
+ '>
+]]>
+
<!-- sparc rescue images 2.2.20-2000-12-03 -->
<![ %sparc [
<!entity rescue-images '
@@ -606,6 +621,15 @@
'>
]]>
+<!-- hppa driver tarballs 2.4.0-2001-06-12 -->
+<![ %hppa [
+ <!entity driver-disk-tarball '
+ <url id="&downloadable-file;32serial/drivers.tgz">
+ <tag><url id="&downloadable-file;32sti/drivers.tgz">
+ <tag><url id="&downloadable-file;64serial/drivers.tgz">
+ '>
+]]>
+
<!-- sparc driver tarballs 2.2.20-2000-12-03 -->
<![ %sparc [
<!entity driver-disk-tarball '
@@ -706,6 +730,18 @@
'>
]]>
+<!-- hppa driver images 2.4.0-2001-06-12 -->
+<![ %hppa [
+ <!entity driver-images '
+ <url id="&downloadable-file;32serial/images-1.44/driver-1.bin">
+ <tag><url id="&downloadable-file;32serial/images-1.44/driver-2.bin">
+ <tag><url id="&downloadable-file;32sti/images-1.44/driver-1.bin">
+ <tag><url id="&downloadable-file;32sti/images-1.44/driver-2.bin">
+ <tag><url id="&downloadable-file;64serial/images-1.44/driver-1.bin">
+ <tag><url id="&downloadable-file;64serial/images-1.44/driver-2.bin">
+ '>
+]]>
+
<!-- sparc driver images 2.2.20-2000-12-03 -->
<![ %sparc [
<!entity driver-images '
@@ -845,6 +881,15 @@
<![ %powerpc [
<!entity tftp-images '
<url id="&downloadable-file;prep/images-1.44/boot.bin">
+ '>
+]]>
+
+<!-- hppa tftp files images 2.4.0-2001-06-12 -->
+<![ %hppa [
+ <!entity tftp-images '
+ <url id="&downloadable-file;32serial/images-1.44/boot.bin">
+ <tag><url id="&downloadable-file;32sti/images-1.44/boot.bin">
+ <tag><url id="&downloadable-file;64serial/images-1.44/boot.bin">
'>
]]>
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/en/dbootstrap.sgml boot-floppies-deb-head-work/documentation/en/dbootstrap.sgml
--- boot-floppies-debian-cvs/documentation/en/dbootstrap.sgml Tue Jun 12 12:20:49 2001
+++ boot-floppies-deb-head-work/documentation/en/dbootstrap.sgml Tue Jun 12 13:53:45 2001
@@ -821,6 +821,15 @@
read the yaboot.conf man page for more information.
]]>
+<![ %hppa [
+The bootloader on PA/RISC is ``palo''. <prgn>PALO</prgn> is similar in
+configuration and usage to <prgn>LILO</prgn>, with a few exceptions. First
+of all, <prgn>PALO</prgn> allows you to boot any kernel imae on your boot
+partition. This is because <prgn>PALO</prgn> can actually read Linux
+partitions.
+hppa FIXME -- need more info
+]]>
+
<![ %arm [ <![ %FIXME [ <p><em>FIXME: about the boot manager?</em> ]]> ]]>
<![ %supports-nfsroot [
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/en/hardware.sgml boot-floppies-deb-head-work/documentation/en/hardware.sgml
--- boot-floppies-debian-cvs/documentation/en/hardware.sgml Thu Aug 31 13:58:52 2000
+++ boot-floppies-deb-head-work/documentation/en/hardware.sgml Tue Jun 12 16:14:11 2001
@@ -30,19 +30,32 @@
<sect1>Supported Architectures
<p>
-Debian &release; supports six architectures: Intel x86-based
+Debian &release; supports seven architectures: Intel x86-based
architectures; Motorola 680x0 machines such as Atari, Amiga, and
Macintoshes; DEC Alpha machines; Sun SPARC machines; ARM and StrongARM
-machines; and some IBM/Motorola PowerPC machines, including CHRP,
-PowerMac and PReP machines. These are referred to as <em>i386</em>,
-<em>m68k</em>, <em>alpha</em>, <em>sparc</em>, <em>arm</em>, and
-<em>powerpc</em>, respectively.
+machines; some IBM/Motorola PowerPC machines, including CHRP,
+PowerMac and PReP machines and some HP PA/RISC machines. These are
+referred to as <em>i386</em>, <em>m68k</em>, <em>alpha</em>,
+<em>sparc</em>, <em>arm</em>, <em>powerpc</em>, and <em>hppa</em>
+respectively.
<p>
This document covers installation for the <em>&architecture;</em>
architecture. If you look for information on other architectures take
a look at the <url id="http://&www-debian-org;/ports/"; name="Debian-Ports">
pages.
+<![ %hppa [
+ <p>
+This is the first official release of &debian; for the PA/RISC
+archictecture. We feel that it has proven itself sufficiently to be
+released. However, because it has not had the exposure (and hence
+testing by users) that some other architectures have had, you may
+encounter a few bugs. Use our <url id="&url-bts;" name="Bug Tracking
+System"> to report any problems; make sure to mention the fact that
+the bug is on the PA/RISC platform. It can be necessary to use the
+<url id="&url-list-subscribe;" name="debian-hppa mailing list"> as
+well. ]]>
+
<![ %powerpc [
<p>
This is the first official release of &debian; for the PowerPC
@@ -285,6 +298,16 @@
will have also a 64bit port (Power3) in the future.
]]>
+<![ %hppa [
+ <p>
+The are two major support <em>&architecture;</em> flavors:
+PA/RISC 1.1 and PA/RISC 2.0. The PA/RISC 1.1 architecture is targetted
+at 32-bit processors whereas the 2.0 archicteture is targeted to
+the 64-bit processors. Some systems are able to run either kernel.
+
+In both cases, the userland is 32-bit. There is the possibility of
+a 64-bit userland in the future.
+]]>
<![ %supports-smp [
<sect1>Multiple Processors
@@ -328,6 +351,8 @@
<![ %powerpc [ For CHRP floppy support is currently broken. ]]>
+<![ %hppa [ PA/RISC does not support booting off a floppy. ]]>
+
<p>
CD-ROM based installation is also supported for some architectures.
On machines which support bootable CD-ROMs, you should be able to do a
@@ -480,6 +505,13 @@
floppies on CHRP systems at all.
]]>
+<![ %hppa [
+ <p>
+Any storage system supported by the Linux kernel is also supported by
+the boot system. Note that the current Linux kernel does not support
+the floppy drive.
+]]>
+
<sect>Memory and Disk Space Requirements
<p>
@@ -607,6 +639,14 @@
also be supported by the boot disks. You may need to load your
network driver as a module.
]]>
+
+<![ %hppa [
+ <p>
+Any network interface card (NIC) supported by the Linux kernel should
+also be supported by the boot disks. You may need to load your
+network driver as a module.
+]]>
+
<sect>Purchasing Hardware Specifically for GNU/Linux
<p>
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/en/inst-methods.sgml boot-floppies-deb-head-work/documentation/en/inst-methods.sgml
--- boot-floppies-debian-cvs/documentation/en/inst-methods.sgml Thu May 31 02:11:02 2001
+++ boot-floppies-deb-head-work/documentation/en/inst-methods.sgml Tue Jun 12 13:53:45 2001
@@ -161,6 +161,8 @@
<![ %powerpc [ (for machines with a floppy drive) ]]>
+<![ %hppa [ (not supported on PA/RISC architecture) ]]>
+
<![ %supports-bootable-cd [ <item> a bootable CD-ROM ]]>
<!-- FIXME: Is there a better way to "or" the next 3 items? -->
@@ -575,6 +577,9 @@
<![ %powerpc [ Currently, PReP and New World PowerMac systems support
netbooting. ]]>
+<![ %hppa [ Older systems such as the 715 might require the use of
+an RBOOT server instead of a BOOTP server. ]]>
+
This installation method is described in <ref id="install-tftp">.
]]>
@@ -631,6 +636,11 @@
do not support the compressed images found on the disks, so also are
not supported. ]]>
+<![ %hppa [
+ <p>
+The PA/RISC architecture does not support floppy booting.
+]]>
+
<p>
To boot from floppies, simply download the &RESCUE-FLOPPY; image and
the &DRIVER-FLOPPY; image.
@@ -675,6 +685,9 @@
<![ %m68k [ Installing the base system from floppies is not supported
on Amiga and Macintosh systems. ]]>
+
+<![ %hppa [ Installing the base system from floppies is not supported
+on the PA/RISC architecture. ]]>
<p>
Complete these steps:
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/en/partitioning.sgml boot-floppies-deb-head-work/documentation/en/partitioning.sgml
--- boot-floppies-debian-cvs/documentation/en/partitioning.sgml Tue Jun 12 12:20:50 2001
+++ boot-floppies-deb-head-work/documentation/en/partitioning.sgml Tue Jun 12 13:53:45 2001
@@ -21,6 +21,7 @@
<![ %i386 [ Luckily, there is an alternative for some users; see <ref
id="Lossless">. ]]>
+<![ %hppa [ FIXME write about HP-UX disks? ]]>
<p>
At a bare minimum, GNU/Linux needs one partition for itself. You can
have a single partition containing the entire operating system,
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/en/tech-info.sgml boot-floppies-deb-head-work/documentation/en/tech-info.sgml
--- boot-floppies-debian-cvs/documentation/en/tech-info.sgml Tue Jun 12 12:20:50 2001
+++ boot-floppies-deb-head-work/documentation/en/tech-info.sgml Tue Jun 12 13:53:45 2001
@@ -62,6 +62,7 @@
<![ %sparc [ &FIXME; ]]>
<![ %powerpc [ &FIXME; ]]>
<![ %arm [ &FIXME; ]]>
+<![ %hppa [ &FIXME; ]]>
<p>
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/install.sgml boot-floppies-deb-head-work/documentation/install.sgml
--- boot-floppies-debian-cvs/documentation/install.sgml Fri Apr 6 04:18:11 2001
+++ boot-floppies-deb-head-work/documentation/install.sgml Tue Jun 12 13:53:45 2001
@@ -68,9 +68,11 @@
information on how to make the most of your new Debian system.
<![ %not-powerpc [
<![ %not-arm [
+<![ %not-hppa [
The procedures in this document are <em>not</em> to be used for
users upgrading existing systems; if you are upgrading, see the
<url id="&url-release-notes;" name="Release Notes for Debian &release;">.
+]]>
]]>
]]>
</abstract>
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/documentation/release-notes.sgml boot-floppies-deb-head-work/documentation/release-notes.sgml
--- boot-floppies-debian-cvs/documentation/release-notes.sgml Fri Mar 23 01:59:05 2001
+++ boot-floppies-deb-head-work/documentation/release-notes.sgml Tue Jun 12 13:53:45 2001
@@ -45,8 +45,8 @@
<p>Debian's previous release, &debian; 2.1, included four officially
supported architectures: Intel x86 (``i386''), Motorola 680x0
(``m68k''), Alpha (``alpha''), and SPARC (``sparc''). In this new
- release, we have introduced two additional architectures: PowerPC
- (``powerpc'') and ARM (``arm'').
+ release, we have introduced three additional architectures: PowerPC
+ (``powerpc''), ARM (``arm''), and PA/RISC (``hppa'').
<![ %not-i386 [<!-- i386 doesn't have a port page -->
You can read more about port status, and port-specific information
@@ -78,6 +78,17 @@
be a bit rough.
]]>
+<![ %hppa [
+ <p>This is the first official release of &debian; for the &arch-title;
+ architecture. We feel that it has proven itself sufficiently to be
+ released. However, because it has not had the exposure (and hence testing
+ by users) that our other releases on other architectures have had, you may
+ encounter a few bugs. Please use our <url id="&url-bts;" name="bug
+ tracking system"> to report any problems; make sure to mention the fact
+ that the bug is on the &architecture; platform.
+]]>
+
+
<p>&debian; &release; for the &arch-title; architecture ships with kernel
version &kernelversion;. The 2.2 kernel series are a new kernel generation
introducing several valuable changes both in the kernel and in other
@@ -246,6 +257,7 @@
<![ %not-powerpc [
<![ %not-arm [
+<![ %not-hppa [
<chapt id="upgrading">Upgrades from previous releases
@@ -1231,6 +1243,7 @@
sources.
<p>Enjoy your new &debian; &release; system! :-)
+]]>
]]>
]]>
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/kernel.sh boot-floppies-deb-head-work/kernel.sh
--- boot-floppies-debian-cvs/kernel.sh Sat Jun 2 17:05:58 2001
+++ boot-floppies-deb-head-work/kernel.sh Tue Jun 12 13:53:45 2001
@@ -104,6 +104,8 @@
if [ "$subarch" = netwinder ]; then
# pander to broken nettrom: use Image not zImage
cp $extractdir/boot/Image* linux$subarch
+ elif [ "$arch" = hppa ]; then
+ cp $extractdir/boot/vmlinux* linux$subarch
else
cp $extractdir/boot/vmlinuz* linux$subarch
fi
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/make/hppa.vars boot-floppies-deb-head-work/make/hppa.vars
--- boot-floppies-debian-cvs/make/hppa.vars Thu Jan 1 01:00:00 1970
+++ boot-floppies-deb-head-work/make/hppa.vars Tue Jun 12 13:53:45 2001
@@ -0,0 +1,19 @@
+# additional pkgs for this arch which must be installed, see 'checks'
+depends_checks :=
+
+# junk we need lying around to build boot-floppies which are not in packages,
+# see 'checks'
+tools_checks :=
+
+arch_rootdisk_deps :=
+
+# additional check rules to run, see 'checks'
+arch_addl_checks :=
+
+# size for root.bin
+#root_bin_size := 3700
+root_bin_size := 6000
+
+#Local variables:
+#mode: Makefile
+#End:
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/release.sh boot-floppies-deb-head-work/release.sh
--- boot-floppies-debian-cvs/release.sh Mon Jun 11 09:51:46 2001
+++ boot-floppies-deb-head-work/release.sh Tue Jun 12 16:15:57 2001
@@ -149,6 +149,9 @@
ia64)
do_arch_ia64 $otherargs
;;
+ hppa)
+ do_arch_hppa $otherargs
+ ;;
*)
echo "Unsupported arch $arch"
exit 1
@@ -929,6 +932,60 @@
{
echo "Nothing here yet!"
exit 1
+}
+
+do_arch_hppa()
+{
+ #--------------------------------------------------------
+ # hppa installation
+ #--------------------------------------------------------
+
+ # 32serial/root.bin
+ # 32serial/vmlinux
+ # 32serial/config.gz
+ # 32serial/sys_map.gz
+ # 32serial/drivers.tgz
+ # 32serial/images-1.44/rescue.bin
+ # 32serial/lifimage
+
+ for subarch in 32serial 32sti 64serial; do
+ mkdir -p $release/$subarch/images-1.44
+ mv $release/images-2.88/rescue$subarch.bin $release/$subarch/images-1.44/rescue.bin
+ zcat linux$subarch.gz > $release/$subarch/vmlinux
+ mv config$subarch.gz $release/$subarch/config.gz
+ mv sys_map$subarch.gz $release/$subarch/sys_map.gz
+ mv drivers$subarch.tgz $release/$subarch/drivers.tgz
+ mv root$subarch.bin $release/$subarch/root.bin
+ cd $release
+ if [ "$subarch" = "32sti" ]; then
+ palo -f /dev/null -b /boot/iplboot -k $subarch/vmlinux -r $subarch/root.bin \
+ -s $subarch/lifimage \
+ -c "0/vmlinux HOME=/ TERM=linux root=/dev/ram initrd=0/ramdisk console=tty0 sti=0 sti_font=VGA8x16"
+ else
+ palo -f /dev/null -b /boot/iplboot -k $subarch/vmlinux -r $subarch/root.bin \
+ -s $subarch/lifimage \
+ -c "0/vmlinux HOME=/ TERM=vt100 root=/dev/ram initrd=0/ramdisk console=ttyS0"
+ fi
+ cd $TOP
+ done
+ rm -rf $release/images-2.88 $release/images-1.44
+
+ # make md5sum before tarring up all the contents
+ (cd $release && md5sum `find . -type f | \
+ grep -v '\(md5sum.txt\|/doc/\|bf-\)'` > md5sum.txt)
+
+ ### make tarballs, and the script steps to undo them
+ ( cd $release
+ tar cz --remove-files -f bf-images${suffix}.tar.gz 32serial 32sti 64serial
+ echo "tar -xzf bf-images${suffix}.tar.gz ; rm -f bf-images${suffix}.tar.gz" >> \
+ $bfinstall
+ rm -rf root.bin root.tar.gz 32serial 32sti 64serial
+
+ tar cz --remove-files -f bf-misc${suffix}.tar.gz \
+ README.txt md5sum.txt
+ echo "tar -xzf bf-misc${suffix}.tar.gz ; rm -f bf-misc${suffix}.tar.gz" >> \
+ $bfinstall
+ )
}
# main
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/rootdisk.sh boot-floppies-deb-head-work/rootdisk.sh
--- boot-floppies-debian-cvs/rootdisk.sh Tue Jun 12 12:20:47 2001
+++ boot-floppies-deb-head-work/rootdisk.sh Tue Jun 12 13:53:45 2001
@@ -126,7 +126,7 @@
hppa)
export ldlib=ld.so.1
libcso=libc.so.6
- libcver=2.2.2
+ libcver=2.2.3
;;
ia64)
export ldlib=/lib/ld-linux-ia64.so.2
@@ -667,6 +667,9 @@
hppa)
nlfmt="cat -"
;;
+ hppa)
+ nlfmt="cat -"
+ ;;
i386)
nlfmt="recode $charset..ibmpc"
;;
@@ -819,6 +822,8 @@
include_module $mnt/lib/modules/net/8390.o || true
include_module $mnt/lib/modules/net/ne2k-pci.o || true
include_module $mnt/lib/modules/net/tulip.o || true
+elif [ "$arch" = hppa ]; then
+ include_module $mnt/lib/modules/block/loop.o || true
fi
if [ $ro_poss = 1 ]; then
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/scripts/rootdisk/EXTRACT_LIST_hppa boot-floppies-deb-head-work/scripts/rootdisk/EXTRACT_LIST_hppa
--- boot-floppies-debian-cvs/scripts/rootdisk/EXTRACT_LIST_hppa Thu Jan 1 01:00:00 1970
+++ boot-floppies-deb-head-work/scripts/rootdisk/EXTRACT_LIST_hppa Tue Jun 12 13:53:45 2001
@@ -0,0 +1,4 @@
+libc6
+net-tools
+util-linux
+eject
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/scripts/rootdisk/SMALL_BASE_LIST_hppa boot-floppies-deb-head-work/scripts/rootdisk/SMALL_BASE_LIST_hppa
--- boot-floppies-debian-cvs/scripts/rootdisk/SMALL_BASE_LIST_hppa Thu Jan 1 01:00:00 1970
+++ boot-floppies-deb-head-work/scripts/rootdisk/SMALL_BASE_LIST_hppa Tue Jun 12 13:53:45 2001
@@ -0,0 +1,2 @@
+sbin/cfdisk
+usr/bin/eject
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/utilities/dbootstrap/baseconfig.c boot-floppies-deb-head-work/utilities/dbootstrap/baseconfig.c
--- boot-floppies-debian-cvs/utilities/dbootstrap/baseconfig.c Mon Jun 11 09:52:06 2001
+++ boot-floppies-deb-head-work/utilities/dbootstrap/baseconfig.c Tue Jun 12 13:53:45 2001
@@ -413,6 +413,11 @@
update_console_info();
#endif
+#if #cpu (hppa)
+ if (serialConsole >= 0)
+ update_console_info();
+#endif
+
/* If on serial console, get rid of kbd files and setserial startup.
The kbd package will be purged during final configuration. */
if (serialConsole >= 0)
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/utilities/dbootstrap/bootconfig.c boot-floppies-deb-head-work/utilities/dbootstrap/bootconfig.c
--- boot-floppies-debian-cvs/utilities/dbootstrap/bootconfig.c Tue Jun 12 12:20:56 2001
+++ boot-floppies-deb-head-work/utilities/dbootstrap/bootconfig.c Tue Jun 12 13:53:45 2001
@@ -594,13 +594,13 @@
fprintf(filep,"--bootloader=/boot/iplboot\n");
if( Boot == Root )
- fprintf(filep,"--commandline=%s/boot/vmlinux-%s root=%s HOME=/ TERM=linux", boot_part, KVER, Root->name);
+ fprintf(filep,"--commandline=%s/boot/vmlinux-%s root=%s HOME=/", boot_part, KVER, Root->name);
else
- fprintf(filep,"--commandline=%s/vmlinux-%s root=%s HOME=/ TERM=linux", boot_part, KVER, Root->name);
+ fprintf(filep,"--commandline=%s/vmlinux-%s root=%s HOME=/", boot_part, KVER, Root->name);
if (serialConsole >= 0)
- fprintf(filep, " console=ttyS%d\n", serialConsole);
+ fprintf(filep, " TERM=vt100 console=ttyS%d\n", serialConsole);
else
- fprintf(filep, "\n");
+ fprintf(filep, " TERM=linux console=tty0 sti=0 sti_font=VGA8x16\n");
fprintf(filep,"--recoverykernel=/boot/vmlinux-%s\n", KVER);
fprintf(filep,"--init-partitioned=%s\n", boot_disk);
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/utilities/dbootstrap/dbootstrap.h boot-floppies-deb-head-work/utilities/dbootstrap/dbootstrap.h
--- boot-floppies-debian-cvs/utilities/dbootstrap/dbootstrap.h Mon Jun 11 09:52:07 2001
+++ boot-floppies-deb-head-work/utilities/dbootstrap/dbootstrap.h Tue Jun 12 13:53:45 2001
@@ -309,6 +309,11 @@
# define SERIAL_CONSOLE /* serial console recognized */
# define NFSROOT /* network boot */
# define LOCALTIME /* ask for GMT or localtime clock setup */
+
+#elif #cpu (hppa)
+
+# define SERIAL_CONSOLE /* serial console recognized */
+# define NFSROOT /* network boot */
#endif
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/utilities/dbootstrap/main.c boot-floppies-deb-head-work/utilities/dbootstrap/main.c
--- boot-floppies-debian-cvs/utilities/dbootstrap/main.c Tue Jun 5 03:01:12 2001
+++ boot-floppies-deb-head-work/utilities/dbootstrap/main.c Tue Jun 12 13:53:45 2001
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <signal.h>
#include <sys/ioctl.h>
#include <sys/klog.h>
#ifndef _TESTING_
@@ -619,6 +620,8 @@
char *term;
struct serial_struct ser;
+ /* SIGCHLD must be DEFAULT and not IGNORE for popen/pclose to work */
+ signal(SIGCHLD, SIG_DFL);
/* make sure that /proc is mounted */
check_proc();
/* Downgrade kernel verbosity */
diff -ur -x CVS -x tmp -x files -x postinst.debhelper -x prerm.debhelper -N boot-floppies-debian-cvs/utilities/dbootstrap/reboot_system.c boot-floppies-deb-head-work/utilities/dbootstrap/reboot_system.c
--- boot-floppies-debian-cvs/utilities/dbootstrap/reboot_system.c Sun Aug 13 14:18:38 2000
+++ boot-floppies-deb-head-work/utilities/dbootstrap/reboot_system.c Tue Jun 12 13:53:45 2001
@@ -16,7 +16,11 @@
sync();
if (! bootargs.isquiet ) {
if (strcmp(InstallationRootDevice, "/dev/fd0")) {
+#ifdef __hppa__
+ if (! bootargs.isquiet && ! yesNoBox(_("You are ready to reboot the system. Note that you may need to tell your firmware to boot from the disk you installed the boot loader, PALO, on (unless that already happens to be the default boot device).\n\nReboot the system?"), _("Reboot the system?")) )
+#else
if (! bootargs.isquiet && ! yesNoBox(_("If you are ready to reboot the system, you should have the boot floppy (if you created one) in the first floppy drive, or no floppy in the first floppy drive if you want to boot directly from the hard disk, or the Debian Rescue floppy if you want to reboot the installation system.\nPlease take care of that before you answer \"Yes\" to the following question.\n\nReboot the system?"), _("Reboot the system?")) )
+#endif
return 1;
} else {
if (! bootargs.isquiet && ! yesNoBox(_("Since you've booted from the first floppy drive without using the RAM disk, please keep the Installation Root Disk in the drive until the system reboots. Then remove it, and press the <RESET> button on your system.\n\nReboot the system?"), _("Reboot the system?")) )
Reply to: