[PATCH 3/7] Fine-tune the Hurd configuration
* Use mklibs-copy for the time being.
* Use the newer "module --nounzip" grub command to load the gzipped initrd,
and let the gunzip: store driver handle the decompression.
* Disable the uninstallable or otherwise broken standard udebs from the
monolithic images.
Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
---
boot/hurd/grub-hurd-i386.cfg | 4 ++--
config/hurd.cfg | 4 ++++
pkg-lists/monolithic/hurd-i386.cfg | 19 +++++++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/boot/hurd/grub-hurd-i386.cfg b/boot/hurd/grub-hurd-i386.cfg
index e83166e..5d5f595 100644
--- a/boot/hurd/grub-hurd-i386.cfg
+++ b/boot/hurd/grub-hurd-i386.cfg
@@ -20,8 +20,8 @@ fi
menuentry "Install Debian GNU/Hurd" {
echo "Loading ..."
set root=$cd
- multiboot /boot/kernel/gnumach.gz root=device:rd0
- module /boot/initrd.gz initrd '$(ramdisk-create)'
+ multiboot /boot/kernel/gnumach.gz root=gunzip:device:rd0
+ module --nounzip /boot/initrd.gz initrd '$(ramdisk-create)'
module /boot/kernel/ext2fs.static ext2fs \
--multiboot-command-line='${kernel-command-line}' \
--host-priv-port='${host-port}' \
diff --git a/config/hurd.cfg b/config/hurd.cfg
index 70ecdd0..7d51041 100644
--- a/config/hurd.cfg
+++ b/config/hurd.cfg
@@ -16,6 +16,10 @@ SPLASH_PNG=boot/hurd/pics/klowner-hurd.png
# The font to load in GRUB
GRUB_FONT=/usr/share/grub/ascii.pf2
+# Library reduction needs some extra stuff which for now
+# is not usually available.
+MKLIBS = mklibs-copy
+
# Unsupported targets
arch_boot_screens:
arch_tree:
diff --git a/pkg-lists/monolithic/hurd-i386.cfg b/pkg-lists/monolithic/hurd-i386.cfg
index b62c3f6..8f4731f 100644
--- a/pkg-lists/monolithic/hurd-i386.cfg
+++ b/pkg-lists/monolithic/hurd-i386.cfg
@@ -17,3 +17,22 @@ tzsetup-udeb -
# Use netcfg-static for now
netcfg -
netcfg-static
+# These are broken and/or irrelevant on Hurd for now
+clock-setup -
+#installation-locale -
+partman-auto-raid -
+partman-ext3 -
+partman-jfs -
+partman-md -
+partman-xfs -
+partman-btrfs -
+# FIXME: ufsutils-udeb is uninstallable
+partman-ufs -
+rescue-mode -
+libbsd0-udeb -
+rdate-udeb -
+tzsetup-udeb -
+
+# Use netcfg-static for now
+netcfg -
+netcfg-static
--
1.7.1
Reply to: