Hello community, here is the log from the commit of package dosfstools for openSUSE:Factory checked in at 2013-07-31 18:31:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosfstools (Old) and /work/SRC/openSUSE:Factory/.dosfstools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dosfstools" Changes: -------- --- /work/SRC/openSUSE:Factory/dosfstools/dosfstools.changes 2013-07-18 15:48:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dosfstools.new/dosfstools.changes 2013-07-31 18:31:17.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 29 08:59:44 UTC 2013 - pgajdos@suse.com + +- updated to 3.0.22: + * Improved boot compatiblity. + +------------------------------------------------------------------- Old: ---- dosfstools-3.0.21.tar.xz dosfstools-3.0.21.tar.xz.sig New: ---- dosfstools-3.0.22.tar.xz dosfstools-3.0.22.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosfstools.spec ++++++ --- /var/tmp/diff_new_pack.Blonuv/_old 2013-07-31 18:31:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Blonuv/_new 2013-07-31 18:31:18.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux License: GPL-3.0+ Group: System/Filesystems -Version: 3.0.21 +Version: 3.0.22 Release: 0 Url: http://daniel-baumann.ch/software/dosfstools/ ++++++ dosfstools-3.0.21.tar.xz -> dosfstools-3.0.22.tar.xz ++++++ ++++ 1613 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/ChangeLog new/dosfstools-3.0.22/ChangeLog --- old/dosfstools-3.0.21/ChangeLog 2013-07-16 08:33:51.000000000 +0200 +++ new/dosfstools-3.0.22/ChangeLog 2013-07-19 07:00:53.000000000 +0200 @@ -1,4 +1,62 @@ -commit a74c12c (HEAD, origin/master, origin/HEAD, master) +commit 3dc5560 (HEAD, origin/master, origin/HEAD, master) +Author: Daniel Baumann <mail@daniel-baumann.ch> +Date: Fri Jul 19 06:55:24 2013 +0200 + + Addding install-symlinks target to phony targets in Makefile. + + Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch> + +commit c6c0581 +Author: Daniel Baumann <mail@daniel-baumann.ch> +Date: Fri Jul 19 06:55:00 2013 +0200 + + Adding uninstall-symlinks target in Makefile. + + Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch> + +commit 465dd8c +Author: Daniel Baumann <mail@daniel-baumann.ch> +Date: Fri Jul 19 06:45:40 2013 +0200 + + Allowing fatlabel to write labels in all lowercase but give a warning about DOS/Windows (Closes: #714971). + + Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch> + +commit 3621b30 +Author: John S Gruber <JohnSGruber@gmail.com> +Date: Fri Jul 19 06:40:21 2013 +0200 + + Add options and make dos boot sector more compatible with reference system (Closes: #552673). + + Unless overridden by the user sets the DOS boot sector's + hidden-sectors field to match the start of a hard disk's + partition. + + Initialize DOS boot sector drive_number according to FAT media type + Addresses LP: #398241 and Debian #552673 + + Adds options to override the DOS boot sector device_number and + the FAT media type. + + Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch> + +commit be1eed5 +Author: Daniel Baumann <mail@daniel-baumann.ch> +Date: Wed Jul 17 12:52:20 2013 +0200 + + Correcting wrong check preventing installation of fatlabel legacy manpage symlink. + + Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch> + +commit d0065d3 (tag: v3.0.21) +Author: Daniel Baumann <mail@daniel-baumann.ch> +Date: Tue Jul 16 08:34:28 2013 +0200 + + Releasing version 3.0.21. + + Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch> + +commit a74c12c Author: Jaroslav Skarvada <jskarvad@redhat.com> Date: Tue Jun 25 14:53:14 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/Makefile new/dosfstools-3.0.22/Makefile --- old/dosfstools-3.0.21/Makefile 2013-06-24 14:22:07.000000000 +0200 +++ new/dosfstools-3.0.22/Makefile 2013-07-19 06:55:47.000000000 +0200 @@ -77,7 +77,7 @@ if [ -e $(DESTDIR)/$(SBINDIR)/fatlabel ]; \ then \ ln -sf fatlabel $(DESTDIR)/$(SBINDIR)/dosfslabel; \ - if [ -e $(DESTDIR)/$(MANDIR)/man8/dosfslabel.8 ]; \ + if [ -e $(DESTDIR)/$(MANDIR)/man8/fatlabel.8 ]; \ then \ ln -sf fatlabel.8 $(DESTDIR)/$(MANDIR)/man8/dosfslabel.8; \ fi; \ @@ -109,24 +109,13 @@ fi; \ fi -uninstall: uninstall-bin uninstall-doc uninstall-man +uninstall: uninstall-symlinks uninstall-man uninstall-doc uninstall-bin uninstall-bin: rm -f $(DESTDIR)/$(SBINDIR)/fatlabel rm -f $(DESTDIR)/$(SBINDIR)/fsck.fat rm -f $(DESTDIR)/$(SBINDIR)/mkfs.fat - # legacy symlinks - rm -f $(DESTDIR)/$(SBINDIR)/dosfslabel - - rm -f $(DESTDIR)/$(SBINDIR)/dosfsck - rm -f $(DESTDIR)/$(SBINDIR)/fsck.msdos - rm -f $(DESTDIR)/$(SBINDIR)/fsck.vfat - - rm -f $(DESTDIR)/$(SBINDIR)/mkdosfs - rm -f $(DESTDIR)/$(SBINDIR)/mkfs.msdos - rm -f $(DESTDIR)/$(SBINDIR)/mkfs.vfat - rmdir --ignore-fail-on-non-empty $(DESTDIR)/$(SBINDIR) uninstall-doc: @@ -150,15 +139,22 @@ done; \ done - # legacy symlinks +uninstall-symlinks: + rm -f $(DESTDIR)/$(SBINDIR)/dosfslabel rm -f $(DESTDIR)/$(MANDIR)/man8/dosfslabel.8 + rm -f $(DESTDIR)/$(SBINDIR)/dosfsck rm -f $(DESTDIR)/$(MANDIR)/man8/dosfsck.8 + rm -f $(DESTDIR)/$(SBINDIR)/fsck.msdos rm -f $(DESTDIR)/$(MANDIR)/man8/fsck.msdos.8 + rm -f $(DESTDIR)/$(SBINDIR)/fsck.vfat rm -f $(DESTDIR)/$(MANDIR)/man8/fsck.vfat.8 + rm -f $(DESTDIR)/$(SBINDIR)/mkdosfs rm -f $(DESTDIR)/$(MANDIR)/man8/mkdosfs.8 + rm -f $(DESTDIR)/$(SBINDIR)/mkfs.msdos rm -f $(DESTDIR)/$(MANDIR)/man8/mkfs.msdos.8 + rm -f $(DESTDIR)/$(SBINDIR)/mkfs.vfat rm -f $(DESTDIR)/$(MANDIR)/man8/mkfs.vfat.8 reinstall: distclean install @@ -169,4 +165,4 @@ distclean: clean rm -f fatlabel fsck.fat mkfs.fat -.PHONY: build rebuild install install-bin install-doc install-man uninstall uninstall-bin uninstall-doc uninstall-man reinstall clean distclean +.PHONY: build rebuild install install-bin install-doc install-man install-symlinks uninstall uninstall-bin uninstall-doc uninstall-man uninstall-symlinks reinstall clean distclean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/VERSION new/dosfstools-3.0.22/VERSION --- old/dosfstools-3.0.21/VERSION 2013-07-16 08:33:49.000000000 +0200 +++ new/dosfstools-3.0.22/VERSION 2013-07-19 07:00:34.000000000 +0200 @@ -1 +1 @@ -3.0.21 +3.0.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/de/fatlabel.de.8 new/dosfstools-3.0.22/manpages/de/fatlabel.de.8 --- old/dosfstools-3.0.21/manpages/de/fatlabel.de.8 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/de/fatlabel.de.8 2013-07-19 07:00:38.000000000 +0200 @@ -24,7 +24,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH FATLABEL 8 2013\-07\-16 3.0.21 dosfstools +.TH FATLABEL 8 2013\-07\-19 3.0.22 dosfstools .SH NAME \fBfatlabel\fP \- set or get MS\-DOS filesystem label diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/de/fsck.fat.de.8 new/dosfstools-3.0.22/manpages/de/fsck.fat.de.8 --- old/dosfstools-3.0.21/manpages/de/fsck.fat.de.8 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/de/fsck.fat.de.8 2013-07-19 07:00:38.000000000 +0200 @@ -24,7 +24,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH FSCK.FAT 8 2013\-07\-16 3.0.21 dosfstools +.TH FSCK.FAT 8 2013\-07\-19 3.0.22 dosfstools .SH NAME \fBfsck.fat\fP \- check and repair MS\-DOS filesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/de/mkfs.fat.de.8 new/dosfstools-3.0.22/manpages/de/mkfs.fat.de.8 --- old/dosfstools-3.0.21/manpages/de/mkfs.fat.de.8 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/de/mkfs.fat.de.8 2013-07-19 07:00:38.000000000 +0200 @@ -24,7 +24,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH MKFS.FAT 8 2013\-07\-16 3.0.21 dosfstools +.TH MKFS.FAT 8 2013\-07\-19 3.0.22 dosfstools .SH NAME \fBmkfs.fat\fP \- create an MS\-DOS filesystem under Linux .SH SYNOPSIS @@ -33,8 +33,9 @@ \fIFAT\-size\fP ] [ \fB\-h\fP \fInumber\-of\-hidden\-sectors\fP ] [ \fB\-i\fP \fIvolume\-id\fP ] [\fB \-I \fP] [ \fB\-m\fP \fImessage\-file\fP ] [ \fB\-n\fP \fIvolume\-name\fP ] [ \fB\-r\fP \fIroot\-dir\-entries\fP ] [ \fB\-R\fP \fInumber\-of\-reserved\-sectors\fP ] [ \fB\-s\fP -\fIsectors\-per\-cluster\fP ] [ \fB\-S\fP \fIlogical\-sector\-size\fP ] [ \fB\-v\fP ] -\fIdevice\fP [ \fIblock\-count\fP ] +\fIsectors\-per\-cluster\fP ] [ \fB\-S\fP \fIlogical\-sector\-size\fP ] [ \fB\-D\fP +\fIdrive\-number\fP ] [ \fB\-M\fP \fIFAT\-media\-type\fP ] [ \fB\-v\fP ] \fIdevice\fP [ +\fIblock\-count\fP ] .SH DESCRIPTION \fBmkfs.fat\fP is used to create an MS\-DOS filesystem under Linux on a device (usually a disk partition). \fIdevice\fP is the special file corresponding to @@ -85,6 +86,11 @@ nevertheless will have the correct size. The resulting file can be copied later to a floppy disk or other device, or mounted through a loop device. .TP +\fB\-D\fP\fI drive\-number\fP +Specify the BIOS drive number to be stored in the FAT boot sector. This +value is usually 0x80 for hard disks and 0x00 for floppy devices or +partitions to be used for floppy emulation. +.TP \fB\-f\fP\fI number\-of\-FATs\fP Specify the number of file allocation tables in the filesystem. The default is 2. Currently the Linux MS\-DOS filesystem does not support more than 2 @@ -98,8 +104,7 @@ \fB\-h\fP\fI number\-of\-hidden\-sectors \fP Select the number of hidden sectors in the volume. Apparently some digital cameras get indigestion if you feed them a CF card without such hidden -sectors, this option allows you to satisfy them. Assumes \'0\' if no value -is given on the command line. +sectors, this option allows you to satisfy them. .TP \fI\-i volume\-id\fP Sets the volume ID of the newly created filesystem; \fIvolume\-id\fP is a 32\-bit @@ -126,6 +131,11 @@ return\-line feed combinations, and tabs have been expanded. If the filename is a hyphen (\-), the text is taken from standard input. .TP +\fB\-M\fP\fI FAT\-media\-type\fP +Specify the media type to be stored in the FAT boot sector. This value is +usually 0xF8 for hard disks and has a value from 0xF9 to 0xFF for floppies +or partitions to be used for floppy emulation. +.TP \fB\-n\fP\fI volume\-name\fP Sets the volume name (label) of the filesystem. The volume name can be up to 11 characters long. The default is no label. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/en/fatlabel.8 new/dosfstools-3.0.22/manpages/en/fatlabel.8 --- old/dosfstools-3.0.21/manpages/en/fatlabel.8 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/en/fatlabel.8 2013-07-19 07:00:38.000000000 +0200 @@ -19,7 +19,7 @@ .\" can be found in /usr/share/common-licenses/GPL-3 file. .\" .\" -.TH FATLABEL 8 2013\-07\-16 3.0.21 "dosfstools" +.TH FATLABEL 8 2013\-07\-19 3.0.22 "dosfstools" .SH NAME \fBfatlabel\fR \- set or get MS\-DOS filesystem label diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/en/fsck.fat.8 new/dosfstools-3.0.22/manpages/en/fsck.fat.8 --- old/dosfstools-3.0.21/manpages/en/fsck.fat.8 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/en/fsck.fat.8 2013-07-19 07:00:38.000000000 +0200 @@ -19,7 +19,7 @@ .\" can be found in /usr/share/common-licenses/GPL-3 file. .\" .\" -.TH FSCK.FAT 8 2013\-07\-16 3.0.21 "dosfstools" +.TH FSCK.FAT 8 2013\-07\-19 3.0.22 "dosfstools" .SH NAME \fBfsck.fat\fR \- check and repair MS\-DOS filesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/en/mkfs.fat.8 new/dosfstools-3.0.22/manpages/en/mkfs.fat.8 --- old/dosfstools-3.0.21/manpages/en/mkfs.fat.8 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/en/mkfs.fat.8 2013-07-19 07:00:38.000000000 +0200 @@ -19,7 +19,7 @@ .\" can be found in /usr/share/common-licenses/GPL-3 file. .\" .\" -.TH MKFS.FAT 8 2013\-07\-16 3.0.21 "dosfstools" +.TH MKFS.FAT 8 2013\-07\-19 3.0.22 "dosfstools" .SH NAME .B mkfs.fat \- create an MS-DOS filesystem under Linux @@ -87,6 +87,14 @@ .I logical-sector-size ] [ +.B \-D +.I drive-number +] +[ +.B \-M +.I FAT-media-type +] +[ .B \-v ] .I device @@ -150,6 +158,11 @@ correct size. The resulting file can be copied later to a floppy disk or other device, or mounted through a loop device. .TP +.BI \-D " drive-number" +Specify the BIOS drive number to be stored in the FAT boot sector. +This value is usually 0x80 for hard disks and 0x00 for floppy devices +or partitions to be used for floppy emulation. +.TP .BI \-f " number-of-FATs" Specify the number of file allocation tables in the filesystem. The default is 2. Currently the Linux MS-DOS filesystem does not support @@ -163,8 +176,7 @@ .BI \-h " number-of-hidden-sectors " Select the number of hidden sectors in the volume. Apparently some digital cameras get indigestion if you feed them a CF card without -such hidden sectors, this option allows you to satisfy them. Assumes -\'0\' if no value is given on the command line. +such hidden sectors, this option allows you to satisfy them. .TP .I \-i " volume-id" Sets the volume ID of the newly created filesystem; @@ -196,6 +208,11 @@ carriage return-line feed combinations, and tabs have been expanded. If the filename is a hyphen (-), the text is taken from standard input. .TP +.BI \-M " FAT-media-type" +Specify the media type to be stored in the FAT boot sector. +This value is usually 0xF8 for hard disks and has a value from 0xF9 +to 0xFF for floppies or partitions to be used for floppy emulation. +.TP .BI \-n " volume-name" Sets the volume name (label) of the filesystem. The volume name can be up to 11 characters long. The default is no label. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/po/de/fatlabel.8.po new/dosfstools-3.0.22/manpages/po/de/fatlabel.8.po --- old/dosfstools-3.0.21/manpages/po/de/fatlabel.8.po 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/po/de/fatlabel.8.po 2013-07-19 07:00:38.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-07-16 08:33+0300\n" +"POT-Creation-Date: 2013-07-19 07:00+0300\n" "PO-Revision-Date: 2013-06-06 09:34+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -25,13 +25,13 @@ #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-07-16" +msgid "2013-07-19" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.21" +msgid "3.0.22" msgstr "" #. type: TH @@ -63,7 +63,7 @@ msgstr "" #. type: SH -#: en/fatlabel.8:30 en/fsck.fat.8:30 en/mkfs.fat.8:96 +#: en/fatlabel.8:30 en/fsck.fat.8:30 en/mkfs.fat.8:104 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -81,7 +81,7 @@ msgstr "" #. type: SH -#: en/fatlabel.8:35 en/fsck.fat.8:77 en/mkfs.fat.8:106 +#: en/fatlabel.8:35 en/fsck.fat.8:77 en/mkfs.fat.8:114 #, no-wrap msgid "OPTIONS" msgstr "" @@ -109,7 +109,7 @@ msgstr "" #. type: SH -#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:241 +#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:258 #, no-wrap msgid "SEE ALSO" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/po/de/fsck.fat.8.po new/dosfstools-3.0.22/manpages/po/de/fsck.fat.8.po --- old/dosfstools-3.0.21/manpages/po/de/fsck.fat.8.po 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/po/de/fsck.fat.8.po 2013-07-19 07:00:38.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-07-16 08:33+0300\n" +"POT-Creation-Date: 2013-07-19 07:00+0300\n" "PO-Revision-Date: 2013-06-06 09:34+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -19,13 +19,13 @@ #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-07-16" +msgid "2013-07-19" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.21" +msgid "3.0.22" msgstr "" #. type: TH @@ -47,19 +47,19 @@ msgstr "" #. type: SH -#: en/fatlabel.8:30 en/fsck.fat.8:30 en/mkfs.fat.8:96 +#: en/fatlabel.8:30 en/fsck.fat.8:30 en/mkfs.fat.8:104 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: SH -#: en/fatlabel.8:35 en/fsck.fat.8:77 en/mkfs.fat.8:106 +#: en/fatlabel.8:35 en/fsck.fat.8:77 en/mkfs.fat.8:114 #, no-wrap msgid "OPTIONS" msgstr "" #. type: SH -#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:241 +#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:258 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -256,7 +256,7 @@ msgstr "" #. type: TP -#: en/fsck.fat.8:78 en/mkfs.fat.8:107 +#: en/fsck.fat.8:78 en/mkfs.fat.8:115 #, no-wrap msgid "B<-a>" msgstr "" @@ -270,7 +270,7 @@ msgstr "" #. type: TP -#: en/fsck.fat.8:80 en/mkfs.fat.8:116 +#: en/fsck.fat.8:80 en/mkfs.fat.8:124 #, no-wrap msgid "B<-A>" msgstr "" @@ -400,7 +400,7 @@ msgstr "" #. type: TP -#: en/fsck.fat.8:102 en/mkfs.fat.8:220 +#: en/fsck.fat.8:102 en/mkfs.fat.8:237 #, no-wrap msgid "B<-v>" msgstr "" @@ -519,7 +519,7 @@ msgstr "" #. type: SH -#: en/fsck.fat.8:125 en/mkfs.fat.8:223 +#: en/fsck.fat.8:125 en/mkfs.fat.8:240 #, no-wrap msgid "BUGS" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/manpages/po/de/mkfs.fat.8.po new/dosfstools-3.0.22/manpages/po/de/mkfs.fat.8.po --- old/dosfstools-3.0.21/manpages/po/de/mkfs.fat.8.po 2013-07-16 08:34:17.000000000 +0200 +++ new/dosfstools-3.0.22/manpages/po/de/mkfs.fat.8.po 2013-07-19 07:00:38.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dosfstools VERSION\n" -"POT-Creation-Date: 2013-07-16 08:33+0300\n" +"POT-Creation-Date: 2013-07-19 07:00+0300\n" "PO-Revision-Date: 2013-06-06 09:34+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -19,13 +19,13 @@ #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "2013-07-16" +msgid "2013-07-19" msgstr "" #. type: TH #: en/fatlabel.8:22 en/fsck.fat.8:22 en/mkfs.fat.8:22 #, no-wrap -msgid "3.0.21" +msgid "3.0.22" msgstr "" #. type: TH @@ -47,43 +47,43 @@ msgstr "" #. type: SH -#: en/fatlabel.8:30 en/fsck.fat.8:30 en/mkfs.fat.8:96 +#: en/fatlabel.8:30 en/fsck.fat.8:30 en/mkfs.fat.8:104 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: SH -#: en/fatlabel.8:35 en/fsck.fat.8:77 en/mkfs.fat.8:106 +#: en/fatlabel.8:35 en/fsck.fat.8:77 en/mkfs.fat.8:114 #, no-wrap msgid "OPTIONS" msgstr "" #. type: SH -#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:241 +#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:258 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: TP -#: en/fsck.fat.8:78 en/mkfs.fat.8:107 +#: en/fsck.fat.8:78 en/mkfs.fat.8:115 #, no-wrap msgid "B<-a>" msgstr "" #. type: TP -#: en/fsck.fat.8:80 en/mkfs.fat.8:116 +#: en/fsck.fat.8:80 en/mkfs.fat.8:124 #, no-wrap msgid "B<-A>" msgstr "" #. type: TP -#: en/fsck.fat.8:102 en/mkfs.fat.8:220 +#: en/fsck.fat.8:102 en/mkfs.fat.8:237 #, no-wrap msgid "B<-v>" msgstr "" #. type: SH -#: en/fsck.fat.8:125 en/mkfs.fat.8:223 +#: en/fsck.fat.8:125 en/mkfs.fat.8:240 #, no-wrap msgid "BUGS" msgstr "" @@ -100,18 +100,19 @@ msgstr "" #. type: Plain text -#: en/mkfs.fat.8:96 +#: en/mkfs.fat.8:104 msgid "" "B<mkfs.fat> [ B<-a> ] [ B<-A> ] [ B<-b> I<sector-of-backup> ] [ B<-c> ] [ B<-" "l> I<filename> ] [ B<-C> ] [ B<-f> I<number-of-FATs> ] [ B<-F> I<FAT-size> ] " "[ B<-h> I<number-of-hidden-sectors> ] [ B<-i> I<volume-id> ] [B< -I >] [ B<-" "m> I<message-file> ] [ B<-n> I<volume-name> ] [ B<-r> I<root-dir-entries> ] " "[ B<-R> I<number-of-reserved-sectors> ] [ B<-s> I<sectors-per-cluster> ] " -"[ B<-S> I<logical-sector-size> ] [ B<-v> ] I<device> [ I<block-count> ]" +"[ B<-S> I<logical-sector-size> ] [ B<-D> I<drive-number> ] [ B<-M> I<FAT-" +"media-type> ] [ B<-v> ] I<device> [ I<block-count> ]" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:106 +#: en/mkfs.fat.8:114 msgid "" "B<mkfs.fat> is used to create an MS-DOS filesystem under Linux on a device " "(usually a disk partition). I<device> is the special file corresponding to " @@ -121,7 +122,7 @@ msgstr "" #. type: Plain text -#: en/mkfs.fat.8:116 +#: en/mkfs.fat.8:124 msgid "" "Normally, for any filesystem except very small ones, B<mkfs.fat> will align " "all the data structures to cluster size, to make sure that as long as the " @@ -132,7 +133,7 @@ msgstr "" #. type: Plain text -#: en/mkfs.fat.8:131 +#: en/mkfs.fat.8:139 msgid "" "Use Atari variation of the MS-DOS filesystem. This is default if B<mkfs.fat> " "is run on an Atari, then this option turns off Atari format. There are some " @@ -149,13 +150,13 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:131 +#: en/mkfs.fat.8:139 #, no-wrap msgid "B<-b>I< sector-of-backup >" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:136 +#: en/mkfs.fat.8:144 msgid "" "Selects the location of the backup boot sector for FAT32. Default depends on " "number of reserved sectors, but usually is sector 6. The backup must be " @@ -163,24 +164,24 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:136 +#: en/mkfs.fat.8:144 #, no-wrap msgid "B<-c>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:139 +#: en/mkfs.fat.8:147 msgid "Check the device for bad blocks before creating the filesystem." msgstr "" #. type: TP -#: en/mkfs.fat.8:139 +#: en/mkfs.fat.8:147 #, no-wrap msgid "B<-C>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:152 +#: en/mkfs.fat.8:160 msgid "" "Create the file given as I<device> on the command line, and write the to-be-" "created filesystem to it. This can be used to create the new filesystem in a " @@ -195,13 +196,27 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:152 +#: en/mkfs.fat.8:160 +#, no-wrap +msgid "B<-D>I< drive-number>" +msgstr "" + +#. type: Plain text +#: en/mkfs.fat.8:165 +msgid "" +"Specify the BIOS drive number to be stored in the FAT boot sector. This " +"value is usually 0x80 for hard disks and 0x00 for floppy devices or " +"partitions to be used for floppy emulation." +msgstr "" + +#. type: TP +#: en/mkfs.fat.8:165 #, no-wrap msgid "B<-f>I< number-of-FATs>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:157 +#: en/mkfs.fat.8:170 msgid "" "Specify the number of file allocation tables in the filesystem. The default " "is 2. Currently the Linux MS-DOS filesystem does not support more than 2 " @@ -209,13 +224,13 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:157 +#: en/mkfs.fat.8:170 #, no-wrap msgid "B<-F>I< FAT-size>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:162 +#: en/mkfs.fat.8:175 msgid "" "Specifies the type of file allocation tables used (12, 16 or 32 bit). If " "nothing is specified, B<mkfs.fat> will automatically select between 12, 16 " @@ -223,28 +238,27 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:162 +#: en/mkfs.fat.8:175 #, no-wrap msgid "B<-h>I< number-of-hidden-sectors >" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:168 +#: en/mkfs.fat.8:180 msgid "" "Select the number of hidden sectors in the volume. Apparently some digital " "cameras get indigestion if you feed them a CF card without such hidden " -"sectors, this option allows you to satisfy them. Assumes \\'0\\' if no value " -"is given on the command line." +"sectors, this option allows you to satisfy them." msgstr "" #. type: TP -#: en/mkfs.fat.8:168 +#: en/mkfs.fat.8:180 #, no-wrap msgid "I<-i volume-id>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:174 +#: en/mkfs.fat.8:186 msgid "" "Sets the volume ID of the newly created filesystem; I<volume-id> is a 32-bit " "hexadecimal number (for example, 2e24ec82). The default is a number which " @@ -252,13 +266,13 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:174 +#: en/mkfs.fat.8:186 #, no-wrap msgid "B<-I>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:183 +#: en/mkfs.fat.8:195 msgid "" "It is typical for fixed disk devices to be partitioned so, by default, you " "are not permitted to create a filesystem across the entire device. B<mkfs." @@ -269,29 +283,29 @@ msgstr "" #. type: Plain text -#: en/mkfs.fat.8:187 +#: en/mkfs.fat.8:199 msgid "This switch will force B<mkfs.fat> to work properly." msgstr "" #. type: TP -#: en/mkfs.fat.8:187 +#: en/mkfs.fat.8:199 #, no-wrap msgid "B<-l>I< filename>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:191 +#: en/mkfs.fat.8:203 msgid "Read the bad blocks list from I<filename>." msgstr "" #. type: TP -#: en/mkfs.fat.8:191 +#: en/mkfs.fat.8:203 #, no-wrap msgid "B<-m>I< message-file>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:198 +#: en/mkfs.fat.8:210 msgid "" "Sets the message the user receives on attempts to boot this filesystem " "without having properly installed an operating system. The message file " @@ -301,39 +315,53 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:198 +#: en/mkfs.fat.8:210 +#, no-wrap +msgid "B<-M>I< FAT-media-type>" +msgstr "" + +#. type: Plain text +#: en/mkfs.fat.8:215 +msgid "" +"Specify the media type to be stored in the FAT boot sector. This value is " +"usually 0xF8 for hard disks and has a value from 0xF9 to 0xFF for floppies " +"or partitions to be used for floppy emulation." +msgstr "" + +#. type: TP +#: en/mkfs.fat.8:215 #, no-wrap msgid "B<-n>I< volume-name>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:202 +#: en/mkfs.fat.8:219 msgid "" "Sets the volume name (label) of the filesystem. The volume name can be up " "to 11 characters long. The default is no label." msgstr "" #. type: TP -#: en/mkfs.fat.8:202 +#: en/mkfs.fat.8:219 #, no-wrap msgid "B<-r>I< root-dir-entries>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:206 +#: en/mkfs.fat.8:223 msgid "" "Select the number of entries available in the root directory. The default " "is 112 or 224 for floppies and 512 for hard disks." msgstr "" #. type: TP -#: en/mkfs.fat.8:206 +#: en/mkfs.fat.8:223 #, no-wrap msgid "B<-R>I< number-of-reserved-sectors >" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:211 +#: en/mkfs.fat.8:228 msgid "" "Select the number of reserved sectors. With FAT32 format at least 2 reserved " "sectors are needed, the default is 32. Otherwise the default is 1 (only the " @@ -341,26 +369,26 @@ msgstr "" #. type: TP -#: en/mkfs.fat.8:211 +#: en/mkfs.fat.8:228 #, no-wrap msgid "B<-s>I< sectors-per-cluster>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:215 +#: en/mkfs.fat.8:232 msgid "" "Specify the number of disk sectors per cluster. Must be a power of 2, i.e. " "1, 2, 4, 8, ... 128." msgstr "" #. type: TP -#: en/mkfs.fat.8:215 +#: en/mkfs.fat.8:232 #, no-wrap msgid "B<-S>I< logical-sector-size>" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:220 +#: en/mkfs.fat.8:237 msgid "" "Specify the number of bytes per logical sector. Must be a power of 2 and " "greater than or equal to 512, i.e. 512, 1024, 2048, 4096, 8192, 16384, or " @@ -368,12 +396,12 @@ msgstr "" #. type: Plain text -#: en/mkfs.fat.8:223 +#: en/mkfs.fat.8:240 msgid "Verbose execution." msgstr "" #. type: Plain text -#: en/mkfs.fat.8:230 +#: en/mkfs.fat.8:247 msgid "" "B<mkfs.fat> can not create boot-able filesystems. This isn't as easy as you " "might think at first glance for various reasons and has been discussed a lot " @@ -381,13 +409,13 @@ msgstr "" #. type: SH -#: en/mkfs.fat.8:230 +#: en/mkfs.fat.8:247 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:234 +#: en/mkfs.fat.8:251 msgid "" "Dave Hudson - E<lt>dave@humbug.demon.co.ukE<gt>; modified by Peter Anvin " "E<lt>hpa@yggdrasil.comE<gt>. Fixes and additions by Roman Hodek " @@ -395,13 +423,13 @@ msgstr "" #. type: SH -#: en/mkfs.fat.8:234 +#: en/mkfs.fat.8:251 #, no-wrap msgid "ACKNOWLEDGMENTS" msgstr "" #. type: Plain text -#: en/mkfs.fat.8:241 +#: en/mkfs.fat.8:258 msgid "" "B<mkfs.fat> is based on code from B<mke2fs> (written by Remy Card - " "E<lt>card@masi.ibp.frE<gt>) which is itself based on B<mkfs> (written by " @@ -409,6 +437,6 @@ msgstr "" #. type: Plain text -#: en/mkfs.fat.8:244 +#: en/mkfs.fat.8:261 msgid "B<fsck.fat>(8), B<fatlabel>(8), B<mkfs>(8)" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/src/fatlabel.c new/dosfstools-3.0.22/src/fatlabel.c --- old/dosfstools-3.0.21/src/fatlabel.c 2013-06-12 12:27:43.000000000 +0200 +++ new/dosfstools-3.0.22/src/fatlabel.c 2013-07-19 06:45:27.000000000 +0200 @@ -119,8 +119,8 @@ /* don't know if here should be more strict !uppercase(label[i]) */ if (islower(label[i])) { fprintf(stderr, - "fatlabel: labels cannot contain lower case characters\n"); - exit(1); + "fatlabel: warning - lowercase labels might not work properly with DOS or Windows\n"); + break; } rw = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/src/mkfs.fat.c new/dosfstools-3.0.22/src/mkfs.fat.c --- old/dosfstools-3.0.21/src/mkfs.fat.c 2013-06-12 12:27:43.000000000 +0200 +++ new/dosfstools-3.0.22/src/mkfs.fat.c 2013-07-19 06:39:30.000000000 +0200 @@ -281,6 +281,10 @@ static int root_dir_entries = 0; /* Number of root directory entries */ static char *blank_sector; /* Blank sector - all zeros */ static int hidden_sectors = 0; /* Number of hidden sectors */ +static int hidden_sectors_by_user = 0; /* -h option invoked */ +static int drive_number_option = 0; /* drive number */ +static int drive_number_by_user = 0; /* drive number option invoked */ +static int fat_media_byte = 0; /* media byte in header and starting FAT */ static int malloc_entire_fat = FALSE; /* Whether we should malloc() the entire FAT or not */ static int align_structures = TRUE; /* Whether to enforce alignment */ static int orphaned_sectors = 0; /* Sectors that exist in the last block of filesystem */ @@ -682,6 +686,8 @@ } else { bs.secs_track = htole16(geometry.sectors); /* Set up the geometry information */ bs.heads = htole16(geometry.heads); + if (!hidden_sectors_by_user) + hidden_sectors = htole32(geometry.start); } def_hd_params: bs.media = (char)0xf8; /* Set up the media descriptor for a hard drive */ @@ -746,6 +752,18 @@ memcpy((char *)bs.system_id, "mkfs.fat", strlen("mkfs.fat")); if (sectors_per_cluster) bs.cluster_size = (char)sectors_per_cluster; + + if (fat_media_byte) + bs.media = (char) fat_media_byte; + + if (bs.media == 0xf8) + vi->drive_number=0x80; + else + vi->drive_number=0x00; + + if (drive_number_by_user) + vi->drive_number= (char) drive_number_option; + if (size_fat == 32) { /* Under FAT32, the root dir is in a cluster chain, and this is * signalled by bs.dir_entries being 0. */ @@ -1150,9 +1168,11 @@ device_name, le16toh(bs.heads), (le16toh(bs.heads) != 1) ? "s" : "", le16toh(bs.secs_track), (le16toh(bs.secs_track) != 1) ? "s" : ""); + printf("hidden sectors 0x%04x;\n", hidden_sectors); printf("logical sector size is %d,\n", sector_size); printf("using 0x%02x media descriptor, with %d sectors;\n", (int)(bs.media), num_sectors); + printf("drive number 0x%02x;\n", (int) (vi->drive_number)); printf("filesystem has %d %d-bit FAT%s and %d sector%s per cluster.\n", (int)(bs.fats), size_fat, (bs.fats != 1) ? "s" : "", (int)(bs.cluster_size), (bs.cluster_size != 1) ? "s" : ""); @@ -1344,6 +1364,7 @@ [-m boot-msg-file][-n volume-name][-i volume-id]\n\ [-s sectors-per-cluster][-S logical-sector-size][-f number-of-FATs]\n\ [-h hidden-sectors][-F fat-size][-r root-dir-entries][-R reserved-sectors]\n\ + [-M FAT-media-byte][-D drive_number]\n\ /dev/name [blocks]\n"); } @@ -1404,7 +1425,7 @@ printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n"); - while ((c = getopt(argc, argv, "aAb:cCf:F:Ii:l:m:n:r:R:s:S:h:v")) != EOF) + while ((c = getopt(argc, argv, "aAb:cCf:D:F:Ii:l:m:M:n:r:R:s:S:h:v")) != EOF) /* Scan the command line for options */ switch (c) { case 'A': /* toggle Atari format */ @@ -1432,6 +1453,15 @@ create = TRUE; break; + case 'D': /* D : Choose Drive Number */ + drive_number_option = (int) strtol (optarg, &tmp, 0); + if (*tmp || (drive_number_option != 0 && drive_number_option != 0x80)) { + printf ("Drive number must be 0 or 0x80: %s\n", optarg); + usage (); + } + drive_number_by_user=1; + break; + case 'f': /* f : Choose number of FATs */ nr_fats = (int)strtol(optarg, &tmp, 0); if (*tmp || nr_fats < 1 || nr_fats > 4) { @@ -1455,6 +1485,7 @@ printf("Bad number of hidden sectors : %s\n", optarg); usage(); } + hidden_sectors_by_user = 1; break; case 'I': @@ -1534,6 +1565,14 @@ } break; + case 'M': /* M : FAT Media byte */ + fat_media_byte = (int) strtol (optarg, &tmp, 0); + if (*tmp || fat_media_byte < 248 || fat_media_byte > 255) { + printf ("FAT Media byte must be between 0xF8 and 0xFF : %s\n", optarg); + usage (); + } + break; + case 'n': /* n : Volume name */ sprintf(volume_name, "%-11.11s", optarg); for (i = 0; i < 11; i++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dosfstools-3.0.21/src/version.h new/dosfstools-3.0.22/src/version.h --- old/dosfstools-3.0.21/src/version.h 2013-07-16 08:34:12.000000000 +0200 +++ new/dosfstools-3.0.22/src/version.h 2013-07-19 07:01:05.000000000 +0200 @@ -23,7 +23,7 @@ #ifndef _version_h #define _version_h -#define VERSION "3.0.21" -#define VERSION_DATE "2013-07-16" +#define VERSION "3.0.22" +#define VERSION_DATE "2013-07-19" #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org