# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1454586309 -3600
# Node ID a0169f6c39b616fc83c6202a683c2bfb849c133f
# Parent  6486fbd6dccff08ed32302cdc5ed94a76e2ea187
tazusb: ext4 support

diff -r 6486fbd6dccf -r a0169f6c39b6 po/tazusb/el.po
--- a/po/tazusb/el.po	Sat Nov 07 02:57:11 2015 +0200
+++ b/po/tazusb/el.po	Thu Feb 04 12:45:09 2016 +0100
@@ -46,11 +46,11 @@
 
 #: tazusb:42
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
 "home). Default is ext3."
 msgstr ""
 "Κάντε διαμόρφωση (format) και επισημάντε την συσκευή με ένα σύστημα αρχείων "
-"σε ext3, ext2 ή fat32 (για το LiveUSB ή το /home). Η προεπιλογή είναι το "
+"σε ext4, ext3, ext2 ή fat32 (για το LiveUSB ή το /home). Η προεπιλογή είναι το "
 "ext3."
 
 #: tazusb:43
@@ -102,16 +102,16 @@
 msgstr ""
 
 #: tazusb:132
-msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
+msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
 msgstr ""
-"Παρακαλώ ορίστε ένα σύστημα αρχείων του τύπου ext2, ext3 ή fat32 (ext3): "
+"Παρακαλώ ορίστε ένα σύστημα αρχείων του τύπου ext2, ext3, ext4 ή fat32 (ext3): "
 
 #: tazusb:141
 msgid "Please specify the filesystem type to %s."
 msgstr ""
 
 #: tazusb:142
-msgid "Available formats are ext3(default), ext2 or fat32."
+msgid "Available formats are ext4, ext3(default), ext2 or fat32."
 msgstr ""
 
 #: tazusb:143
diff -r 6486fbd6dccf -r a0169f6c39b6 po/tazusb/fr.po
--- a/po/tazusb/fr.po	Sat Nov 07 02:57:11 2015 +0200
+++ b/po/tazusb/fr.po	Thu Feb 04 12:45:09 2016 +0100
@@ -44,10 +44,10 @@
 
 #: tazusb:42
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
 "home). Default is ext3."
 msgstr ""
-"Formater et nommer un périphérique en ext3, ext2 ou fat32 (pour LiveUSB ou /"
+"Formater et nommer un périphérique en ext4, ext3, ext2 ou fat32 (pour LiveUSB ou /"
 "home). ext3 Par défault."
 
 #: tazusb:43
@@ -94,16 +94,16 @@
 msgstr ""
 
 #: tazusb:132
-msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
-msgstr "Donnez le type de système de fichiers ext2, ext3 ou fat32 (ext3): "
+msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
+msgstr "Donnez le type de système de fichiers ext2, ext3, ext4 ou fat32 (ext3): "
 
 #: tazusb:141
 #, fuzzy
 msgid "Please specify the filesystem type to %s."
-msgstr "Donnez le type de système de fichiers ext2, ext3 ou fat32 (ext3): "
+msgstr "Donnez le type de système de fichiers ext2, ext3, ext4 ou fat32 (ext3): "
 
 #: tazusb:142
-msgid "Available formats are ext3(default), ext2 or fat32."
+msgid "Available formats are ext4, ext3(default), ext2 or fat32."
 msgstr ""
 
 #: tazusb:143
diff -r 6486fbd6dccf -r a0169f6c39b6 po/tazusb/pl.po
--- a/po/tazusb/pl.po	Sat Nov 07 02:57:11 2015 +0200
+++ b/po/tazusb/pl.po	Thu Feb 04 12:45:09 2016 +0100
@@ -51,10 +51,10 @@
 
 #: tazusb:42
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
 "home). Default is ext3."
 msgstr ""
-"Formatuj i nadaj etykietę urządzeniowi z systemem plików ext2, ext3 albo "
+"Formatuj i nadaj etykietę urządzeniowi z systemem plików ext2, ext3, ext4 albo "
 "fat32 (dla LiveUSB albo /home). Domyślnie ext3."
 
 #: tazusb:43
@@ -100,15 +100,15 @@
 msgstr ""
 
 #: tazusb:132
-msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
-msgstr "Proszę wprowadzić użyty system plików ext2, ext3 lub fat32 (ext3): "
+msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
+msgstr "Proszę wprowadzić użyty system plików ext2, ext3, ext4 lub fat32 (ext3): "
 
 #: tazusb:141
 msgid "Please specify the filesystem type to %s."
 msgstr ""
 
 #: tazusb:142
-msgid "Available formats are ext3(default), ext2 or fat32."
+msgid "Available formats are ext4, ext3(default), ext2 or fat32."
 msgstr ""
 
 #: tazusb:143
diff -r 6486fbd6dccf -r a0169f6c39b6 po/tazusb/pt_BR.po
--- a/po/tazusb/pt_BR.po	Sat Nov 07 02:57:11 2015 +0200
+++ b/po/tazusb/pt_BR.po	Thu Feb 04 12:45:09 2016 +0100
@@ -47,10 +47,10 @@
 
 #: tazusb:42
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
 "home). Default is ext3."
 msgstr ""
-"Rotula e formata o dispositivo como ext3, ext2 ou fat32 (para LiveUSB ou /"
+"Rotula e formata o dispositivo como ext4, ext3, ext2 ou fat32 (para LiveUSB ou /"
 "home). Padrão é ext3."
 
 #: tazusb:43
@@ -96,16 +96,16 @@
 msgstr ""
 
 #: tazusb:132
-msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
-msgstr "Por favor escolha ext2, ext3 ou fat32 para formatação (ext3): "
+msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
+msgstr "Por favor escolha ext2, ext3, ext4 ou fat32 para formatação (ext3): "
 
 #: tazusb:141
 #, fuzzy
 msgid "Please specify the filesystem type to %s."
-msgstr "Por favor escolha ext2, ext3 ou fat32 para formatação (ext3): "
+msgstr "Por favor escolha ext2, ext3, ext4 ou fat32 para formatação (ext3): "
 
 #: tazusb:142
-msgid "Available formats are ext3(default), ext2 or fat32."
+msgid "Available formats are ext4, ext3(default), ext2 or fat32."
 msgstr ""
 
 #: tazusb:143
diff -r 6486fbd6dccf -r a0169f6c39b6 po/tazusb/ru.po
--- a/po/tazusb/ru.po	Sat Nov 07 02:57:11 2015 +0200
+++ b/po/tazusb/ru.po	Thu Feb 04 12:45:09 2016 +0100
@@ -48,10 +48,10 @@
 
 #: tazusb:42
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or "
+"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or "
 "/home). Default is ext3."
 msgstr ""
-"Форматировать устройство в файловую систему ext3, ext2 или fat32 и присвоить "
+"Форматировать устройство в файловую систему ext4, ext3, ext2 или fat32 и присвоить "
 "метку диску (для LiveUSB или /home). По умолчанию ext3."
 
 #: tazusb:43
@@ -101,17 +101,17 @@
 msgstr "Метка: %s"
 
 #: tazusb:132
-msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
+msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
 msgstr ""
-"Пожалуйста, укажите тип файловой системы: ext2, ext3 или fat32 (ext3): "
+"Пожалуйста, укажите тип файловой системы: ext2, ext3, ext4 или fat32 (ext3): "
 
 #: tazusb:141
 msgid "Please specify the filesystem type to %s."
 msgstr "Пожалуйста, укажите тип файловой системы для команды «%s»."
 
 #: tazusb:142
-msgid "Available formats are ext3(default), ext2 or fat32."
-msgstr "Доступные форматы: ext3 (по умолчанию), ext2 или fat32."
+msgid "Available formats are ext4, ext3(default), ext2 or fat32."
+msgstr "Доступные форматы: ext4, ext3 (по умолчанию), ext2 или fat32."
 
 #: tazusb:143
 msgid "Press enter to keep the default value."
diff -r 6486fbd6dccf -r a0169f6c39b6 po/tazusb/tazusb.pot
--- a/po/tazusb/tazusb.pot	Sat Nov 07 02:57:11 2015 +0200
+++ b/po/tazusb/tazusb.pot	Thu Feb 04 12:45:09 2016 +0100
@@ -45,7 +45,7 @@
 
 #: tazusb:42
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
 "home). Default is ext3."
 msgstr ""
 
@@ -92,7 +92,7 @@
 msgstr ""
 
 #: tazusb:132
-msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
+msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
 msgstr ""
 
 #: tazusb:141
@@ -100,7 +100,7 @@
 msgstr ""
 
 #: tazusb:142
-msgid "Available formats are ext3(default), ext2 or fat32."
+msgid "Available formats are ext4, ext3(default), ext2 or fat32."
 msgstr ""
 
 #: tazusb:143
diff -r 6486fbd6dccf -r a0169f6c39b6 po/tazusb/zh_CN.po
--- a/po/tazusb/zh_CN.po	Sat Nov 07 02:57:11 2015 +0200
+++ b/po/tazusb/zh_CN.po	Thu Feb 04 12:45:09 2016 +0100
@@ -95,15 +95,15 @@
 msgstr ""
 
 #: tazusb:132
-msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
-msgstr "请指定一个文件系统类型的ext2，ext3或FAT32（ext3）："
+msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
+msgstr "请指定一个文件系统类型的ext2，ext3，ext4或FAT32（ext3）："
 
 #: tazusb:141
 msgid "Please specify the filesystem type to %s."
 msgstr ""
 
 #: tazusb:142
-msgid "Available formats are ext3(default), ext2 or fat32."
+msgid "Available formats are ext4, ext3(default), ext2 or fat32."
 msgstr ""
 
 #: tazusb:143
diff -r 6486fbd6dccf -r a0169f6c39b6 tazusb
--- a/tazusb	Sat Nov 07 02:57:11 2015 +0200
+++ b/tazusb	Thu Feb 04 12:45:09 2016 +0100
@@ -39,7 +39,7 @@
 	optlist "\
 usage		$(_ 'Print this short usage.')
 writefs		$(_ 'Write the current filesystem to rootfs.gz. Supported compression: lzma, gzip, none.')
-format		$(_ 'Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /home). Default is ext3.')
+format		$(_ 'Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /home). Default is ext3.')
 gen-liveusb	$(_ 'Generate a bootable LiveUSB using files from the LiveCD.')
 gen-swap	$(_ 'Create or recreate and activate additional swap memory.')
 gen-iso2usb	$(_ 'Generate a bootable LiveUSB using files from ISO file.')
@@ -111,22 +111,10 @@
 }
 
 
-# Format target device and label partition.
-
-mkfs_ext3() {
-	get_label
-
-	_ 'Label: %s' "$label"
-	echo "Mkfs: mkfs.ext3 -L \"$label\" $DEVICE"
-	newline; sleep 2
-	mkfs.ext3 -L "$label" $DEVICE
-}
-
-
 # Get fs type. Supported fs are ext3, ext2, fat32
 
 get_fs_type() {
-	_n 'Please specify a filesystem type ext2, ext3 or fat32 (ext3): '
+	_n 'Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): '
 	read fs_type
 	[ -z "$fs_type" ] && fs_type='ext3'
 }
@@ -136,7 +124,7 @@
 
 ask_for_fs_type() {
 	_ 'Please specify the filesystem type to %s.' "$COMMAND"
-	_ 'Available formats are ext3(default), ext2 or fat32.'
+	_ 'Available formats are ext4, ext3(default), ext2 or fat32.'
 	_ 'Press enter to keep the default value.'
 	newline
 	_n 'File system type: '; read answer
@@ -148,15 +136,15 @@
 }
 
 
-# Format target device in ext3, ext2 or fat32.
-# Usage: make_fs ext2|fat32|ext3 (default)
+# Format target device in ext4, ext3, ext2 or fat32.
+# Usage: make_fs ext2|ext4|fat32|ext3 (default)
 
 make_fs() {
 	local answer
 
 	FS=$(echo $fs_type | tr '[A-Z]' '[a-z]')
 	case "$FS" in
-		ext3|ext2)
+		ext4|ext3|ext2)
 			newline; _ 'Processing...'
 			_ 'Label: %s' "$label"
 			echo "Mkfs: mkfs.$FS -L \"$label\" $DEVICE"
@@ -318,10 +306,10 @@
 	sed -i -e "s/\(root=.*\)/\1 home=$UUID/" $(grep -l append $TARGET_ROOT/boot/$ST/*)
 
 	# Splash screen and help files.
-	cp /media/cdrom/boot/isolinux/splash.* $TARGET_ROOT/boot/$ST
-	cp /media/cdrom/boot/isolinux/*.cfg    $TARGET_ROOT/boot/$ST
-	cp /media/cdrom/boot/isolinux/*.kbd    $TARGET_ROOT/boot/$ST
-	cp /media/cdrom/boot/isolinux/*.c32    $TARGET_ROOT/boot/$ST
+	cp /media/cdrom/boot/isolinux/splash.*	$TARGET_ROOT/boot/$ST
+	cp /media/cdrom/boot/isolinux/*.cfg	$TARGET_ROOT/boot/$ST
+	cp /media/cdrom/boot/isolinux/*.kbd	$TARGET_ROOT/boot/$ST
+	cp /media/cdrom/boot/isolinux/*.c32	$TARGET_ROOT/boot/$ST
 	sed -i -e s/'SliTaz GNU\/Linux'/'SliTaz GNU\/Linux LiveUSB'/ \
 		-e "s/isolinux/$ST/" $TARGET_ROOT/boot/$ST/$ST.$STE
 }
@@ -569,7 +557,6 @@
 		get_label
 		unmount_target_usb
 		make_fs "$fs_type"
-		# mkfs_ext3
 		separator
 		longline "$(_ 'Device %s is ready to use as LiveUSB and/or /home partition.' "$label ($DEVICE)")"
 		;;