Merge from trunk

util/grub.d/10_hurd.in

@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -73,16 +73,18 @@ menuentry "${OS}" {
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 cat << EOF
-	multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/}
+	echo		$(gettext "Loading GNU Mach ...")
+	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/}
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 cat << EOF
-	module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
+	echo		$(gettext "Loading the Hurd ...")
+	module		/hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
 			--multiboot-command-line='\${kernel-command-line}' \\
 			--host-priv-port='\${host-port}' \\
 			--device-master-port='\${device-port}' \\
 			--exec-server-task='\${exec-task}' -T typed '\${root}' \\
 			'\$(task-create)' '\$(task-resume)'
-	module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
+	module		/lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
 }
 EOF

util/grub.d/10_kfreebsd.in

@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,12 +44,13 @@ kfreebsd_entry ()
   fi
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
-	kfreebsd			${rel_dirname}/${basename}
+	echo			$(printf "$(gettext "Loading kernel of FreeBSD %s ...")" ${version})
+	kfreebsd		${rel_dirname}/${basename}
 EOF
 
   if test -n "${devices}" ; then
     cat << EOF
-	kfreebsd_loadenv		${devices_rel_dirname}/${devices_basename}
+	kfreebsd_loadenv	${devices_rel_dirname}/${devices_basename}
 EOF
   fi
 

util/grub.d/10_linux.in

@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,10 +64,12 @@ linux_entry ()
   fi
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
+	echo	$(printf "$(gettext "Loading Linux %s ...")" ${version})
 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then
     cat << EOF
+	echo	$(gettext "Loading initial ramdisk ...")
 	initrd	${rel_dirname}/${initrd}
 EOF
   fi

util/mkisofs/defaults.h

@@ -8,7 +8,7 @@
 #define  PREPARER_DEFAULT 	NULL
 #define  PUBLISHER_DEFAULT	NULL
 #ifndef	APPID_DEFAULT
-#define  APPID_DEFAULT 		"MKISOFS ISO 9660 FILESYSTEM BUILDER"
+#define  APPID_DEFAULT 		PACKAGE_NAME " ISO 9660 filesystem builder"
 #endif
 #define  COPYRIGHT_DEFAULT 	NULL
 #define  BIBLIO_DEFAULT 	NULL
@@ -17,38 +17,4 @@
 #define  VOLUME_ID_DEFAULT 	"CDROM"
 #define  BOOT_CATALOG_DEFAULT   "boot.catalog"
 #define  BOOT_IMAGE_DEFAULT     NULL
-#ifdef __QNX__
-#define  SYSTEM_ID_DEFAULT 	"QNX"
-#endif
-
-#ifdef __osf__
-#define  SYSTEM_ID_DEFAULT 	"OSF"
-#endif
-
-#ifdef __sun
-#ifdef __SVR4
-#define  SYSTEM_ID_DEFAULT    "Solaris"
-#else
-#define  SYSTEM_ID_DEFAULT    "SunOS"
-#endif
-#endif
-
-#ifdef __hpux
-#define  SYSTEM_ID_DEFAULT 	"HP-UX"
-#endif
-
-#ifdef __sgi
-#define  SYSTEM_ID_DEFAULT 	"SGI"
-#endif
-
-#ifdef _AIX
-#define  SYSTEM_ID_DEFAULT 	"AIX"
-#endif
-
-#ifdef _WIN
-#define	SYSTEM_ID_DEFAULT       "Win32"
-#endif /* _WIN */
-
-#ifndef SYSTEM_ID_DEFAULT
-#define  SYSTEM_ID_DEFAULT 	"LINUX"
-#endif
+#define  SYSTEM_ID_DEFAULT 	"GNU"

util/mkisofs/mkisofs.c

@@ -26,12 +26,7 @@
 #include "config.h"
 #include "mkisofs.h"
 #include "match.h"
-
-#ifdef linux
-#include <getopt.h>
-#else
 #include "getopt.h"
-#endif
 
 #include "iso9660.h"
 #include <ctype.h>
@@ -914,7 +909,7 @@ int FDECL2(main, int, argc, char **, argv){
 	exit (0);
 	break;
       case OPTION_VERSION:
-	printf ("%s (%s %s)\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
+	printf ("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION);
 	exit (0);
 	break;
       case OPTION_NOSPLIT_SL_COMPONENT: