Package: crosshurd
Version: 1.7.18
Severity: normal
Tags: patch
Hi,
This patch contains updates for GNU/kFreeBSD support. It fixes livecd
generation and running native-install inside a chroot (which wasn't possible
before).
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-1-k7
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL
set to C)
Versions of packages crosshurd depends on:
ii dialog 1.0-20050306-1 Displays user-friendly dialog boxe
ii dpkg-dev 1.13.10 Package building tools for Debian
Versions of packages crosshurd recommends:
pn attr <none> (no description available)
-- no debconf information
diff -ur crosshurd-1.7.18.old/makehurddir.sh crosshurd-1.7.18/makehurddir.sh
--- crosshurd-1.7.18.old/makehurddir.sh 2005-06-12 23:18:57.000000000 +0200
+++ crosshurd-1.7.18/makehurddir.sh 2005-07-08 00:37:20.000000000 +0200
@@ -36,9 +36,12 @@
for i in *.deb; do dpkg --info $i | grep ^\ Priority:.required \
&& echo $i; done) | cut -d _ -f 1`
-if [ -e $TARGET/var/cache/apt/archives/gnumach_* ] ; then
- extract gnumach
-fi
+# overrides
+for i in gnumach grub ; do
+ if [ -e $TARGET/var/cache/apt/archives/${i}_* ] ; then
+ extract ${i}
+ fi
+done
x_feign_install dpkg
if [ "$DEB_TARGET_GNU_SYSTEM" = "gnu" ] ; then
Only in crosshurd-1.7.18: makehurddir.sh~
diff -ur crosshurd-1.7.18.old/native-install/native-install
crosshurd-1.7.18/native-install/native-install
--- crosshurd-1.7.18.old/native-install/native-install 2005-06-11
13:34:01.000000000 +0200
+++ crosshurd-1.7.18/native-install/native-install 2005-07-08
00:36:00.000000000 +0200
@@ -30,6 +30,8 @@
set -e
+parent_term="$TERM"
+
case "${system}" in
GNU)
if [ "$TERM" = "dumb" ] ; then
@@ -97,18 +99,15 @@
cd /dev && MAKEDEV std generic
;;
*FreeBSD)
- if test -e /dev/null ; then
- if test ! -c /dev/null ; then
- echo "/dev/null exists but is not a character device"
- exit 1
- fi
- else
- case `uname -r` in
- 4.*) echo Copy device files into /dev before running $0
- exit ;;
- *) mount -t devfs null /dev ;;
- esac
+ if test -e /dev/null && test ! -c /dev/null ; then
+ echo "/dev/null exists but is not a character device, removing it"
+ rm -f /dev/null
fi
+ case `uname -r` in
+ 4.*) echo Copy device files into /dev before running $0
+ exit ;;
+ *) mount -t devfs null /dev ;;
+ esac
if [ "$TERM" = "dumb" ] ; then
export TERM=cons25
fi
@@ -291,7 +290,7 @@
which nano vi zile emacs || true
echo
-case "${system}:`runlevel`" in
+case "${system}:$parent_term" in
GNU:*)
echo 'You should reboot now, and enter multi-user mode. Note that'
echo 'you will have to activate the Hurd console manually currently.'
@@ -300,9 +299,9 @@
echo ' -d generic_speaker -c /dev/vcs'
echo 'as root after you have logged in.'
;;
- *FreeBSD:unknown)
- echo "Looks like you are in Single User mode. In order to get a fully"
- echo "functional terminal, you need to run \"export TERM=cons25\"."
+ *FreeBSD:dumb)
+ echo "Looks like you are using a dumb terminal. In order to get a fully"
+ echo "functional one, you need to run \"export TERM=cons25\"."
;;
esac
