As a prerequisite to my request_firmware idea, the attached 18 patches rename floppy-retriever to media-retriever, and mountfloppy to mountmedia, and change them to not just operate on floppies, but on generic removable media (including USB sticks, but not including CDs). "mountmedia floppy" can be used by things that are still stuck in the floppy era and only want a floppy. This is currently done by installation-report and some preseed/kickseed stuff. "mountmedia driver" can be used by things that don't want just any removable media to be mounted, but want a driver media with udebs. Most of the changes are pretty trivial renames etc. The complicated part is in mountmedia itself; the changes to it need to be tested before this is all applied. At least the following cases need to be tested, and gotten working. - Loading multiple driver floppies, including trying to load them in the wrong order. - 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. - 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.) - 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.) - 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. - That save-logs still finds and mounts a real floppy, and writes the logs it it. - That floppy://foo.cfg still works when preseeding. - That /floppy/foo.cfg still works when preseeding. -- see shy jo
From 82f9d605030aaa53b66002bafade069f459f667c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 14:24:21 -0400
Subject: [PATCH] implement "mountfloppy driver"
Sometimes mountfloppy is used to mount a driver floppy comtaining udebs,
while other times, it's used to mount a floppy with other content. This
change allows it to differentiate between the two cases, and be more
intelligent, avoiding mounting non-driver floppies if drivers are needed.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/floppy-retriever/debian/changelog | 5 +++++
packages/floppy-retriever/floppy-retriever | 6 +++---
packages/mountfloppy/debian/changelog | 4 +++-
packages/mountfloppy/mountfloppy | 19 +++++++++++++++++++
4 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/packages/floppy-retriever/debian/changelog b/packages/floppy-retriever/debian/changelog
index d9b0c10..e2f31b9 100644
--- a/packages/floppy-retriever/debian/changelog
+++ b/packages/floppy-retriever/debian/changelog
@@ -1,8 +1,13 @@
floppy-retriever (1.18) UNRELEASED; urgency=low
+ [ Frans Pop ]
* Remove Martin Sjogren as Uploader with many thanks for his past
contributions.
+ [ Joey Hess ]
+ * Pass "driver" to mountfloppy to let it know that we're looking for a
+ driver floppy.
+
-- Frans Pop <fjp@debian.org> Tue, 08 Apr 2008 13:28:29 +0200
floppy-retriever (1.17) unstable; urgency=low
diff --git a/packages/floppy-retriever/floppy-retriever b/packages/floppy-retriever/floppy-retriever
index f576eed..c2f28fc 100755
--- a/packages/floppy-retriever/floppy-retriever
+++ b/packages/floppy-retriever/floppy-retriever
@@ -9,7 +9,7 @@ shift
case "x$cmd" in
xconfig)
- mountfloppy
+ mountfloppy driver
for f in include exclude; do
if [ -e $FLOPPYMNT/udeb_$f ]; then
ln -sf $FLOPPYMNT/udeb_$f /var/cache/anna/$f
@@ -18,7 +18,7 @@ case "x$cmd" in
;;
xretrieve)
- mountfloppy
+ mountfloppy driver
if [ -e $FLOPPYMNT/$1 ]; then
ln -sf $FLOPPYMNT/$1 "$2"
exit $?
@@ -30,7 +30,7 @@ case "x$cmd" in
xpackages)
# generate a Packages file based on what udebs are on the
# floppy
- mountfloppy
+ mountfloppy driver
rm -f "$1"
touch "$1"
# Check for regular debs, udebs, and to be on the safe side,
diff --git a/packages/mountfloppy/debian/changelog b/packages/mountfloppy/debian/changelog
index 6078fc6..c95fd83 100644
--- a/packages/mountfloppy/debian/changelog
+++ b/packages/mountfloppy/debian/changelog
@@ -4,8 +4,10 @@ mountfloppy (0.17) UNRELEASED; urgency=low
since 2005! That's conclusive proof that we don't need the debconf
template, at all, so remove it.
* No longer asks a question, which Closes: #352474
+ * "mountfloppy driver" can be used to ensure that a driver floppy,
+ containing udebs (or debs) is loaded.
- -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 15:09:20 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 14:20:03 -0400
mountfloppy (0.16) unstable; urgency=low
diff --git a/packages/mountfloppy/mountfloppy b/packages/mountfloppy/mountfloppy
index 0bd7c98..2ae8f16 100755
--- a/packages/mountfloppy/mountfloppy
+++ b/packages/mountfloppy/mountfloppy
@@ -1,5 +1,9 @@
#!/bin/sh
+if [ "$1" = driver ]; then
+ WANTDRIVER=1
+fi
+
FLOPPYMNT=/floppy
try_mount() {
@@ -9,6 +13,21 @@ try_mount() {
mount $1 -tauto $2 || true
umount $2 || true
mount $1 -tauto $2
+
+ if [ "$WANTDRIVER" ]; then
+ # Make sure this is a driver floppy by checking the files on
+ # it. Check for regular debs, udebs, and to be on the safe
+ # side, check for *.ude files (msdos file names...)
+ for filename in $2/*.deb $2/*.udeb $2/*.ude; do
+ if [ -f "$filename" ]; then
+ return 0 # success
+ fi
+ done
+ umount $2
+ return 1
+ else
+ return 0
+ fi
}
if ! mount | cut -d' ' -f3 | grep -q "^$FLOPPYMNT$"; then
--
1.5.5.4
From 9fc9a69fa2f927271566d9d00808d3609982003b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 14:29:36 -0400
Subject: [PATCH] unmount already mounted non-driver floppy
If we're looking for a driver floppy an existing mounted floppy is not
sufficient unless its contents are good.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/mountfloppy/mountfloppy | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/packages/mountfloppy/mountfloppy b/packages/mountfloppy/mountfloppy
index 2ae8f16..179e00c 100755
--- a/packages/mountfloppy/mountfloppy
+++ b/packages/mountfloppy/mountfloppy
@@ -14,6 +14,10 @@ try_mount() {
umount $2 || true
mount $1 -tauto $2
+ checkcontents
+}
+
+checkcontents() {
if [ "$WANTDRIVER" ]; then
# Make sure this is a driver floppy by checking the files on
# it. Check for regular debs, udebs, and to be on the safe
@@ -30,7 +34,7 @@ try_mount() {
fi
}
-if ! mount | cut -d' ' -f3 | grep -q "^$FLOPPYMNT$"; then
+if ! ( mount | cut -d' ' -f3 | grep -q "^$FLOPPYMNT$" && checkcontents ); then
# This is a good reasonable default, but will fail for
# USB floppys.
FLOPPYDEV=/dev/fd0
--
1.5.5.4
From be35345431f174dbb30b50f7b1bc01d2fe86eb58 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 14:55:59 -0400
Subject: [PATCH] scan for removable usb storage
When looking for drivers, also try to mount removable USB storage, not
just floppies. Whole hard disks and also partitions will be scanned as well.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/mountfloppy/debian/changelog | 3 ++
packages/mountfloppy/mountfloppy | 52 +++++++++++++++++++++++++-------
2 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/packages/mountfloppy/debian/changelog b/packages/mountfloppy/debian/changelog
index c95fd83..10b17a9 100644
--- a/packages/mountfloppy/debian/changelog
+++ b/packages/mountfloppy/debian/changelog
@@ -6,6 +6,9 @@ mountfloppy (0.17) UNRELEASED; urgency=low
* No longer asks a question, which Closes: #352474
* "mountfloppy driver" can be used to ensure that a driver floppy,
containing udebs (or debs) is loaded.
+ * When looking for drivers, also try to mount removable USB storage, not
+ just floppies. Whole hard disks and also partitions will be scanned as
+ well.
-- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 14:20:03 -0400
diff --git a/packages/mountfloppy/mountfloppy b/packages/mountfloppy/mountfloppy
index 179e00c..c69f96a 100755
--- a/packages/mountfloppy/mountfloppy
+++ b/packages/mountfloppy/mountfloppy
@@ -6,13 +6,27 @@ fi
FLOPPYMNT=/floppy
+devlist() {
+ if [ "$WANTDRIVER" ]; then
+ # Ordering: First look for USB media (also finding whole fixed
+ # disks, but that's ok). Then look for floppies. Finally, try
+ # scanning partitions last.
+ list-devices disk
+ list-devices maybe-usb-floppy
+ list-devices floppy
+ list-devices partition
+ else
+ list-devices floppy
+ fi
+}
+
try_mount() {
# TO REMOVE, there is a bug somewhere in the kernel, the first
# mount command fail when changing floppy disk
# so we have to launch mount twice
- mount $1 -tauto $2 || true
- umount $2 || true
- mount $1 -tauto $2
+ mount $1 -tauto $FLOPPYMNT || true
+ umount $FLOPPYMNT || true
+ mount $1 -tauto $FLOPPYMNT
checkcontents
}
@@ -22,7 +36,7 @@ checkcontents() {
# Make sure this is a driver floppy by checking the files on
# it. Check for regular debs, udebs, and to be on the safe
# side, check for *.ude files (msdos file names...)
- for filename in $2/*.deb $2/*.udeb $2/*.ude; do
+ for filename in $FLOPPYMNT/*.deb $FLOPPYMNT/*.udeb $FLOPPYMNT/*.ude; do
if [ -f "$filename" ]; then
return 0 # success
fi
@@ -35,21 +49,35 @@ checkcontents() {
}
if ! ( mount | cut -d' ' -f3 | grep -q "^$FLOPPYMNT$" && checkcontents ); then
- # This is a good reasonable default, but will fail for
- # USB floppys.
+ if ! grep -q ^vfat /proc/modules ; then
+ log-output -t mountfloppy modprobe -q vfat || true
+ fi
+
+ # Repeat twice if necessary, to accomodate devices that need some
+ # time to initialise, like USB devices.
+ for i in 1 2; do
+ for dev in $(devlist); do
+ if try_mount $dev; then
+ exit 0 # success
+ fi
+ done
+
+ if [ "$i" = 1 ]; then
+ # Give USB time to settle, make sure all devices are
+ # seen next time though.
+ sleep 5
+ fi
+ done
+
+ # Maybe the floppy module needs to be explicitly loaded?
FLOPPYDEV=/dev/fd0
-
if [ ! -e $FLOPPYDEV ]; then
log-output -t mountfloppy modprobe -q floppy || true
update-dev
fi
-
- if ! grep -q ^vfat /proc/modules ; then
- log-output -t mountfloppy modprobe -q vfat || true
- fi
# Cannot find a device, or found the wrong device.
- if [ ! -e "$FLOPPYDEV" ] || ! try_mount $FLOPPYDEV $FLOPPYMNT; then
+ if [ ! -e "$FLOPPYDEV" ] || ! try_mount $FLOPPYDEV; then
# Maybe the system has an ide-floppy device?
log-output -t mountfloppy modprobe -q ide-floppy || true
update-dev
--
1.5.5.4
From e0ca304e37600fceab604e9823213ec3f839495f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 15:58:35 -0400
Subject: [PATCH] rename mountfloppy to mountmedia
The mount point changed from /floppy to /media, too.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
.../{mountfloppy => mountmedia}/debian/changelog | 7 +++-
packages/{mountfloppy => mountmedia}/debian/compat | 0
.../{mountfloppy => mountmedia}/debian/control | 8 ++--
.../{mountfloppy => mountmedia}/debian/copyright | 4 +-
packages/{mountfloppy => mountmedia}/debian/rules | 2 +-
.../debian/source.lintian-overrides | 0
.../mountfloppy => mountmedia/mountmedia} | 36 ++++++++++---------
7 files changed, 31 insertions(+), 26 deletions(-)
rename packages/{mountfloppy => mountmedia}/debian/changelog (97%)
rename packages/{mountfloppy => mountmedia}/debian/compat (100%)
rename packages/{mountfloppy => mountmedia}/debian/control (72%)
rename packages/{mountfloppy => mountmedia}/debian/copyright (74%)
rename packages/{mountfloppy => mountmedia}/debian/rules (93%)
rename packages/{mountfloppy => mountmedia}/debian/source.lintian-overrides (100%)
rename packages/{mountfloppy/mountfloppy => mountmedia/mountmedia} (68%)
diff --git a/packages/mountfloppy/debian/changelog b/packages/mountmedia/debian/changelog
similarity index 97%
rename from packages/mountfloppy/debian/changelog
rename to packages/mountmedia/debian/changelog
index 10b17a9..09ae313 100644
--- a/packages/mountfloppy/debian/changelog
+++ b/packages/mountmedia/debian/changelog
@@ -1,14 +1,17 @@
-mountfloppy (0.17) UNRELEASED; urgency=low
+mountmedia (0.17) UNRELEASED; urgency=low
* The script has not used the right name for the debconf template
since 2005! That's conclusive proof that we don't need the debconf
template, at all, so remove it.
* No longer asks a question, which Closes: #352474
- * "mountfloppy driver" can be used to ensure that a driver floppy,
+ * Renamed the package, to reflect that it doesn't just do floppies.
+ * "mountmedia driver" can be used to ensure that a driver floppy,
containing udebs (or debs) is loaded.
* When looking for drivers, also try to mount removable USB storage, not
just floppies. Whole hard disks and also partitions will be scanned as
well.
+ * "mountmedia floppy" can be used to force the old behavior, of only
+ trying to load floppies.
-- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 14:20:03 -0400
diff --git a/packages/mountfloppy/debian/compat b/packages/mountmedia/debian/compat
similarity index 100%
rename from packages/mountfloppy/debian/compat
rename to packages/mountmedia/debian/compat
diff --git a/packages/mountfloppy/debian/control b/packages/mountmedia/debian/control
similarity index 72%
rename from packages/mountfloppy/debian/control
rename to packages/mountmedia/debian/control
index 6cbd8c0..876fa87 100644
--- a/packages/mountfloppy/debian/control
+++ b/packages/mountmedia/debian/control
@@ -1,14 +1,14 @@
-Source: mountfloppy
+Source: mountmedia
Section: debian-installer
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Joey Hess <joeyh@debian.org>
Build-Depends: debhelper (>= 4.2)
Build-Depends-Indep: dpkg-dev (>= 1.7.0), po-debconf (>= 0.5.0)
-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/mountfloppy
+Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/mountmedia
-Package: mountfloppy
+Package: mountmedia
XC-Package-Type: udeb
Architecture: all
Depends: ${misc:Depends}, di-utils (>= 1.48)
-Description: Mounts a floppy
+Description: Mounts media media
diff --git a/packages/mountfloppy/debian/copyright b/packages/mountmedia/debian/copyright
similarity index 74%
rename from packages/mountfloppy/debian/copyright
rename to packages/mountmedia/debian/copyright
index 5ffaa58..6bae290 100644
--- a/packages/mountfloppy/debian/copyright
+++ b/packages/mountmedia/debian/copyright
@@ -1,5 +1,5 @@
-mountfloppy is copyright 2005 by Joey Hess <joeyh@debian.org> and the d-i
-team.
+mountmedia is copyright 2005,2008 by Joey Hess <joeyh@debian.org> and
+the d-i team.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
diff --git a/packages/mountfloppy/debian/rules b/packages/mountmedia/debian/rules
similarity index 93%
rename from packages/mountfloppy/debian/rules
rename to packages/mountmedia/debian/rules
index 8588242..9f7f59f 100755
--- a/packages/mountfloppy/debian/rules
+++ b/packages/mountmedia/debian/rules
@@ -12,7 +12,7 @@ install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_install mountfloppy bin
+ dh_install mountmedia bin
binary-arch: build install
diff --git a/packages/mountfloppy/debian/source.lintian-overrides b/packages/mountmedia/debian/source.lintian-overrides
similarity index 100%
rename from packages/mountfloppy/debian/source.lintian-overrides
rename to packages/mountmedia/debian/source.lintian-overrides
diff --git a/packages/mountfloppy/mountfloppy b/packages/mountmedia/mountmedia
similarity index 68%
rename from packages/mountfloppy/mountfloppy
rename to packages/mountmedia/mountmedia
index c69f96a..49806d9 100755
--- a/packages/mountfloppy/mountfloppy
+++ b/packages/mountmedia/mountmedia
@@ -2,12 +2,16 @@
if [ "$1" = driver ]; then
WANTDRIVER=1
+elif [ "$1" = floppy ]; then
+ WANTFLOPPY=1
fi
-FLOPPYMNT=/floppy
+MNT=/media
devlist() {
- if [ "$WANTDRIVER" ]; then
+ if [ "$WANTFLOPPY" ]; then
+ list-devices floppy
+ else
# Ordering: First look for USB media (also finding whole fixed
# disks, but that's ok). Then look for floppies. Finally, try
# scanning partitions last.
@@ -15,8 +19,6 @@ devlist() {
list-devices maybe-usb-floppy
list-devices floppy
list-devices partition
- else
- list-devices floppy
fi
}
@@ -24,19 +26,19 @@ try_mount() {
# TO REMOVE, there is a bug somewhere in the kernel, the first
# mount command fail when changing floppy disk
# so we have to launch mount twice
- mount $1 -tauto $FLOPPYMNT || true
- umount $FLOPPYMNT || true
- mount $1 -tauto $FLOPPYMNT
+ mount $1 -tauto $MNT || true
+ umount $MNT || true
+ mount $1 -tauto $MNT
checkcontents
}
checkcontents() {
if [ "$WANTDRIVER" ]; then
- # Make sure this is a driver floppy by checking the files on
+ # Make sure this is driver media by checking the files on
# it. Check for regular debs, udebs, and to be on the safe
# side, check for *.ude files (msdos file names...)
- for filename in $FLOPPYMNT/*.deb $FLOPPYMNT/*.udeb $FLOPPYMNT/*.ude; do
+ for filename in $MNT/*.deb $MNT/*.udeb $MNT/*.ude; do
if [ -f "$filename" ]; then
return 0 # success
fi
@@ -48,9 +50,9 @@ checkcontents() {
fi
}
-if ! ( mount | cut -d' ' -f3 | grep -q "^$FLOPPYMNT$" && checkcontents ); then
+if ! ( mount | cut -d' ' -f3 | grep -q "^$MNT$" && checkcontents ); then
if ! grep -q ^vfat /proc/modules ; then
- log-output -t mountfloppy modprobe -q vfat || true
+ log-output -t mountmedia modprobe -q vfat || true
fi
# Repeat twice if necessary, to accomodate devices that need some
@@ -70,17 +72,17 @@ if ! ( mount | cut -d' ' -f3 | grep -q "^$FLOPPYMNT$" && checkcontents ); then
done
# Maybe the floppy module needs to be explicitly loaded?
- FLOPPYDEV=/dev/fd0
- if [ ! -e $FLOPPYDEV ]; then
- log-output -t mountfloppy modprobe -q floppy || true
+ DEV=/dev/fd0
+ if [ ! -e $DEV ]; then
+ log-output -t mountmedia modprobe -q floppy || true
update-dev
fi
# Cannot find a device, or found the wrong device.
- if [ ! -e "$FLOPPYDEV" ] || ! try_mount $FLOPPYDEV; then
+ if [ ! -e "$DEV" ] || ! try_mount $DEV; then
# Maybe the system has an ide-floppy device?
- log-output -t mountfloppy modprobe -q ide-floppy || true
+ log-output -t mountmedia modprobe -q ide-floppy || true
update-dev
- try_mount $FLOPPYDEV $FLOPPYMNT
+ try_mount $DEV $MNT
fi
fi
--
1.5.5.4
From 2877a46c688e5a798213e7ba1405f47478e22651 Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kodama.kitenet.net> Date: Fri, 20 Jun 2008 15:59:44 -0400 Subject: [PATCH] floppy mountpoint rename Rename toplevel /floppy mountpoint to /media, as used by the newly renamed mountmedia. Signed-off-by: Joey Hess <joey@kodama.kitenet.net> --- packages/rootskel/debian/changelog | 7 +++++++ packages/rootskel/src/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/packages/rootskel/debian/changelog b/packages/rootskel/debian/changelog index 3645220..313603a 100644 --- a/packages/rootskel/debian/changelog +++ b/packages/rootskel/debian/changelog @@ -1,3 +1,10 @@ +rootskel (1.63) UNRELEASED; urgency=low + + * Rename toplevel /floppy mountpoint to /media, as used by the newly + renamed mountmedia. + + -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 15:55:12 -0400 + rootskel (1.62) unstable; urgency=low [ Frans Pop ] diff --git a/packages/rootskel/src/Makefile b/packages/rootskel/src/Makefile index ea56446..fb5f049 100644 --- a/packages/rootskel/src/Makefile +++ b/packages/rootskel/src/Makefile @@ -8,7 +8,7 @@ subdirs = \ subdirs_empty = \ dev \ - floppy \ + media \ initrd \ mnt \ proc \ -- 1.5.5.4
From 65747a4d8358dc5be21f3c3ac281c1606374b44a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 16:01:40 -0400
Subject: [PATCH] pkg-lists change for mountmedia rename
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
installer/build/pkg-lists/cdrom-apus/common | 2 +-
installer/build/pkg-lists/cdrom/common | 2 +-
installer/build/pkg-lists/floppy-ng/i386.cfg | 2 +-
installer/build/pkg-lists/hd-media/common | 2 +-
installer/build/pkg-lists/nativehd/common | 2 +-
installer/build/pkg-lists/netboot/alpha.cfg | 2 +-
installer/build/pkg-lists/netboot/amd64.cfg | 2 +-
installer/build/pkg-lists/netboot/powerpc.cfg | 2 +-
installer/build/pkg-lists/netboot/ppc64.cfg | 2 +-
installer/debian/changelog | 3 +++
10 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/installer/build/pkg-lists/cdrom-apus/common b/installer/build/pkg-lists/cdrom-apus/common
index 35f7a71..e583eed 100644
--- a/installer/build/pkg-lists/cdrom-apus/common
+++ b/installer/build/pkg-lists/cdrom-apus/common
@@ -22,6 +22,6 @@ nano-udeb
floppy-retriever
save-logs
-mountfloppy
+mountmedia
libfribidi0-udeb
diff --git a/installer/build/pkg-lists/cdrom/common b/installer/build/pkg-lists/cdrom/common
index 095ae2b..e8feab2 100644
--- a/installer/build/pkg-lists/cdrom/common
+++ b/installer/build/pkg-lists/cdrom/common
@@ -27,6 +27,6 @@ nano-udeb
floppy-retriever
save-logs
-mountfloppy
+mountmedia
libfribidi0-udeb
diff --git a/installer/build/pkg-lists/floppy-ng/i386.cfg b/installer/build/pkg-lists/floppy-ng/i386.cfg
index 6e3d227..1d911d9 100644
--- a/installer/build/pkg-lists/floppy-ng/i386.cfg
+++ b/installer/build/pkg-lists/floppy-ng/i386.cfg
@@ -5,7 +5,7 @@ console-keymaps-at
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
-mountfloppy
+mountmedia
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/hd-media/common b/installer/build/pkg-lists/hd-media/common
index 4d5305f..833c23e 100644
--- a/installer/build/pkg-lists/hd-media/common
+++ b/installer/build/pkg-lists/hd-media/common
@@ -31,6 +31,6 @@ cdrom-retriever
cdrom-detect -
save-logs
-mountfloppy
+mountmedia
libfribidi0-udeb
diff --git a/installer/build/pkg-lists/nativehd/common b/installer/build/pkg-lists/nativehd/common
index 26a6aa3..c233f85 100644
--- a/installer/build/pkg-lists/nativehd/common
+++ b/installer/build/pkg-lists/nativehd/common
@@ -28,4 +28,4 @@ preseed-common
initrd-preseed
save-logs
-mountfloppy
+mountmedia
diff --git a/installer/build/pkg-lists/netboot/alpha.cfg b/installer/build/pkg-lists/netboot/alpha.cfg
index 95cfaea..319cb0e 100644
--- a/installer/build/pkg-lists/netboot/alpha.cfg
+++ b/installer/build/pkg-lists/netboot/alpha.cfg
@@ -15,7 +15,7 @@ ethdetect
netcfg
# In case they need to load a driver floppy.
-mountfloppy
+mountmedia
floppy-retriever
fat-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/amd64.cfg b/installer/build/pkg-lists/netboot/amd64.cfg
index ef47a78..d5e8678 100644
--- a/installer/build/pkg-lists/netboot/amd64.cfg
+++ b/installer/build/pkg-lists/netboot/amd64.cfg
@@ -15,7 +15,7 @@ kbd-chooser
fb-modules-${kernel:Version}
# In case they need to load a driver floppy.
-mountfloppy
+mountmedia
floppy-retriever
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/powerpc.cfg b/installer/build/pkg-lists/netboot/powerpc.cfg
index 6e598ea..8116863 100644
--- a/installer/build/pkg-lists/netboot/powerpc.cfg
+++ b/installer/build/pkg-lists/netboot/powerpc.cfg
@@ -6,7 +6,7 @@ nic-extra-modules-${kernel:Version}
socket-modules-${kernel:Version} ?
nic-pcmcia-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
-mountfloppy
+mountmedia
floppy-retriever
pcmciautils-udeb
floppy-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/ppc64.cfg b/installer/build/pkg-lists/netboot/ppc64.cfg
index ead1098..577d332 100644
--- a/installer/build/pkg-lists/netboot/ppc64.cfg
+++ b/installer/build/pkg-lists/netboot/ppc64.cfg
@@ -6,7 +6,7 @@ nic-extra-modules-${kernel:Version}
socket-modules-${kernel:Version} ?
nic-pcmcia-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
-mountfloppy
+mountmedia
floppy-retriever
pcmciautils-udeb
floppy-modules-${kernel:Version}
diff --git a/installer/debian/changelog b/installer/debian/changelog
index 2e29ac5..63fa67b 100644
--- a/installer/debian/changelog
+++ b/installer/debian/changelog
@@ -21,6 +21,9 @@ debian-installer (2008xxxx) UNRELEASED; urgency=low
* Test OMIT_WIN32_LOADER in arch_cd_info_dir and arch_miniiso targets as
well as arch_boot.
+ [ Joey Hess ]
+ * mountfloppy renamed to mountmedia
+
-- Frans Pop <fjp@debian.org> Sat, 07 Jun 2008 12:47:20 +0200
debian-installer (20080522) unstable; urgency=low
--
1.5.5.4
From c147310bc182e6539c0ad67aab2028340c6f8b5f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 16:02:42 -0400
Subject: [PATCH] Use new "mountmedia floppy" command instead of mountfloppy.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/debian-installer-utils/debian/changelog | 6 ++++++
.../fetch-url-methods/floppy | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/packages/debian-installer-utils/debian/changelog b/packages/debian-installer-utils/debian/changelog
index 5234cf4..660bb47 100644
--- a/packages/debian-installer-utils/debian/changelog
+++ b/packages/debian-installer-utils/debian/changelog
@@ -1,3 +1,9 @@
+debian-installer-utils (1.60) UNRELEASED; urgency=low
+
+ * Use new "mountmedia floppy" command instead of mountfloppy.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 15:40:04 -0400
+
debian-installer-utils (1.59) unstable; urgency=low
* Ensure that terminfo files do not have strange modes, as in the last
diff --git a/packages/debian-installer-utils/fetch-url-methods/floppy b/packages/debian-installer-utils/fetch-url-methods/floppy
index 0ac650b..ffbdf3a 100644
--- a/packages/debian-installer-utils/fetch-url-methods/floppy
+++ b/packages/debian-installer-utils/fetch-url-methods/floppy
@@ -1,7 +1,7 @@
protocol_fetch() {
- local FILE="/floppy/${1#floppy://*}"
+ local FILE="/media/${1#floppy://*}"
- mountfloppy || true
+ mountmedia floppy || true
touch /var/run/preseed-usedfloppy
if [ ! -e "$FILE" ]; then
--
1.5.5.4
From bf68334cbdddc6ec88068a43b0a7022ed62e359d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 16:04:44 -0400
Subject: [PATCH] Use the new mountmedia command instead of mountfloppy.
With this change, it will also look for drivers on usb sticks, etc.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/floppy-retriever/debian/changelog | 1 +
packages/floppy-retriever/debian/control | 2 +-
.../floppy-retriever/debian/load-floppy.postinst | 10 +++---
packages/floppy-retriever/floppy-retriever | 28 +++++++++----------
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/packages/floppy-retriever/debian/changelog b/packages/floppy-retriever/debian/changelog
index e2f31b9..8335e67 100644
--- a/packages/floppy-retriever/debian/changelog
+++ b/packages/floppy-retriever/debian/changelog
@@ -7,6 +7,7 @@ floppy-retriever (1.18) UNRELEASED; urgency=low
[ Joey Hess ]
* Pass "driver" to mountfloppy to let it know that we're looking for a
driver floppy.
+ * Use the new mountmedia command instead of mountfloppy.
-- Frans Pop <fjp@debian.org> Tue, 08 Apr 2008 13:28:29 +0200
diff --git a/packages/floppy-retriever/debian/control b/packages/floppy-retriever/debian/control
index 0d31b8e..e67d9f3 100644
--- a/packages/floppy-retriever/debian/control
+++ b/packages/floppy-retriever/debian/control
@@ -10,7 +10,7 @@ Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/floppy-retriever
Package: floppy-retriever
XC-Package-Type: udeb
Architecture: all
-Depends: ${misc:Depends}, mountfloppy
+Depends: ${misc:Depends}, mountmedia
Provides: retriever
Description: Fetches modules from a floppy
diff --git a/packages/floppy-retriever/debian/load-floppy.postinst b/packages/floppy-retriever/debian/load-floppy.postinst
index 3d7e1da..4fb7adb 100755
--- a/packages/floppy-retriever/debian/load-floppy.postinst
+++ b/packages/floppy-retriever/debian/load-floppy.postinst
@@ -10,7 +10,7 @@ warning() {
log "warning: $@"
}
-FLOPPYMNT=/floppy
+MNT=/media
# SPARC floppy drives don't have an eject button. Dropping to PROM
# and calling eject-floppy isn't the best way to go..
@@ -39,11 +39,11 @@ while true; do
fi
label=""
- mountfloppy
- if [ -e $FLOPPYMNT/disk.lbl ]; then
- label=$(cat $FLOPPYMNT/disk.lbl | grep "^Label" | sed "s/Label://")
+ mountmedia driver
+ if [ -e $MNT/disk.lbl ]; then
+ label=$(cat $MNT/disk.lbl | grep "^Label" | sed "s/Label://")
fi
- umount $FLOPPYMNT
+ umount $MNT
# a floppy disk_N (N>=2) must be loaded after disk_N-1
disk_name=$(echo $label | cut -d':' -f1)
diff --git a/packages/floppy-retriever/floppy-retriever b/packages/floppy-retriever/floppy-retriever
index c2f28fc..dca58db 100755
--- a/packages/floppy-retriever/floppy-retriever
+++ b/packages/floppy-retriever/floppy-retriever
@@ -2,25 +2,25 @@
. /usr/share/debconf/confmodule
-FLOPPYMNT=/floppy
+MNT=/media
cmd="$1"
shift
case "x$cmd" in
xconfig)
- mountfloppy driver
+ mountmedia driver
for f in include exclude; do
- if [ -e $FLOPPYMNT/udeb_$f ]; then
- ln -sf $FLOPPYMNT/udeb_$f /var/cache/anna/$f
+ if [ -e $MNT/udeb_$f ]; then
+ ln -sf $MNT/udeb_$f /var/cache/anna/$f
fi
done
;;
xretrieve)
- mountfloppy driver
- if [ -e $FLOPPYMNT/$1 ]; then
- ln -sf $FLOPPYMNT/$1 "$2"
+ mountmedia driver
+ if [ -e $MNT/$1 ]; then
+ ln -sf $MNT/$1 "$2"
exit $?
else
exit 1
@@ -28,30 +28,28 @@ case "x$cmd" in
;;
xpackages)
- # generate a Packages file based on what udebs are on the
- # floppy
- mountfloppy driver
+ # generate a Packages file based on what udebs are present
+ mountmedia driver
rm -f "$1"
touch "$1"
# Check for regular debs, udebs, and to be on the safe side,
# check for *.ude files (msdos file names...)
FILES=""
FILE_COUNT=0
- for filename in $FLOPPYMNT/*.deb $FLOPPYMNT/*.udeb $FLOPPYMNT/*.ude; do
+ for filename in $MNT/*.deb $MNT/*.udeb $MNT/*.ude; do
if [ -f "$filename" ]; then
FILES="$FILES $filename"
FILE_COUNT=$(expr $FILE_COUNT + 1)
fi
done
if [ "$FILE_COUNT" = 0 ]; then
- # Probably not a legitimate driver floppy.
exit 1
fi
# This could take a while, so a progress bar.
db_progress START 0 $FILE_COUNT retriever/floppy/packages/progress
for filename in $FILES; do
udpkg -f "$filename" | sed 's/Priority: .*/Priority: standard/' >> "$1"
- path="`echo "$filename" | sed 's,^/floppy/,,'`"
+ path="`echo "$filename" | sed 's,^/media/,,'`"
echo "Filename: $path" >> "$1"
echo >> "$1"
db_progress STEP 1
@@ -60,7 +58,7 @@ case "x$cmd" in
;;
xerror)
- umount $FLOPPYMNT || true
+ umount $MNT || true
T="retriever/floppy/error"
db_input critical "$T" || true
@@ -69,7 +67,7 @@ case "x$cmd" in
;;
xcleanup)
- umount $FLOPPYMNT || true
+ umount $MNT || true
rm -f /var/cache/anna/include
rm -f /var/cache/anna/exclude
;;
--
1.5.5.4
From 6c20506180bff5d784408d82e6587ed92c4ddae9 Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kodama.kitenet.net> Date: Fri, 20 Jun 2008 16:05:09 -0400 Subject: [PATCH] mountfloppy renamed Signed-off-by: Joey Hess <joey@kodama.kitenet.net> --- scripts/buildscript | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/buildscript b/scripts/buildscript index dee2dae..8242f7b 100755 --- a/scripts/buildscript +++ b/scripts/buildscript @@ -223,7 +223,7 @@ do_subdir packages/anna \ packages/lowmem \ packages/lvmcfg \ packages/main-menu \ - packages/mountfloppy \ + packages/mountexternal \ packages/netcfg \ packages/nobootloader \ packages/os-prober \ -- 1.5.5.4
From 55084b487eb10f91d88abed79fe79685aa21850a Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kodama.kitenet.net> Date: Fri, 20 Jun 2008 16:06:21 -0400 Subject: [PATCH] Use new mountmedia command instead of mountfloppy. Signed-off-by: Joey Hess <joey@kodama.kitenet.net> --- packages/installation-report/debian/changelog | 6 ++++++ .../installation-report/debian/save-logs.postinst | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/installation-report/debian/changelog b/packages/installation-report/debian/changelog index 57aa3b1..039829e 100644 --- a/packages/installation-report/debian/changelog +++ b/packages/installation-report/debian/changelog @@ -1,3 +1,9 @@ +installation-report (2.36) UNRELEASED; urgency=low + + * Use new mountmedia command instead of mountfloppy. + + -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 15:48:02 -0400 + installation-report (2.35) unstable; urgency=low [ Frans Pop ] diff --git a/packages/installation-report/debian/save-logs.postinst b/packages/installation-report/debian/save-logs.postinst index 43b3004..bd9a563 100755 --- a/packages/installation-report/debian/save-logs.postinst +++ b/packages/installation-report/debian/save-logs.postinst @@ -105,15 +105,15 @@ web) fi ;; floppy) - test -d /floppy || mkdir /floppy - umount /floppy 2>/dev/null || true + test -d /media || mkdir /media + umount /media 2>/dev/null || true db_input critical save-logs/insert_floppy || [ $? -eq 30 ] db_go - if mountfloppy ; then - save_logs /floppy - umount /floppy + if mountmedia floppy ; then + save_logs /media + umount /media db_progress STEP 1 db_progress STOP else -- 1.5.5.4
From cb541c6d19ce4cb108ef13796e90fa22964496a6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 16:06:57 -0400
Subject: [PATCH] Use new mountmedia command, instead of mountfloppy.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/kickseed/debian/changelog | 6 ++++++
packages/kickseed/initrd-kickseed | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/packages/kickseed/debian/changelog b/packages/kickseed/debian/changelog
index 7861164..ae876a4 100644
--- a/packages/kickseed/debian/changelog
+++ b/packages/kickseed/debian/changelog
@@ -1,3 +1,9 @@
+kickseed (0.50) UNRELEASED; urgency=low
+
+ * Use new mountmedia command, instead of mountfloppy.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 15:50:30 -0400
+
kickseed (0.49) unstable; urgency=low
* Adjust 'bootloader --md5pass' for changes in grub-installer 1.31
diff --git a/packages/kickseed/initrd-kickseed b/packages/kickseed/initrd-kickseed
index 24e374e..efb385e 100755
--- a/packages/kickseed/initrd-kickseed
+++ b/packages/kickseed/initrd-kickseed
@@ -101,8 +101,9 @@ esac
case $KSCFG in
/floppy/*)
- mountfloppy || true
- trap 'umount /floppy || true' EXIT HUP INT QUIT TERM
+ mountmedia floppy || true
+ KSCFG="/media/${KSCFG#/floppy/}"
+ trap 'umount /media || true' EXIT HUP INT QUIT TERM
;;
/media/*)
device="${KSCFG#/media/}"
--
1.5.5.4
From 280c73cd7663ff7a2405282ad5a4b7707f97d740 Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kodama.kitenet.net> Date: Fri, 20 Jun 2008 16:17:12 -0400 Subject: [PATCH] mountmedia mounts /media, not /floppy, so unmount the latter. Signed-off-by: Joey Hess <joey@kodama.kitenet.net> --- packages/preseed/README.preseed_fetch | 3 ++- packages/preseed/debian/changelog | 6 ++++++ packages/preseed/debian/file-preseed.postinst | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/preseed/README.preseed_fetch b/packages/preseed/README.preseed_fetch index 77da67b..94d03b0 100644 --- a/packages/preseed/README.preseed_fetch +++ b/packages/preseed/README.preseed_fetch @@ -41,7 +41,8 @@ file, and execute the protocol_fetch function defined therein. As seen with the floppy method, if special processing is needed to ensure that the files are available, this can be done thus: -floppy://foo/bar which mounts the floppy, then does a file copy from /floppy/foo/bar +floppy://foo/bar which mounts the floppy (to /media), then does a file copy +from /media/foo/bar BTW the value of preseed/last_location defaults to file:///, which should ensure vaguely normal behaviour if it is somehow invoked before diff --git a/packages/preseed/debian/changelog b/packages/preseed/debian/changelog index f5999ee..e3cca13 100644 --- a/packages/preseed/debian/changelog +++ b/packages/preseed/debian/changelog @@ -1,3 +1,9 @@ +preseed (1.38) UNRELEASED; urgency=low + + * mountmedia mounts /media, not /floppy, so unmount the latter. + + -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 16:15:37 -0400 + preseed (1.37) unstable; urgency=low [ Philip Hands ] diff --git a/packages/preseed/debian/file-preseed.postinst b/packages/preseed/debian/file-preseed.postinst index 0d16f3d..e99d9ba 100755 --- a/packages/preseed/debian/file-preseed.postinst +++ b/packages/preseed/debian/file-preseed.postinst @@ -15,6 +15,6 @@ preseed_command preseed/early_command # check if fetch-method/floppy has set a flag if [ -e /var/run/preseed-usedfloppy ]; then - umount /floppy || true + umount /media || true rm /var/run/preseed-usedfloppy fi -- 1.5.5.4
From 5e619316147388b2d2614c8d58f5d5e1e64010a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 16:33:33 -0400
Subject: [PATCH] rename floppy-retriver to media-retriever
Lots of strings had to change to talk generically about removable media
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
.../debian/floppy-retriever.templates | 12 ------
.../floppy-retriever/debian/load-floppy.templates | 36 -------------------
.../{floppy-retriever => media-retriever}/TODO | 0
.../debian/changelog | 5 ++-
.../debian/compat | 0
.../debian/control | 14 ++++----
.../debian/copyright | 2 +-
.../debian/load-media.postinst} | 19 +++++-----
.../media-retriever/debian/load-media.templates | 37 ++++++++++++++++++++
.../debian/media-retriever.templates | 12 ++++++
.../debian/po/POTFILES.in | 0
.../debian/po/am.po | 0
.../debian/po/ar.po | 0
.../debian/po/be.po | 0
.../debian/po/bg.po | 0
.../debian/po/bn.po | 0
.../debian/po/bs.po | 0
.../debian/po/ca.po | 0
.../debian/po/cs.po | 0
.../debian/po/da.po | 0
.../debian/po/de.po | 0
.../debian/po/dz.po | 0
.../debian/po/el.po | 0
.../debian/po/eo.po | 0
.../debian/po/es.po | 0
.../debian/po/et.po | 0
.../debian/po/eu.po | 0
.../debian/po/fi.po | 0
.../debian/po/fr.po | 0
.../debian/po/gl.po | 0
.../debian/po/gu.po | 0
.../debian/po/he.po | 0
.../debian/po/hi.po | 0
.../debian/po/hr.po | 0
.../debian/po/hu.po | 0
.../debian/po/id.po | 0
.../debian/po/it.po | 0
.../debian/po/ja.po | 0
.../debian/po/ka.po | 0
.../debian/po/km.po | 0
.../debian/po/ko.po | 0
.../debian/po/ku.po | 0
.../debian/po/lt.po | 0
.../debian/po/lv.po | 0
.../debian/po/mk.po | 0
.../debian/po/ml.po | 0
.../debian/po/mr.po | 0
.../debian/po/nb.po | 0
.../debian/po/ne.po | 0
.../debian/po/nl.po | 0
.../debian/po/nn.po | 0
.../debian/po/output | 0
.../debian/po/pa.po | 0
.../debian/po/pl.po | 0
.../debian/po/pt.po | 0
.../debian/po/pt_BR.po | 0
.../debian/po/ro.po | 0
.../debian/po/ru.po | 0
.../debian/po/sk.po | 0
.../debian/po/sl.po | 0
.../debian/po/sq.po | 0
.../debian/po/sv.po | 0
.../debian/po/ta.po | 0
.../debian/po/templates.pot | 0
.../debian/po/th.po | 0
.../debian/po/tl.po | 0
.../debian/po/tr.po | 0
.../debian/po/uk.po | 0
.../debian/po/vi.po | 0
.../debian/po/wo.po | 0
.../debian/po/zh_CN.po | 0
.../debian/po/zh_TW.po | 0
.../debian/rules | 2 +-
.../debian/source.lintian-overrides | 0
.../media-retriever} | 4 +-
75 files changed, 73 insertions(+), 70 deletions(-)
delete mode 100644 packages/floppy-retriever/debian/floppy-retriever.templates
delete mode 100644 packages/floppy-retriever/debian/load-floppy.templates
rename packages/{floppy-retriever => media-retriever}/TODO (100%)
rename packages/{floppy-retriever => media-retriever}/debian/changelog (99%)
rename packages/{floppy-retriever => media-retriever}/debian/compat (100%)
rename packages/{floppy-retriever => media-retriever}/debian/control (61%)
rename packages/{floppy-retriever => media-retriever}/debian/copyright (73%)
rename packages/{floppy-retriever/debian/load-floppy.postinst => media-retriever/debian/load-media.postinst} (84%)
create mode 100644 packages/media-retriever/debian/load-media.templates
create mode 100644 packages/media-retriever/debian/media-retriever.templates
rename packages/{floppy-retriever => media-retriever}/debian/po/POTFILES.in (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/am.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ar.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/be.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/bg.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/bn.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/bs.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ca.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/cs.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/da.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/de.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/dz.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/el.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/eo.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/es.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/et.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/eu.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/fi.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/fr.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/gl.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/gu.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/he.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/hi.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/hr.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/hu.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/id.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/it.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ja.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ka.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/km.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ko.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ku.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/lt.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/lv.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/mk.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ml.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/mr.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/nb.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ne.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/nl.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/nn.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/output (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/pa.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/pl.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/pt.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/pt_BR.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ro.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ru.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/sk.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/sl.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/sq.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/sv.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/ta.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/templates.pot (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/th.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/tl.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/tr.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/uk.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/vi.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/wo.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/zh_CN.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/po/zh_TW.po (100%)
rename packages/{floppy-retriever => media-retriever}/debian/rules (86%)
rename packages/{floppy-retriever => media-retriever}/debian/source.lintian-overrides (100%)
rename packages/{floppy-retriever/floppy-retriever => media-retriever/media-retriever} (93%)
diff --git a/packages/floppy-retriever/debian/floppy-retriever.templates b/packages/floppy-retriever/debian/floppy-retriever.templates
deleted file mode 100644
index 703e662..0000000
--- a/packages/floppy-retriever/debian/floppy-retriever.templates
+++ /dev/null
@@ -1,12 +0,0 @@
-Template: retriever/floppy/packages/progress
-Type: text
-# :sl2:
-_Description: Scanning the floppy
-
-Template: retriever/floppy/error
-Type: text
-# :sl2:
-_Description: Cannot read floppy, or not a driver floppy.
- There was a problem reading data from the floppy disk. Please make sure
- that the right floppy is in the drive. If you continue to have trouble,
- you may have a bad floppy disk.
diff --git a/packages/floppy-retriever/debian/load-floppy.templates b/packages/floppy-retriever/debian/load-floppy.templates
deleted file mode 100644
index 44ff449..0000000
--- a/packages/floppy-retriever/debian/load-floppy.templates
+++ /dev/null
@@ -1,36 +0,0 @@
-Template: retriever/floppy/loadnow
-Type: boolean
-Default: true
-_Description: Load drivers from floppy now?
- You probably need to load drivers from a floppy before continuing with the
- installation. If you know that the install will work without extra
- drivers, you can skip this step.
- .
- If you do need to load drivers, insert the appropriate driver floppy
- before continuing.
-
-Template: debian-installer/load-floppy/title
-Type: text
-# main-menu
-_Description: Load drivers from a floppy
-
-Template: retriever/floppy/unknown
-Type: boolean
-Default: false
-_Description: Unknown floppy. Try to load anyway?
- The floppy is not a known driver floppy. Please make sure that the correct
- floppy is in the drive. You can still continue if you have an unofficial
- floppy you want to use.
-
-Template: retriever/floppy/warning
-Type: text
-_Description: Please insert ${DISK_LABEL} ('${DISK_NAME}') first.
- Due to dependencies between packages, driver floppies must be loaded
- in the correct order.
-
-Template: retriever/floppy/loadanother
-Type: boolean
-Default: true
-_Description: Load drivers from another floppy?
- To load additional drivers from another floppy, please insert the appropriate
- driver floppy before continuing.
diff --git a/packages/floppy-retriever/TODO b/packages/media-retriever/TODO
similarity index 100%
rename from packages/floppy-retriever/TODO
rename to packages/media-retriever/TODO
diff --git a/packages/floppy-retriever/debian/changelog b/packages/media-retriever/debian/changelog
similarity index 99%
rename from packages/floppy-retriever/debian/changelog
rename to packages/media-retriever/debian/changelog
index 8335e67..88066c9 100644
--- a/packages/floppy-retriever/debian/changelog
+++ b/packages/media-retriever/debian/changelog
@@ -1,4 +1,4 @@
-floppy-retriever (1.18) UNRELEASED; urgency=low
+media-retriever (1.18) UNRELEASED; urgency=low
[ Frans Pop ]
* Remove Martin Sjogren as Uploader with many thanks for his past
@@ -8,6 +8,9 @@ floppy-retriever (1.18) UNRELEASED; urgency=low
* Pass "driver" to mountfloppy to let it know that we're looking for a
driver floppy.
* Use the new mountmedia command instead of mountfloppy.
+ * Since mountmedia can find drivers on other media than floppies,
+ the package name is no longer accurate. Rename it.
+ * Change floppy-specific strings, etc too.
-- Frans Pop <fjp@debian.org> Tue, 08 Apr 2008 13:28:29 +0200
diff --git a/packages/floppy-retriever/debian/compat b/packages/media-retriever/debian/compat
similarity index 100%
rename from packages/floppy-retriever/debian/compat
rename to packages/media-retriever/debian/compat
diff --git a/packages/floppy-retriever/debian/control b/packages/media-retriever/debian/control
similarity index 61%
rename from packages/floppy-retriever/debian/control
rename to packages/media-retriever/debian/control
index e67d9f3..d9f0244 100644
--- a/packages/floppy-retriever/debian/control
+++ b/packages/media-retriever/debian/control
@@ -1,23 +1,23 @@
-Source: floppy-retriever
+Source: media-retriever
Section: debian-installer
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org>
Build-Depends: debhelper (>= 4.2)
Build-Depends-Indep: dpkg-dev (>= 1.7.0), po-debconf (>= 0.5.0)
-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/floppy-retriever
+Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/media-retriever
-Package: floppy-retriever
+Package: media-retriever
XC-Package-Type: udeb
Architecture: all
Depends: ${misc:Depends}, mountmedia
Provides: retriever
-Description: Fetches modules from a floppy
+Description: Fetches modules from removable media
-Package: load-floppy
+Package: load-media
XC-Package-Type: udeb
Architecture: all
Priority: extra
-Depends: ${misc:Depends}, floppy-retriever, anna
+Depends: ${misc:Depends}, media-retriever, anna
XB-installer-menu-item: 1100
-Description: Load installer components from a floppy
+Description: Load installer components from removable media
diff --git a/packages/floppy-retriever/debian/copyright b/packages/media-retriever/debian/copyright
similarity index 73%
rename from packages/floppy-retriever/debian/copyright
rename to packages/media-retriever/debian/copyright
index c904e53..a724fec 100644
--- a/packages/floppy-retriever/debian/copyright
+++ b/packages/media-retriever/debian/copyright
@@ -1,4 +1,4 @@
-The floppy retriever is copyright 2002 by Martin Sjögren <md9ms@mdstud.chalmers.se>.
+This package copyright 2002 by Martin Sj?gren <md9ms@mdstud.chalmers.se>.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
diff --git a/packages/floppy-retriever/debian/load-floppy.postinst b/packages/media-retriever/debian/load-media.postinst
similarity index 84%
rename from packages/floppy-retriever/debian/load-floppy.postinst
rename to packages/media-retriever/debian/load-media.postinst
index 4fb7adb..4a9e190 100755
--- a/packages/floppy-retriever/debian/load-floppy.postinst
+++ b/packages/media-retriever/debian/load-media.postinst
@@ -4,7 +4,7 @@ set -e
. /usr/share/debconf/confmodule
log() {
- logger -t load-floppy "$@"
+ logger -t load-media "$@"
}
warning() {
log "warning: $@"
@@ -16,10 +16,10 @@ MNT=/media
# and calling eject-floppy isn't the best way to go..
eject /dev/fd0 >/dev/null 2>&1 || true
-T=retriever/floppy/loadnow
-A=retriever/floppy/loadanother
-U=retriever/floppy/unknown
-W=retriever/floppy/warning
+T=retriever/media/loadnow
+A=retriever/media/loadanother
+U=retriever/media/unknown
+W=retriever/media/warning
Q=$T
Q_default=true
@@ -45,7 +45,7 @@ while true; do
fi
umount $MNT
- # a floppy disk_N (N>=2) must be loaded after disk_N-1
+ # a disk_N (N>=2) must be loaded after disk_N-1
disk_name=$(echo $label | cut -d':' -f1)
disk_type=$(echo $label | cut -d':' -f2)
disk_nb=$(echo $label | cut -d':' -f3)
@@ -63,7 +63,7 @@ while true; do
db_go
else
# DISK OK
- anna floppy-retriever
+ anna media-retriever
old_disk_type="$disk_type"
Q=$A
if [ ! "$disk_nb" ] || [ $disk_nb -eq 2 ]; then
@@ -71,14 +71,13 @@ while true; do
fi
fi
else
- # UNKNOWN FLOPPY
- warning "Unknown floppy present"
+ warning "Unknown media present"
db_set $U false || true
db_input critical $U || true
db_go
db_get $U
if [ "$RET" = true ]; then
- anna floppy-retriever
+ anna media-retriever
old_disk_type=""
Q=$A
Q_default=false
diff --git a/packages/media-retriever/debian/load-media.templates b/packages/media-retriever/debian/load-media.templates
new file mode 100644
index 0000000..e7b5cd8
--- /dev/null
+++ b/packages/media-retriever/debian/load-media.templates
@@ -0,0 +1,37 @@
+Template: retriever/media/loadnow
+Type: boolean
+Default: true
+_Description: Load drivers from removable media now?
+ You probably need to load drivers from removable media before continuing
+ with the installation. If you know that the install will work without extra
+ drivers, you can skip this step.
+ .
+ If you do need to load drivers, insert the appropriate removable media,
+ such as a driver floppy or USB stick before continuing.
+
+Template: debian-installer/load-media/title
+Type: text
+# main-menu
+_Description: Load drivers from removable media
+
+Template: retriever/media/unknown
+Type: boolean
+Default: false
+_Description: Unknown removable media. Try to load anyway?
+ Detected removable media that is not a known driver media. Please make sure
+ that the correct media is inserted. You can still continue if you have an
+ unofficial removable media you want to use.
+
+Template: retriever/media/warning
+Type: text
+_Description: Please insert ${DISK_LABEL} ('${DISK_NAME}') first.
+ Due to dependencies between packages, drivers must be loaded
+ in the correct order.
+
+Template: retriever/media/loadanother
+Type: boolean
+Default: true
+_Description: Load drivers from another removable media?
+ To load additional drivers from another removable media, please insert
+ the appropriate removable media, such as a driver floppy or USB stick
+ before continuing.
diff --git a/packages/media-retriever/debian/media-retriever.templates b/packages/media-retriever/debian/media-retriever.templates
new file mode 100644
index 0000000..a575257
--- /dev/null
+++ b/packages/media-retriever/debian/media-retriever.templates
@@ -0,0 +1,12 @@
+Template: retriever/media/packages/progress
+Type: text
+# :sl2:
+_Description: Scanning removable media
+
+Template: retriever/media/error
+Type: text
+# :sl2:
+_Description: Cannot read removable media, or no drivers found.
+ There was a problem reading data from the removable media. Please make sure
+ that the right media is present. If you continue to have trouble, your
+ removable media might be bad.
diff --git a/packages/floppy-retriever/debian/po/POTFILES.in b/packages/media-retriever/debian/po/POTFILES.in
similarity index 100%
rename from packages/floppy-retriever/debian/po/POTFILES.in
rename to packages/media-retriever/debian/po/POTFILES.in
diff --git a/packages/floppy-retriever/debian/po/am.po b/packages/media-retriever/debian/po/am.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/am.po
rename to packages/media-retriever/debian/po/am.po
diff --git a/packages/floppy-retriever/debian/po/ar.po b/packages/media-retriever/debian/po/ar.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ar.po
rename to packages/media-retriever/debian/po/ar.po
diff --git a/packages/floppy-retriever/debian/po/be.po b/packages/media-retriever/debian/po/be.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/be.po
rename to packages/media-retriever/debian/po/be.po
diff --git a/packages/floppy-retriever/debian/po/bg.po b/packages/media-retriever/debian/po/bg.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/bg.po
rename to packages/media-retriever/debian/po/bg.po
diff --git a/packages/floppy-retriever/debian/po/bn.po b/packages/media-retriever/debian/po/bn.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/bn.po
rename to packages/media-retriever/debian/po/bn.po
diff --git a/packages/floppy-retriever/debian/po/bs.po b/packages/media-retriever/debian/po/bs.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/bs.po
rename to packages/media-retriever/debian/po/bs.po
diff --git a/packages/floppy-retriever/debian/po/ca.po b/packages/media-retriever/debian/po/ca.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ca.po
rename to packages/media-retriever/debian/po/ca.po
diff --git a/packages/floppy-retriever/debian/po/cs.po b/packages/media-retriever/debian/po/cs.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/cs.po
rename to packages/media-retriever/debian/po/cs.po
diff --git a/packages/floppy-retriever/debian/po/da.po b/packages/media-retriever/debian/po/da.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/da.po
rename to packages/media-retriever/debian/po/da.po
diff --git a/packages/floppy-retriever/debian/po/de.po b/packages/media-retriever/debian/po/de.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/de.po
rename to packages/media-retriever/debian/po/de.po
diff --git a/packages/floppy-retriever/debian/po/dz.po b/packages/media-retriever/debian/po/dz.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/dz.po
rename to packages/media-retriever/debian/po/dz.po
diff --git a/packages/floppy-retriever/debian/po/el.po b/packages/media-retriever/debian/po/el.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/el.po
rename to packages/media-retriever/debian/po/el.po
diff --git a/packages/floppy-retriever/debian/po/eo.po b/packages/media-retriever/debian/po/eo.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/eo.po
rename to packages/media-retriever/debian/po/eo.po
diff --git a/packages/floppy-retriever/debian/po/es.po b/packages/media-retriever/debian/po/es.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/es.po
rename to packages/media-retriever/debian/po/es.po
diff --git a/packages/floppy-retriever/debian/po/et.po b/packages/media-retriever/debian/po/et.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/et.po
rename to packages/media-retriever/debian/po/et.po
diff --git a/packages/floppy-retriever/debian/po/eu.po b/packages/media-retriever/debian/po/eu.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/eu.po
rename to packages/media-retriever/debian/po/eu.po
diff --git a/packages/floppy-retriever/debian/po/fi.po b/packages/media-retriever/debian/po/fi.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/fi.po
rename to packages/media-retriever/debian/po/fi.po
diff --git a/packages/floppy-retriever/debian/po/fr.po b/packages/media-retriever/debian/po/fr.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/fr.po
rename to packages/media-retriever/debian/po/fr.po
diff --git a/packages/floppy-retriever/debian/po/gl.po b/packages/media-retriever/debian/po/gl.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/gl.po
rename to packages/media-retriever/debian/po/gl.po
diff --git a/packages/floppy-retriever/debian/po/gu.po b/packages/media-retriever/debian/po/gu.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/gu.po
rename to packages/media-retriever/debian/po/gu.po
diff --git a/packages/floppy-retriever/debian/po/he.po b/packages/media-retriever/debian/po/he.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/he.po
rename to packages/media-retriever/debian/po/he.po
diff --git a/packages/floppy-retriever/debian/po/hi.po b/packages/media-retriever/debian/po/hi.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/hi.po
rename to packages/media-retriever/debian/po/hi.po
diff --git a/packages/floppy-retriever/debian/po/hr.po b/packages/media-retriever/debian/po/hr.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/hr.po
rename to packages/media-retriever/debian/po/hr.po
diff --git a/packages/floppy-retriever/debian/po/hu.po b/packages/media-retriever/debian/po/hu.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/hu.po
rename to packages/media-retriever/debian/po/hu.po
diff --git a/packages/floppy-retriever/debian/po/id.po b/packages/media-retriever/debian/po/id.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/id.po
rename to packages/media-retriever/debian/po/id.po
diff --git a/packages/floppy-retriever/debian/po/it.po b/packages/media-retriever/debian/po/it.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/it.po
rename to packages/media-retriever/debian/po/it.po
diff --git a/packages/floppy-retriever/debian/po/ja.po b/packages/media-retriever/debian/po/ja.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ja.po
rename to packages/media-retriever/debian/po/ja.po
diff --git a/packages/floppy-retriever/debian/po/ka.po b/packages/media-retriever/debian/po/ka.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ka.po
rename to packages/media-retriever/debian/po/ka.po
diff --git a/packages/floppy-retriever/debian/po/km.po b/packages/media-retriever/debian/po/km.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/km.po
rename to packages/media-retriever/debian/po/km.po
diff --git a/packages/floppy-retriever/debian/po/ko.po b/packages/media-retriever/debian/po/ko.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ko.po
rename to packages/media-retriever/debian/po/ko.po
diff --git a/packages/floppy-retriever/debian/po/ku.po b/packages/media-retriever/debian/po/ku.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ku.po
rename to packages/media-retriever/debian/po/ku.po
diff --git a/packages/floppy-retriever/debian/po/lt.po b/packages/media-retriever/debian/po/lt.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/lt.po
rename to packages/media-retriever/debian/po/lt.po
diff --git a/packages/floppy-retriever/debian/po/lv.po b/packages/media-retriever/debian/po/lv.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/lv.po
rename to packages/media-retriever/debian/po/lv.po
diff --git a/packages/floppy-retriever/debian/po/mk.po b/packages/media-retriever/debian/po/mk.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/mk.po
rename to packages/media-retriever/debian/po/mk.po
diff --git a/packages/floppy-retriever/debian/po/ml.po b/packages/media-retriever/debian/po/ml.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ml.po
rename to packages/media-retriever/debian/po/ml.po
diff --git a/packages/floppy-retriever/debian/po/mr.po b/packages/media-retriever/debian/po/mr.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/mr.po
rename to packages/media-retriever/debian/po/mr.po
diff --git a/packages/floppy-retriever/debian/po/nb.po b/packages/media-retriever/debian/po/nb.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/nb.po
rename to packages/media-retriever/debian/po/nb.po
diff --git a/packages/floppy-retriever/debian/po/ne.po b/packages/media-retriever/debian/po/ne.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ne.po
rename to packages/media-retriever/debian/po/ne.po
diff --git a/packages/floppy-retriever/debian/po/nl.po b/packages/media-retriever/debian/po/nl.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/nl.po
rename to packages/media-retriever/debian/po/nl.po
diff --git a/packages/floppy-retriever/debian/po/nn.po b/packages/media-retriever/debian/po/nn.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/nn.po
rename to packages/media-retriever/debian/po/nn.po
diff --git a/packages/floppy-retriever/debian/po/output b/packages/media-retriever/debian/po/output
similarity index 100%
rename from packages/floppy-retriever/debian/po/output
rename to packages/media-retriever/debian/po/output
diff --git a/packages/floppy-retriever/debian/po/pa.po b/packages/media-retriever/debian/po/pa.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/pa.po
rename to packages/media-retriever/debian/po/pa.po
diff --git a/packages/floppy-retriever/debian/po/pl.po b/packages/media-retriever/debian/po/pl.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/pl.po
rename to packages/media-retriever/debian/po/pl.po
diff --git a/packages/floppy-retriever/debian/po/pt.po b/packages/media-retriever/debian/po/pt.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/pt.po
rename to packages/media-retriever/debian/po/pt.po
diff --git a/packages/floppy-retriever/debian/po/pt_BR.po b/packages/media-retriever/debian/po/pt_BR.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/pt_BR.po
rename to packages/media-retriever/debian/po/pt_BR.po
diff --git a/packages/floppy-retriever/debian/po/ro.po b/packages/media-retriever/debian/po/ro.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ro.po
rename to packages/media-retriever/debian/po/ro.po
diff --git a/packages/floppy-retriever/debian/po/ru.po b/packages/media-retriever/debian/po/ru.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ru.po
rename to packages/media-retriever/debian/po/ru.po
diff --git a/packages/floppy-retriever/debian/po/sk.po b/packages/media-retriever/debian/po/sk.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/sk.po
rename to packages/media-retriever/debian/po/sk.po
diff --git a/packages/floppy-retriever/debian/po/sl.po b/packages/media-retriever/debian/po/sl.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/sl.po
rename to packages/media-retriever/debian/po/sl.po
diff --git a/packages/floppy-retriever/debian/po/sq.po b/packages/media-retriever/debian/po/sq.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/sq.po
rename to packages/media-retriever/debian/po/sq.po
diff --git a/packages/floppy-retriever/debian/po/sv.po b/packages/media-retriever/debian/po/sv.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/sv.po
rename to packages/media-retriever/debian/po/sv.po
diff --git a/packages/floppy-retriever/debian/po/ta.po b/packages/media-retriever/debian/po/ta.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/ta.po
rename to packages/media-retriever/debian/po/ta.po
diff --git a/packages/floppy-retriever/debian/po/templates.pot b/packages/media-retriever/debian/po/templates.pot
similarity index 100%
rename from packages/floppy-retriever/debian/po/templates.pot
rename to packages/media-retriever/debian/po/templates.pot
diff --git a/packages/floppy-retriever/debian/po/th.po b/packages/media-retriever/debian/po/th.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/th.po
rename to packages/media-retriever/debian/po/th.po
diff --git a/packages/floppy-retriever/debian/po/tl.po b/packages/media-retriever/debian/po/tl.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/tl.po
rename to packages/media-retriever/debian/po/tl.po
diff --git a/packages/floppy-retriever/debian/po/tr.po b/packages/media-retriever/debian/po/tr.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/tr.po
rename to packages/media-retriever/debian/po/tr.po
diff --git a/packages/floppy-retriever/debian/po/uk.po b/packages/media-retriever/debian/po/uk.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/uk.po
rename to packages/media-retriever/debian/po/uk.po
diff --git a/packages/floppy-retriever/debian/po/vi.po b/packages/media-retriever/debian/po/vi.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/vi.po
rename to packages/media-retriever/debian/po/vi.po
diff --git a/packages/floppy-retriever/debian/po/wo.po b/packages/media-retriever/debian/po/wo.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/wo.po
rename to packages/media-retriever/debian/po/wo.po
diff --git a/packages/floppy-retriever/debian/po/zh_CN.po b/packages/media-retriever/debian/po/zh_CN.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/zh_CN.po
rename to packages/media-retriever/debian/po/zh_CN.po
diff --git a/packages/floppy-retriever/debian/po/zh_TW.po b/packages/media-retriever/debian/po/zh_TW.po
similarity index 100%
rename from packages/floppy-retriever/debian/po/zh_TW.po
rename to packages/media-retriever/debian/po/zh_TW.po
diff --git a/packages/floppy-retriever/debian/rules b/packages/media-retriever/debian/rules
similarity index 86%
rename from packages/floppy-retriever/debian/rules
rename to packages/media-retriever/debian/rules
index e33e14c..bdebab7 100755
--- a/packages/floppy-retriever/debian/rules
+++ b/packages/media-retriever/debian/rules
@@ -12,7 +12,7 @@ install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_install floppy-retriever usr/lib/debian-installer/retriever
+ dh_install media-retriever usr/lib/debian-installer/retriever
binary-arch: build install
diff --git a/packages/floppy-retriever/debian/source.lintian-overrides b/packages/media-retriever/debian/source.lintian-overrides
similarity index 100%
rename from packages/floppy-retriever/debian/source.lintian-overrides
rename to packages/media-retriever/debian/source.lintian-overrides
diff --git a/packages/floppy-retriever/floppy-retriever b/packages/media-retriever/media-retriever
similarity index 93%
rename from packages/floppy-retriever/floppy-retriever
rename to packages/media-retriever/media-retriever
index dca58db..3df8bec 100755
--- a/packages/floppy-retriever/floppy-retriever
+++ b/packages/media-retriever/media-retriever
@@ -46,7 +46,7 @@ case "x$cmd" in
exit 1
fi
# This could take a while, so a progress bar.
- db_progress START 0 $FILE_COUNT retriever/floppy/packages/progress
+ db_progress START 0 $FILE_COUNT retriever/media/packages/progress
for filename in $FILES; do
udpkg -f "$filename" | sed 's/Priority: .*/Priority: standard/' >> "$1"
path="`echo "$filename" | sed 's,^/media/,,'`"
@@ -60,7 +60,7 @@ case "x$cmd" in
xerror)
umount $MNT || true
- T="retriever/floppy/error"
+ T="retriever/media/error"
db_input critical "$T" || true
db_go
exit 2
--
1.5.5.4
From 9799b4835a09be426264c7735d03b156af133507 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 16:36:46 -0400
Subject: [PATCH] floppy-retriever renamed to media-retriever
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
installer/build/pkg-lists/cdrom-apus/common | 2 +-
installer/build/pkg-lists/cdrom/common | 2 +-
installer/build/pkg-lists/floppy-ng/common | 2 +-
installer/build/pkg-lists/floppy/common | 2 +-
installer/build/pkg-lists/netboot/alpha.cfg | 2 +-
installer/build/pkg-lists/netboot/amd64.cfg | 2 +-
installer/build/pkg-lists/netboot/i386.cfg | 2 +-
installer/build/pkg-lists/netboot/powerpc.cfg | 2 +-
installer/build/pkg-lists/netboot/ppc64.cfg | 2 +-
installer/debian/changelog | 1 +
installer/doc/devel/installation-reports.txt | 2 +-
installer/doc/devel/retriever.txt | 11 ++++++-----
12 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/installer/build/pkg-lists/cdrom-apus/common b/installer/build/pkg-lists/cdrom-apus/common
index e583eed..b733002 100644
--- a/installer/build/pkg-lists/cdrom-apus/common
+++ b/installer/build/pkg-lists/cdrom-apus/common
@@ -19,7 +19,7 @@ nano-udeb
# This is so additional modules (eg, scsi) can be loaded from driver
# floppies. cdrom-detect will use it.
-floppy-retriever
+media-retriever
save-logs
mountmedia
diff --git a/installer/build/pkg-lists/cdrom/common b/installer/build/pkg-lists/cdrom/common
index e8feab2..3f1d40d 100644
--- a/installer/build/pkg-lists/cdrom/common
+++ b/installer/build/pkg-lists/cdrom/common
@@ -24,7 +24,7 @@ nano-udeb
# This is so additional modules (eg, scsi) can be loaded from driver
# floppies. cdrom-detect will use it.
-floppy-retriever
+media-retriever
save-logs
mountmedia
diff --git a/installer/build/pkg-lists/floppy-ng/common b/installer/build/pkg-lists/floppy-ng/common
index 9916435..4b67203 100644
--- a/installer/build/pkg-lists/floppy-ng/common
+++ b/installer/build/pkg-lists/floppy-ng/common
@@ -22,7 +22,7 @@ nano-udeb
# floppy loading support
load-floppy
-floppy-retriever
+media-retriever
preseed-common
initrd-preseed
diff --git a/installer/build/pkg-lists/floppy/common b/installer/build/pkg-lists/floppy/common
index 9916435..4b67203 100644
--- a/installer/build/pkg-lists/floppy/common
+++ b/installer/build/pkg-lists/floppy/common
@@ -22,7 +22,7 @@ nano-udeb
# floppy loading support
load-floppy
-floppy-retriever
+media-retriever
preseed-common
initrd-preseed
diff --git a/installer/build/pkg-lists/netboot/alpha.cfg b/installer/build/pkg-lists/netboot/alpha.cfg
index 319cb0e..5633687 100644
--- a/installer/build/pkg-lists/netboot/alpha.cfg
+++ b/installer/build/pkg-lists/netboot/alpha.cfg
@@ -16,7 +16,7 @@ netcfg
# In case they need to load a driver floppy.
mountmedia
-floppy-retriever
+media-retriever
fat-modules-${kernel:Version}
# This is needed for proper display of utf-8.
diff --git a/installer/build/pkg-lists/netboot/amd64.cfg b/installer/build/pkg-lists/netboot/amd64.cfg
index d5e8678..12e56df 100644
--- a/installer/build/pkg-lists/netboot/amd64.cfg
+++ b/installer/build/pkg-lists/netboot/amd64.cfg
@@ -16,7 +16,7 @@ fb-modules-${kernel:Version}
# In case they need to load a driver floppy.
mountmedia
-floppy-retriever
+media-retriever
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/i386.cfg b/installer/build/pkg-lists/netboot/i386.cfg
index 9bb98a3..c17f509 100644
--- a/installer/build/pkg-lists/netboot/i386.cfg
+++ b/installer/build/pkg-lists/netboot/i386.cfg
@@ -15,7 +15,7 @@ kbd-chooser
fb-modules-${kernel:Version}
# In case they need to load a driver floppy.
-floppy-retriever
+media-retriever
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/powerpc.cfg b/installer/build/pkg-lists/netboot/powerpc.cfg
index 8116863..0c958bb 100644
--- a/installer/build/pkg-lists/netboot/powerpc.cfg
+++ b/installer/build/pkg-lists/netboot/powerpc.cfg
@@ -7,7 +7,7 @@ socket-modules-${kernel:Version} ?
nic-pcmcia-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
mountmedia
-floppy-retriever
+media-retriever
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 577d332..f0663cf 100644
--- a/installer/build/pkg-lists/netboot/ppc64.cfg
+++ b/installer/build/pkg-lists/netboot/ppc64.cfg
@@ -7,7 +7,7 @@ socket-modules-${kernel:Version} ?
nic-pcmcia-modules-${kernel:Version}
pcmcia-modules-${kernel:Version}
mountmedia
-floppy-retriever
+media-retriever
pcmciautils-udeb
floppy-modules-${kernel:Version}
#fb-modules-${kernel:Version}
diff --git a/installer/debian/changelog b/installer/debian/changelog
index 63fa67b..eb6b52d 100644
--- a/installer/debian/changelog
+++ b/installer/debian/changelog
@@ -23,6 +23,7 @@ debian-installer (2008xxxx) UNRELEASED; urgency=low
[ Joey Hess ]
* mountfloppy renamed to mountmedia
+ * floppy-retriever renamed to media-retriever
-- Frans Pop <fjp@debian.org> Sat, 07 Jun 2008 12:47:20 +0200
diff --git a/installer/doc/devel/installation-reports.txt b/installer/doc/devel/installation-reports.txt
index 79752b2..ede689e 100644
--- a/installer/doc/devel/installation-reports.txt
+++ b/installer/doc/devel/installation-reports.txt
@@ -272,7 +272,7 @@ drive at all, that's a place to look too.
Load installer modules: [ ]
Depending on the type of install, the actual retrieval of the d-i udebs
-will be done by one of cdrom-retriever, net-retriever, or floppy-retriever.
+will be done by one of cdrom-retriever, net-retriever, or media-retriever.
They are all controlled by anna (from the package by that name).
It's more likely that problems in this area have to do with bad media, or
diff --git a/installer/doc/devel/retriever.txt b/installer/doc/devel/retriever.txt
index fe1a07f..d212440 100644
--- a/installer/doc/devel/retriever.txt
+++ b/installer/doc/devel/retriever.txt
@@ -8,9 +8,10 @@ following types will eventually be implemented:
- cd retriever
Ensures an install cd is mounted, and finds files on it. No real
retrieving done.
-- floppy retriever
+- media retriever
+ Handles all sorts of external media, including floppies.
May or may not need to deal with files split across multiple
- floppies. In any case, pulls files off floppies.
+ floppies.
- hard disk retriever
Gets a file from a local hard disk (dos, linux, etc).
- http retriever
@@ -43,7 +44,7 @@ while the cdrom retriever may need to depend on module(s) that include kernel
modules for the iso9660 filesystem and cd drivers.
Retrievers may also need to interact with the user when they are retrieving
-a file. For example, the floppy retriever will need to prompt for disks.
+a file. For example, the media retriever will need to prompt for disks.
This interaction will also be accomplished via debconf.
Retriever interface
@@ -105,7 +106,7 @@ retriever error failing_command
but all retreivers should support it now.
retriever cleanup
- Clean up after a retriever round. This is used by e.g. the floppy
+ Clean up after a retriever round. This is used by e.g. the media
retriever to unmount the floppy.
If the destination file already exists, the retriever may optionally attempt
@@ -139,7 +140,7 @@ The default retriever (if more than one is available, and it's the first
time the question is asked) will be, in turn and if they exist:
1. net-retriever (if you've got connectivity you probably want to use it)
2. cdrom-retriever (using a CD is also very common)
- 3. floppy-retriever (we usually don't have to use the floppy)
+ 3. media-retriever (we usually don't have to use the floppy)
(4. file-retriever? not currently used, but if resurrected, should
probably have lower priority than the floppy
retriever)
--
1.5.5.4
From 780080c9972021a36c52238fcad373f96433170a Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kodama.kitenet.net> Date: Fri, 20 Jun 2008 16:39:29 -0400 Subject: [PATCH] floppy-retriever renamed to media-retriever Change wording of question since drivers can now be loaded from other media than floppies. Signed-off-by: Joey Hess <joey@kodama.kitenet.net> --- packages/cdrom-detect/debian/cdrom-detect.postinst | 8 ++++---- .../cdrom-detect/debian/cdrom-detect.templates | 8 ++++---- packages/cdrom-detect/debian/changelog | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/packages/cdrom-detect/debian/cdrom-detect.postinst b/packages/cdrom-detect/debian/cdrom-detect.postinst index d0cce91..da0c1bb 100755 --- a/packages/cdrom-detect/debian/cdrom-detect.postinst +++ b/packages/cdrom-detect/debian/cdrom-detect.postinst @@ -63,12 +63,12 @@ do fi # If no device was detected, perhaps a driver floppy is needed. - if [ -e /usr/lib/debian-installer/retriever/floppy-retriever ]; then - db_input critical cdrom-detect/load_floppy + if [ -e /usr/lib/debian-installer/retriever/media-retriever ]; then + db_input critical cdrom-detect/load_media db_go - db_get cdrom-detect/load_floppy + db_get cdrom-detect/load_media if [ "$RET" = true ]; then - anna floppy-retriever + anna media-retriever hw-detect cdrom-detect/detect_progress_title || true continue fi diff --git a/packages/cdrom-detect/debian/cdrom-detect.templates b/packages/cdrom-detect/debian/cdrom-detect.templates index 299ce0d..878f474 100644 --- a/packages/cdrom-detect/debian/cdrom-detect.templates +++ b/packages/cdrom-detect/debian/cdrom-detect.templates @@ -1,12 +1,12 @@ -Template: cdrom-detect/load_floppy +Template: cdrom-detect/load_media Type: boolean Default: true # :sl2: -_Description: Load CD-ROM drivers from a driver floppy? +_Description: Load CD-ROM drivers from removable media? No common CD-ROM drive was detected. . - You may need to load additional CD-ROM drivers from a driver floppy. - If you have such a floppy available now, put it in the drive, and + You may need to load additional CD-ROM drivers from removable media, such as + a driver floppy. If you have such media available now, insert it, and continue. Otherwise, you will be given the option to manually select CD-ROM modules. diff --git a/packages/cdrom-detect/debian/changelog b/packages/cdrom-detect/debian/changelog index bd566e2..904c047 100644 --- a/packages/cdrom-detect/debian/changelog +++ b/packages/cdrom-detect/debian/changelog @@ -1,3 +1,11 @@ +cdrom-detect (1.29) UNRELEASED; urgency=low + + * floppy-retriever renamed to media-retriever. + * Change wording of question since drivers can now be loaded from other + media than floppies. + + -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 16:38:25 -0400 + cdrom-detect (1.28) unstable; urgency=low [ Frans Pop ] -- 1.5.5.4
From 18482d4ef2505388a17691c3b3e0ed864623e3ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 16:43:13 -0400
Subject: [PATCH] floppy-retriever renamed to media-retriever
Change wording of question since drivers can now be loaded from other
media than floppies.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/hw-detect/debian/changelog | 8 ++++++++
packages/hw-detect/debian/hw-detect.templates | 8 ++++----
packages/hw-detect/disk-detect.sh | 8 ++++----
packages/hw-detect/ethdetect.sh | 8 ++++----
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/packages/hw-detect/debian/changelog b/packages/hw-detect/debian/changelog
index ba9445b..96b71a6 100644
--- a/packages/hw-detect/debian/changelog
+++ b/packages/hw-detect/debian/changelog
@@ -1,3 +1,11 @@
+hw-detect (1.64) UNRELEASED; urgency=low
+
+ * floppy-retriever renamed to media-retriever.
+ * Change wording of question since drivers can now be loaded from other
+ media than floppies.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 16:42:06 -0400
+
hw-detect (1.63) unstable; urgency=low
[ Colin Watson, Frans Pop ]
diff --git a/packages/hw-detect/debian/hw-detect.templates b/packages/hw-detect/debian/hw-detect.templates
index 27ef841..5301467 100644
--- a/packages/hw-detect/debian/hw-detect.templates
+++ b/packages/hw-detect/debian/hw-detect.templates
@@ -61,14 +61,14 @@ Type: error
# :sl2:
_Description: Error while running '${CMD_LINE_PARAM}'
-Template: hw-detect/load_floppy
+Template: hw-detect/load_media
Type: boolean
Default: false
# :sl2:
-_Description: Load missing drivers from a driver floppy?
+_Description: Load missing drivers from removable media?
A driver for your hardware is not available. You may need
- to load drivers from a driver floppy. If you have such a floppy
- available now, put it in the drive before continuing.
+ to load drivers from removable media, such as a driver floppy.
+ If you have such media available now, insert it, and continue.
# Temporary template to force old behavior of loading IDE modules by default
Template: hw-detect/load-ide
diff --git a/packages/hw-detect/disk-detect.sh b/packages/hw-detect/disk-detect.sh
index f1875de..f95d195 100755
--- a/packages/hw-detect/disk-detect.sh
+++ b/packages/hw-detect/disk-detect.sh
@@ -140,16 +140,16 @@ while ! disk_found; do
fi
fi
- if [ -e /usr/lib/debian-installer/retriever/floppy-retriever ]; then
+ if [ -e /usr/lib/debian-installer/retriever/media-retriever ]; then
db_capb backup
- db_input critical hw-detect/load_floppy
+ db_input critical hw-detect/load_media
if ! db_go; then
exit 10
fi
db_capb
- db_get hw-detect/load_floppy
+ db_get hw-detect/load_media
if [ "$RET" = true ] && \
- anna floppy-retriever && \
+ anna media-retriever && \
hw-detect disk-detect/detect_progress_title; then
continue
fi
diff --git a/packages/hw-detect/ethdetect.sh b/packages/hw-detect/ethdetect.sh
index 14f3a80..5d8e41f 100755
--- a/packages/hw-detect/ethdetect.sh
+++ b/packages/hw-detect/ethdetect.sh
@@ -206,17 +206,17 @@ while ! ethernet_found; do
fi
fi
- if [ -e /usr/lib/debian-installer/retriever/floppy-retriever ]; then
+ if [ -e /usr/lib/debian-installer/retriever/media-retriever ]; then
db_capb backup
- db_input critical hw-detect/load_floppy
+ db_input critical hw-detect/load_media
if ! db_go; then
cleanup
exit 10
fi
db_capb
- db_get hw-detect/load_floppy
+ db_get hw-detect/load_media
if [ "$RET" = true ] && \
- anna floppy-retriever && \
+ anna media-retriever && \
hw-detect ethdetect/detect_progress_title; then
continue
fi
--
1.5.5.4
From ef1d2f983d76fe9028a7335ee42829a215f868b1 Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kodama.kitenet.net> Date: Fri, 20 Jun 2008 16:43:52 -0400 Subject: [PATCH] package name changed Signed-off-by: Joey Hess <joey@kodama.kitenet.net> --- packages/po/packages_list | 2 +- scripts/buildscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/po/packages_list b/packages/po/packages_list index 1d28ef1..edbb2cc 100644 --- a/packages/po/packages_list +++ b/packages/po/packages_list @@ -27,7 +27,7 @@ netcfg choose-mirror net-retriever cdrom-retriever -floppy-retriever +media-retriever # Generic and i386 partman partman/partman-base diff --git a/scripts/buildscript b/scripts/buildscript index 8242f7b..266f428 100755 --- a/scripts/buildscript +++ b/scripts/buildscript @@ -201,7 +201,7 @@ case $ARCH in esac do_subdir packages/cdrom-retriever \ - packages/floppy-retriever \ + packages/media-retriever \ packages/net-retriever do_subdir packages/anna \ -- 1.5.5.4
From 8b5da823f5a6def7cd4c0c789a36c4713c201ef8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 17:02:36 -0400
Subject: [PATCH] special case for /hd-media
As a special case, if /hd-media is mounted and has what we want, bind mount
/mnt to it.
Signed-off-by: Joey Hess <joey@kodama.kitenet.net>
---
packages/mountmedia/debian/changelog | 2 ++
packages/mountmedia/mountmedia | 20 ++++++++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/packages/mountmedia/debian/changelog b/packages/mountmedia/debian/changelog
index 09ae313..e2f5606 100644
--- a/packages/mountmedia/debian/changelog
+++ b/packages/mountmedia/debian/changelog
@@ -12,6 +12,8 @@ mountmedia (0.17) UNRELEASED; urgency=low
well.
* "mountmedia floppy" can be used to force the old behavior, of only
trying to load floppies.
+ * As a special case, if /hd-media is mounted and has what we want, bind
+ mount /mnt to it.
-- Joey Hess <joeyh@debian.org> Fri, 20 Jun 2008 14:20:03 -0400
diff --git a/packages/mountmedia/mountmedia b/packages/mountmedia/mountmedia
index 49806d9..d54a11b 100755
--- a/packages/mountmedia/mountmedia
+++ b/packages/mountmedia/mountmedia
@@ -30,27 +30,31 @@ try_mount() {
umount $MNT || true
mount $1 -tauto $MNT
- checkcontents
+ checkcontents $MNT
}
checkcontents() {
+ dir="$1"
+
if [ "$WANTDRIVER" ]; then
# Make sure this is driver media by checking the files on
# it. Check for regular debs, udebs, and to be on the safe
# side, check for *.ude files (msdos file names...)
- for filename in $MNT/*.deb $MNT/*.udeb $MNT/*.ude; do
+ for filename in $dir/*.deb $dir/*.udeb $dir/*.ude; do
if [ -f "$filename" ]; then
return 0 # success
fi
done
- umount $2
+ # umount can legitimatly fail if something is keeping
+ # it open
+ umount $dir 2>/dev/null || true
return 1
else
return 0
fi
}
-if ! ( mount | cut -d' ' -f3 | grep -q "^$MNT$" && checkcontents ); then
+if ! ( mount | cut -d' ' -f3 | grep -q "^$MNT$" && checkcontents $MNT ); then
if ! grep -q ^vfat /proc/modules ; then
log-output -t mountmedia modprobe -q vfat || true
fi
@@ -77,9 +81,13 @@ if ! ( mount | cut -d' ' -f3 | grep -q "^$MNT$" && checkcontents ); then
log-output -t mountmedia modprobe -q floppy || true
update-dev
fi
-
- # Cannot find a device, or found the wrong device.
+
if [ ! -e "$DEV" ] || ! try_mount $DEV; then
+ # Special case for an already mounted /hd-media.
+ if [ "$WANTDRIVER" ] && [ -d /hd-media ] && checkcontents /hd-media; then
+ mount --bind /hd-media /media
+ fi
+
# Maybe the system has an ide-floppy device?
log-output -t mountmedia modprobe -q ide-floppy || true
update-dev
--
1.5.5.4
Attachment:
signature.asc
Description: Digital signature