Hi Silvain,
I've taken a closer look at the floppy changes this morning and committed a
few changes in your tree:
- Whitespace cleanup
- Synced floppy-retriever and rootskel with trunk
- Improved changelog entries
I've also tested the last available version of the floppies from your
website (27 Sept).
Based on the the following comments:
- Joey noted yesterday that the "floppy 1 first" message has some
translation issues (although translation is not essential, it is still
important for localized derived distributions)
I've created a proposed patch that should come close to solving that:
it uses the name of the real name of the disk image instead of "disk1",
thus: "Please insert Network drivers floppy 1 ('net-drivers-1') first."
Patch is untested and may still need a bit of work.
- I'd like to see two separate templates for the first driver floppy and
for any further driver floppies. The second template should be something
like "Load drivers from another floppy?".
The default from that template could even vary: "Yes" if last floppy was
a -1 image, "No" if last floppy was a "-2" image.
I can make time to work on this if needed.
With these changes I think we could merge today.
I think it would be good to commit the new structure only for i386 for now
so we don't break existing powerpc and sparc stuff, and switch those arches
over later. This probably means that new boot and root targets need to be
(temporarily) renamed.
Cheers,
FJP
Index: config/i386/floppy/cd-drivers-2.cfg
===================================================================
--- config/i386/floppy/cd-drivers-2.cfg (revision 41565)
+++ config/i386/floppy/cd-drivers-2.cfg (working copy)
@@ -1,4 +1,4 @@
-DISK_LABEL = "disk2:CD-ROM drivers floppy"
+DISK_LABEL = "$(FLAVOUR):CD-ROM drivers floppy 2"
TARGET = $(EXTRA)
EXTRANAME = $(FLAVOUR)
Index: config/i386/floppy/net-drivers-2.cfg
===================================================================
--- config/i386/floppy/net-drivers-2.cfg (revision 41565)
+++ config/i386/floppy/net-drivers-2.cfg (working copy)
@@ -1,4 +1,4 @@
-DISK_LABEL = "disk2:Network drivers floppy"
+DISK_LABEL = "$(FLAVOUR):Network drivers floppy 2"
TARGET = $(EXTRA)
EXTRANAME = $(FLAVOUR)
Index: config/i386/floppy/boot.cfg
===================================================================
--- config/i386/floppy/boot.cfg (revision 41565)
+++ config/i386/floppy/boot.cfg (working copy)
@@ -1,4 +1,4 @@
-DISK_LABEL = "boot floppy"
+DISK_LABEL = "Boot floppy"
TARGET = $(BOOT)
BOOT = $(SOME_DEST)/$(EXTRANAME)boot.img$(GZIPPED)
@@ -16,4 +16,4 @@
INITRD_FS=initramfs
# use klibc, not libc
-ONLY_KLIBC=yes
\ No newline at end of file
+ONLY_KLIBC=yes
Index: config/i386/floppy/root.cfg
===================================================================
--- config/i386/floppy/root.cfg (revision 41565)
+++ config/i386/floppy/root.cfg (working copy)
@@ -1,4 +1,4 @@
-DISK_LABEL = "root floppy"
+DISK_LABEL = "Boot floppy"
# Library and font reduction need the dependencies of additional drivers.
EXTRADRIVERS = $(BASE_TMP)floppy_cd-drivers-1/tree $(BASE_TMP)floppy_cd-drivers-2/tree\
@@ -20,4 +20,4 @@
INITRD_FS = initramfs
IMAGE_SIZE = $(FLOPPY_SIZE)
-IMAGE_FS = ext2
\ No newline at end of file
+IMAGE_FS = ext2
Index: config/i386/floppy/cd-drivers-1.cfg
===================================================================
--- config/i386/floppy/cd-drivers-1.cfg (revision 41565)
+++ config/i386/floppy/cd-drivers-1.cfg (working copy)
@@ -1,4 +1,4 @@
-DISK_LABEL = "disk1:CD-ROM drivers floppy"
+DISK_LABEL = "$(FLAVOUR):CD-ROM drivers floppy 1"
TARGET = $(EXTRA)
EXTRANAME = $(FLAVOUR)
Index: config/i386/floppy/net-drivers-1.cfg
===================================================================
--- config/i386/floppy/net-drivers-1.cfg (revision 41565)
+++ config/i386/floppy/net-drivers-1.cfg (working copy)
@@ -1,4 +1,4 @@
-DISK_LABEL = "disk1:Network drivers floppy"
+DISK_LABEL = "$(FLAVOUR):Network drivers floppy 1"
TARGET = $(EXTRA)
EXTRANAME = $(FLAVOUR)
Index: floppy-retriever/debian/load-floppy.templates
===================================================================
--- floppy-retriever/debian/load-floppy.templates (revision 41565)
+++ floppy-retriever/debian/load-floppy.templates (working copy)
@@ -24,6 +24,6 @@
Template: retriever/floppy/warning
Type: text
-_Description: Please insert ${DISK} first
+_Description: Please insert ${DISK} first.
Due to dependencies between packages, driver floppies must be loaded
in the correct order.
Index: floppy-retriever/debian/load-floppy.postinst
===================================================================
--- floppy-retriever/debian/load-floppy.postinst (revision 41565)
+++ floppy-retriever/debian/load-floppy.postinst (working copy)
@@ -42,19 +42,20 @@
label=""
mountfloppy
if [ -e $FLOPPYMNT/disk.lbl ]; then
- # a floppy disk_N (N>=2) must be loaded after disk_N-1
- label=`cat $FLOPPYMNT/disk.lbl | grep Label | sed s/Label:// `
+ label=`cat $FLOPPYMNT/disk.lbl | grep "^Label" | sed "s/Label://"`
fi
umount $FLOPPYMNT
- disk_nb=`echo $label | cut -d':' -f1 | grep -e "disk[0-9]" | sed s/disk//`
+ # a floppy disk_N (N>=2) must be loaded after disk_N-1
+ disk_name=`echo $label | cut -d':' -f1`
disk_lbl=`echo $label | cut -d':' -f2`
- log "disk_nb=$disk_nb disk_lbl=$disk_lbl old_disk_lbl=$old_disk_lbl"
- if [ "$disk_lbl" -a "$disk_nb" ]; then
- if [ $disk_nb -eq 2 -a "$disk_lbl" != "$old_disk_lbl" ]; then
+ disk_nb=`echo $disk_name | sed "s/^.*\([0-9]\)$/\1/"`
+ if [ "$disk_lbl" ] && [ "$disk_nb" ]; then
+ if [ $disk_nb -eq 2 ] && [ "$disk_lbl" != "$old_disk_lbl" ]; then
+ disk_name_1=`echo $disk_name | sed "s/[0-9]$/1/"`
# BEGIN WITH DISK1
warning "Loading $disk_lbl must start with disk1 instead of $disk_nb"
- db_subst $W DISK "${disk_lbl} - disk1"
+ db_subst $W DISK "$disk_lbl ('$disk_name_1')"
db_input critical $W || true
db_go
else
@@ -75,4 +76,4 @@
fi
fi
db_capb
-done
\ No newline at end of file
+done
Attachment:
pgponVLMv44wt.pgp
Description: PGP signature