Joey Hess wrote: > - That floppy://foo.cfg still works when preseeding. > - That /floppy/foo.cfg still works when preseeding. > - That save-logs still finds and mounts a real floppy, and writes the > logs it it. These still work. > - Loading multiple driver floppies, including trying to load them in the > wrong order. Need 2.6.25 to test this. I think it will probably be ok -- there are some tricky cases if multiple driver images are present at the same time somehow, but that's very much an edge case for now. > - Put udebs on a usb stick, netboot, delete your NIC driver, and it should > ask about loading missing drivers, and find the udebs on the stick. > (Probably need to add usb storage modules to the netboot image before > this will work.) Worked once I added the modules. This increases the size of the netboot image for i386 by about 100 KB; I'll also put the modules in netboot for amd64, alpha, powerpc, ppc64. (Maybe nslu2 later?) > - Delete the module for your hard drive before disk-detect runs. It > should ask about loading missing drivers, and load udebs from a USB > stick. Works, with a gotcha. disk-detect doesn't care what kind of disk it finds, so if you have a USB stick with drivers plugged in while it's running, and no other disk is found, it will happily use the USB stick as the target disk. So, to load disk firmware/drivers from USB, you'd have to be careful to only plug it in after disk-detect fails (when it prompts for driver media). Hmm, disk-detect could be made smarter about driver media, but it would have to try to mount them to do so, which, if there is no USB media, can mean a long timeout for the floppy module to load. Also, there's no telling if the USB stick that has a udeb on it is intended as driver media, or if it's actually what you want the installer to install to this time. > - Putting some driver udebs on a usb stick along with an iso and doing a > hd-media install. After iso-scan has run, 'anna media-retriever' should > find those udebs. Here I failed, but the attached patch fixes it. > - Put udebs on a usb stick, and boot from CD; it should be able to > mount the stick and find those udebs. > (Probably need to add usb storage modules to the cd initramfs before > this will work.) Still to test, but CD initramfs's already do have usb-storage-modules, so I think it will work ok. -- see shy jo
From 1207b175c8dc82a27d210d3b82fb30180e96c58a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 20:48:33 -0400
Subject: [PATCH] add some relationship info to changelogs
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/mountmedia/debian/changelog | 1 +
packages/preseed/debian/changelog | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/packages/mountmedia/debian/changelog b/packages/mountmedia/debian/changelog
index e2f5606..2197b56 100644
--- a/packages/mountmedia/debian/changelog
+++ b/packages/mountmedia/debian/changelog
@@ -14,6 +14,7 @@ mountmedia (0.17) UNRELEASED; urgency=low
trying to load floppies.
* As a special case, if /hd-media is mounted and has what we want, bind
mount /mnt to it.
+ * Needs media-retriever.
-- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 14:20:03 -0400
diff --git a/packages/preseed/debian/changelog b/packages/preseed/debian/changelog
index e3cca13..34064f8 100644
--- a/packages/preseed/debian/changelog
+++ b/packages/preseed/debian/changelog
@@ -1,6 +1,7 @@
preseed (1.38) UNRELEASED; urgency=low
* mountmedia mounts /media, not /floppy, so unmount the latter.
+ * Needs debian-installer-utils 1.60 and mountmedia.
-- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 16:15:37 -0400
--
1.5.5.4
From 30416c1a19c4315ef214ac3cea23b6acd888cbe5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 21:38:15 -0400
Subject: [PATCH] Add usb-storage-modules to all netboot images that use mountmedia. This will allow loading NIC drivers/firmware from a USB stick.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
installer/build/pkg-lists/netboot/alpha.cfg | 3 ++-
installer/build/pkg-lists/netboot/amd64.cfg | 3 ++-
installer/build/pkg-lists/netboot/i386.cfg | 3 ++-
installer/build/pkg-lists/netboot/powerpc.cfg | 1 +
installer/build/pkg-lists/netboot/ppc64.cfg | 1 +
installer/debian/changelog | 2 ++
6 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/installer/build/pkg-lists/netboot/alpha.cfg b/installer/build/pkg-lists/netboot/alpha.cfg
index 5633687..9606c30 100644
--- a/installer/build/pkg-lists/netboot/alpha.cfg
+++ b/installer/build/pkg-lists/netboot/alpha.cfg
@@ -14,10 +14,11 @@ hw-detect
ethdetect
netcfg
-# In case they need to load a driver floppy.
+# In case they need to load a driver image.
mountmedia
media-retriever
fat-modules-${kernel:Version}
+usb-storage-modules-${kernel:Version}
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/amd64.cfg b/installer/build/pkg-lists/netboot/amd64.cfg
index 12e56df..c6ba735 100644
--- a/installer/build/pkg-lists/netboot/amd64.cfg
+++ b/installer/build/pkg-lists/netboot/amd64.cfg
@@ -14,11 +14,12 @@ kbd-chooser
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
-# In case they need to load a driver floppy.
+# In case they need to load a driver image.
mountmedia
media-retriever
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
+usb-storage-modules-${kernel:Version}
# Netboot over pcmcia is unlikely, but one never knows, and this makes
# pcmcia network interfaces available, as well as making sure pcmcia is
diff --git a/installer/build/pkg-lists/netboot/i386.cfg b/installer/build/pkg-lists/netboot/i386.cfg
index c17f509..3cd2236 100644
--- a/installer/build/pkg-lists/netboot/i386.cfg
+++ b/installer/build/pkg-lists/netboot/i386.cfg
@@ -14,10 +14,11 @@ kbd-chooser
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
-# In case they need to load a driver floppy.
+# In case they need to load a driver image.
media-retriever
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
+#usb-storage-modules-${kernel:Version}
# Netboot over pcmcia is unlikely, but one never knows, and this makes
# pcmcia network interfaces available, as well as making sure pcmcia is
diff --git a/installer/build/pkg-lists/netboot/powerpc.cfg b/installer/build/pkg-lists/netboot/powerpc.cfg
index 0c958bb..07d839e 100644
--- a/installer/build/pkg-lists/netboot/powerpc.cfg
+++ b/installer/build/pkg-lists/netboot/powerpc.cfg
@@ -8,6 +8,7 @@ nic-pcmcia-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
mountmedia
media-retriever
+usb-storage-modules-${kernel:Version}
pcmciautils-udeb
floppy-modules-${kernel:Version}
#fb-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/ppc64.cfg b/installer/build/pkg-lists/netboot/ppc64.cfg
index f0663cf..1874628 100644
--- a/installer/build/pkg-lists/netboot/ppc64.cfg
+++ b/installer/build/pkg-lists/netboot/ppc64.cfg
@@ -8,6 +8,7 @@ nic-pcmcia-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
mountmedia
media-retriever
+usb-storage-modules-${kernel:Version}
pcmciautils-udeb
floppy-modules-${kernel:Version}
#fb-modules-${kernel:Version}
diff --git a/installer/debian/changelog b/installer/debian/changelog
index eb6b52d..d7cd24a 100644
--- a/installer/debian/changelog
+++ b/installer/debian/changelog
@@ -24,6 +24,8 @@ debian-installer (2008xxxx) UNRELEASED; urgency=low
[ Joey Hess ]
* mountfloppy renamed to mountmedia
* floppy-retriever renamed to media-retriever
+ * Add usb-storage-modules to all netboot images that use mountmedia.
+ This will allow loading NIC drivers/firmware from a USB stick.
-- Frans Pop <fjp@debian.org> Sat, 07 Jun 2008 12:47:20 +0200
--
1.5.5.4
From e42f2e698fcc4ee234e109c71767a9b925630346 Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kodama.kitenet.net> Date: Fri, 20 Jun 2008 21:49:35 -0400 Subject: [PATCH] fix hd-media special case Hurrah for testing, and for only finding one bug so far. :-) Signed-off-by: Joey Hess <joey@kodama.kitenet.net> --- packages/mountmedia/mountmedia | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/mountmedia/mountmedia b/packages/mountmedia/mountmedia index d54a11b..6f42043 100755 --- a/packages/mountmedia/mountmedia +++ b/packages/mountmedia/mountmedia @@ -86,6 +86,7 @@ if ! ( mount | cut -d' ' -f3 | grep -q "^$MNT$" && checkcontents $MNT ); then # Special case for an already mounted /hd-media. if [ "$WANTDRIVER" ] && [ -d /hd-media ] && checkcontents /hd-media; then mount --bind /hd-media /media + exit 0 fi # Maybe the system has an ide-floppy device? -- 1.5.5.4
Attachment:
signature.asc
Description: Digital signature