tazusb rev 183

tazusb: ext4 support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Feb 04 12:45:09 2016 +0100 (2016-02-04)
parents 6486fbd6dccf
children bce29264a97b
files po/tazusb/el.po po/tazusb/fr.po po/tazusb/pl.po po/tazusb/pt_BR.po po/tazusb/ru.po po/tazusb/tazusb.pot po/tazusb/zh_CN.po tazusb
line diff
     1.1 --- a/po/tazusb/el.po	Sat Nov 07 02:57:11 2015 +0200
     1.2 +++ b/po/tazusb/el.po	Thu Feb 04 12:45:09 2016 +0100
     1.3 @@ -46,11 +46,11 @@
     1.4  
     1.5  #: tazusb:42
     1.6  msgid ""
     1.7 -"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     1.8 +"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     1.9  "home). Default is ext3."
    1.10  msgstr ""
    1.11  "Κάντε διαμόρφωση (format) και επισημάντε την συσκευή με ένα σύστημα αρχείων "
    1.12 -"σε ext3, ext2 ή fat32 (για το LiveUSB ή το /home). Η προεπιλογή είναι το "
    1.13 +"σε ext4, ext3, ext2 ή fat32 (για το LiveUSB ή το /home). Η προεπιλογή είναι το "
    1.14  "ext3."
    1.15  
    1.16  #: tazusb:43
    1.17 @@ -102,16 +102,16 @@
    1.18  msgstr ""
    1.19  
    1.20  #: tazusb:132
    1.21 -msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
    1.22 +msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
    1.23  msgstr ""
    1.24 -"Παρακαλώ ορίστε ένα σύστημα αρχείων του τύπου ext2, ext3 ή fat32 (ext3): "
    1.25 +"Παρακαλώ ορίστε ένα σύστημα αρχείων του τύπου ext2, ext3, ext4 ή fat32 (ext3): "
    1.26  
    1.27  #: tazusb:141
    1.28  msgid "Please specify the filesystem type to %s."
    1.29  msgstr ""
    1.30  
    1.31  #: tazusb:142
    1.32 -msgid "Available formats are ext3(default), ext2 or fat32."
    1.33 +msgid "Available formats are ext4, ext3(default), ext2 or fat32."
    1.34  msgstr ""
    1.35  
    1.36  #: tazusb:143
     2.1 --- a/po/tazusb/fr.po	Sat Nov 07 02:57:11 2015 +0200
     2.2 +++ b/po/tazusb/fr.po	Thu Feb 04 12:45:09 2016 +0100
     2.3 @@ -44,10 +44,10 @@
     2.4  
     2.5  #: tazusb:42
     2.6  msgid ""
     2.7 -"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     2.8 +"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     2.9  "home). Default is ext3."
    2.10  msgstr ""
    2.11 -"Formater et nommer un périphérique en ext3, ext2 ou fat32 (pour LiveUSB ou /"
    2.12 +"Formater et nommer un périphérique en ext4, ext3, ext2 ou fat32 (pour LiveUSB ou /"
    2.13  "home). ext3 Par défault."
    2.14  
    2.15  #: tazusb:43
    2.16 @@ -94,16 +94,16 @@
    2.17  msgstr ""
    2.18  
    2.19  #: tazusb:132
    2.20 -msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
    2.21 -msgstr "Donnez le type de système de fichiers ext2, ext3 ou fat32 (ext3): "
    2.22 +msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
    2.23 +msgstr "Donnez le type de système de fichiers ext2, ext3, ext4 ou fat32 (ext3): "
    2.24  
    2.25  #: tazusb:141
    2.26  #, fuzzy
    2.27  msgid "Please specify the filesystem type to %s."
    2.28 -msgstr "Donnez le type de système de fichiers ext2, ext3 ou fat32 (ext3): "
    2.29 +msgstr "Donnez le type de système de fichiers ext2, ext3, ext4 ou fat32 (ext3): "
    2.30  
    2.31  #: tazusb:142
    2.32 -msgid "Available formats are ext3(default), ext2 or fat32."
    2.33 +msgid "Available formats are ext4, ext3(default), ext2 or fat32."
    2.34  msgstr ""
    2.35  
    2.36  #: tazusb:143
     3.1 --- a/po/tazusb/pl.po	Sat Nov 07 02:57:11 2015 +0200
     3.2 +++ b/po/tazusb/pl.po	Thu Feb 04 12:45:09 2016 +0100
     3.3 @@ -51,10 +51,10 @@
     3.4  
     3.5  #: tazusb:42
     3.6  msgid ""
     3.7 -"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     3.8 +"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     3.9  "home). Default is ext3."
    3.10  msgstr ""
    3.11 -"Formatuj i nadaj etykietę urządzeniowi z systemem plików ext2, ext3 albo "
    3.12 +"Formatuj i nadaj etykietę urządzeniowi z systemem plików ext2, ext3, ext4 albo "
    3.13  "fat32 (dla LiveUSB albo /home). Domyślnie ext3."
    3.14  
    3.15  #: tazusb:43
    3.16 @@ -100,15 +100,15 @@
    3.17  msgstr ""
    3.18  
    3.19  #: tazusb:132
    3.20 -msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
    3.21 -msgstr "Proszę wprowadzić użyty system plików ext2, ext3 lub fat32 (ext3): "
    3.22 +msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
    3.23 +msgstr "Proszę wprowadzić użyty system plików ext2, ext3, ext4 lub fat32 (ext3): "
    3.24  
    3.25  #: tazusb:141
    3.26  msgid "Please specify the filesystem type to %s."
    3.27  msgstr ""
    3.28  
    3.29  #: tazusb:142
    3.30 -msgid "Available formats are ext3(default), ext2 or fat32."
    3.31 +msgid "Available formats are ext4, ext3(default), ext2 or fat32."
    3.32  msgstr ""
    3.33  
    3.34  #: tazusb:143
     4.1 --- a/po/tazusb/pt_BR.po	Sat Nov 07 02:57:11 2015 +0200
     4.2 +++ b/po/tazusb/pt_BR.po	Thu Feb 04 12:45:09 2016 +0100
     4.3 @@ -47,10 +47,10 @@
     4.4  
     4.5  #: tazusb:42
     4.6  msgid ""
     4.7 -"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     4.8 +"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     4.9  "home). Default is ext3."
    4.10  msgstr ""
    4.11 -"Rotula e formata o dispositivo como ext3, ext2 ou fat32 (para LiveUSB ou /"
    4.12 +"Rotula e formata o dispositivo como ext4, ext3, ext2 ou fat32 (para LiveUSB ou /"
    4.13  "home). Padrão é ext3."
    4.14  
    4.15  #: tazusb:43
    4.16 @@ -96,16 +96,16 @@
    4.17  msgstr ""
    4.18  
    4.19  #: tazusb:132
    4.20 -msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
    4.21 -msgstr "Por favor escolha ext2, ext3 ou fat32 para formatação (ext3): "
    4.22 +msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
    4.23 +msgstr "Por favor escolha ext2, ext3, ext4 ou fat32 para formatação (ext3): "
    4.24  
    4.25  #: tazusb:141
    4.26  #, fuzzy
    4.27  msgid "Please specify the filesystem type to %s."
    4.28 -msgstr "Por favor escolha ext2, ext3 ou fat32 para formatação (ext3): "
    4.29 +msgstr "Por favor escolha ext2, ext3, ext4 ou fat32 para formatação (ext3): "
    4.30  
    4.31  #: tazusb:142
    4.32 -msgid "Available formats are ext3(default), ext2 or fat32."
    4.33 +msgid "Available formats are ext4, ext3(default), ext2 or fat32."
    4.34  msgstr ""
    4.35  
    4.36  #: tazusb:143
     5.1 --- a/po/tazusb/ru.po	Sat Nov 07 02:57:11 2015 +0200
     5.2 +++ b/po/tazusb/ru.po	Thu Feb 04 12:45:09 2016 +0100
     5.3 @@ -48,10 +48,10 @@
     5.4  
     5.5  #: tazusb:42
     5.6  msgid ""
     5.7 -"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or "
     5.8 +"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or "
     5.9  "/home). Default is ext3."
    5.10  msgstr ""
    5.11 -"Форматировать устройство в файловую систему ext3, ext2 или fat32 и присвоить "
    5.12 +"Форматировать устройство в файловую систему ext4, ext3, ext2 или fat32 и присвоить "
    5.13  "метку диску (для LiveUSB или /home). По умолчанию ext3."
    5.14  
    5.15  #: tazusb:43
    5.16 @@ -101,17 +101,17 @@
    5.17  msgstr "Метка: %s"
    5.18  
    5.19  #: tazusb:132
    5.20 -msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
    5.21 +msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
    5.22  msgstr ""
    5.23 -"Пожалуйста, укажите тип файловой системы: ext2, ext3 или fat32 (ext3): "
    5.24 +"Пожалуйста, укажите тип файловой системы: ext2, ext3, ext4 или fat32 (ext3): "
    5.25  
    5.26  #: tazusb:141
    5.27  msgid "Please specify the filesystem type to %s."
    5.28  msgstr "Пожалуйста, укажите тип файловой системы для команды «%s»."
    5.29  
    5.30  #: tazusb:142
    5.31 -msgid "Available formats are ext3(default), ext2 or fat32."
    5.32 -msgstr "Доступные форматы: ext3 (по умолчанию), ext2 или fat32."
    5.33 +msgid "Available formats are ext4, ext3(default), ext2 or fat32."
    5.34 +msgstr "Доступные форматы: ext4, ext3 (по умолчанию), ext2 или fat32."
    5.35  
    5.36  #: tazusb:143
    5.37  msgid "Press enter to keep the default value."
     6.1 --- a/po/tazusb/tazusb.pot	Sat Nov 07 02:57:11 2015 +0200
     6.2 +++ b/po/tazusb/tazusb.pot	Thu Feb 04 12:45:09 2016 +0100
     6.3 @@ -45,7 +45,7 @@
     6.4  
     6.5  #: tazusb:42
     6.6  msgid ""
     6.7 -"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     6.8 +"Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /"
     6.9  "home). Default is ext3."
    6.10  msgstr ""
    6.11  
    6.12 @@ -92,7 +92,7 @@
    6.13  msgstr ""
    6.14  
    6.15  #: tazusb:132
    6.16 -msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
    6.17 +msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
    6.18  msgstr ""
    6.19  
    6.20  #: tazusb:141
    6.21 @@ -100,7 +100,7 @@
    6.22  msgstr ""
    6.23  
    6.24  #: tazusb:142
    6.25 -msgid "Available formats are ext3(default), ext2 or fat32."
    6.26 +msgid "Available formats are ext4, ext3(default), ext2 or fat32."
    6.27  msgstr ""
    6.28  
    6.29  #: tazusb:143
     7.1 --- a/po/tazusb/zh_CN.po	Sat Nov 07 02:57:11 2015 +0200
     7.2 +++ b/po/tazusb/zh_CN.po	Thu Feb 04 12:45:09 2016 +0100
     7.3 @@ -95,15 +95,15 @@
     7.4  msgstr ""
     7.5  
     7.6  #: tazusb:132
     7.7 -msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
     7.8 -msgstr "请指定一个文件系统类型的ext2,ext3或FAT32(ext3):"
     7.9 +msgid "Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): "
    7.10 +msgstr "请指定一个文件系统类型的ext2,ext3,ext4或FAT32(ext3):"
    7.11  
    7.12  #: tazusb:141
    7.13  msgid "Please specify the filesystem type to %s."
    7.14  msgstr ""
    7.15  
    7.16  #: tazusb:142
    7.17 -msgid "Available formats are ext3(default), ext2 or fat32."
    7.18 +msgid "Available formats are ext4, ext3(default), ext2 or fat32."
    7.19  msgstr ""
    7.20  
    7.21  #: tazusb:143
     8.1 --- a/tazusb	Sat Nov 07 02:57:11 2015 +0200
     8.2 +++ b/tazusb	Thu Feb 04 12:45:09 2016 +0100
     8.3 @@ -39,7 +39,7 @@
     8.4  	optlist "\
     8.5  usage		$(_ 'Print this short usage.')
     8.6  writefs		$(_ 'Write the current filesystem to rootfs.gz. Supported compression: lzma, gzip, none.')
     8.7 -format		$(_ 'Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /home). Default is ext3.')
     8.8 +format		$(_ 'Format and label device with ext4, ext3, ext2 or fat32 filesystem (for LiveUSB or /home). Default is ext3.')
     8.9  gen-liveusb	$(_ 'Generate a bootable LiveUSB using files from the LiveCD.')
    8.10  gen-swap	$(_ 'Create or recreate and activate additional swap memory.')
    8.11  gen-iso2usb	$(_ 'Generate a bootable LiveUSB using files from ISO file.')
    8.12 @@ -111,22 +111,10 @@
    8.13  }
    8.14  
    8.15  
    8.16 -# Format target device and label partition.
    8.17 -
    8.18 -mkfs_ext3() {
    8.19 -	get_label
    8.20 -
    8.21 -	_ 'Label: %s' "$label"
    8.22 -	echo "Mkfs: mkfs.ext3 -L \"$label\" $DEVICE"
    8.23 -	newline; sleep 2
    8.24 -	mkfs.ext3 -L "$label" $DEVICE
    8.25 -}
    8.26 -
    8.27 -
    8.28  # Get fs type. Supported fs are ext3, ext2, fat32
    8.29  
    8.30  get_fs_type() {
    8.31 -	_n 'Please specify a filesystem type ext2, ext3 or fat32 (ext3): '
    8.32 +	_n 'Please specify a filesystem type ext2, ext3, ext4 or fat32 (ext3): '
    8.33  	read fs_type
    8.34  	[ -z "$fs_type" ] && fs_type='ext3'
    8.35  }
    8.36 @@ -136,7 +124,7 @@
    8.37  
    8.38  ask_for_fs_type() {
    8.39  	_ 'Please specify the filesystem type to %s.' "$COMMAND"
    8.40 -	_ 'Available formats are ext3(default), ext2 or fat32.'
    8.41 +	_ 'Available formats are ext4, ext3(default), ext2 or fat32.'
    8.42  	_ 'Press enter to keep the default value.'
    8.43  	newline
    8.44  	_n 'File system type: '; read answer
    8.45 @@ -148,15 +136,15 @@
    8.46  }
    8.47  
    8.48  
    8.49 -# Format target device in ext3, ext2 or fat32.
    8.50 -# Usage: make_fs ext2|fat32|ext3 (default)
    8.51 +# Format target device in ext4, ext3, ext2 or fat32.
    8.52 +# Usage: make_fs ext2|ext4|fat32|ext3 (default)
    8.53  
    8.54  make_fs() {
    8.55  	local answer
    8.56  
    8.57  	FS=$(echo $fs_type | tr '[A-Z]' '[a-z]')
    8.58  	case "$FS" in
    8.59 -		ext3|ext2)
    8.60 +		ext4|ext3|ext2)
    8.61  			newline; _ 'Processing...'
    8.62  			_ 'Label: %s' "$label"
    8.63  			echo "Mkfs: mkfs.$FS -L \"$label\" $DEVICE"
    8.64 @@ -318,10 +306,10 @@
    8.65  	sed -i -e "s/\(root=.*\)/\1 home=$UUID/" $(grep -l append $TARGET_ROOT/boot/$ST/*)
    8.66  
    8.67  	# Splash screen and help files.
    8.68 -	cp /media/cdrom/boot/isolinux/splash.* $TARGET_ROOT/boot/$ST
    8.69 -	cp /media/cdrom/boot/isolinux/*.cfg    $TARGET_ROOT/boot/$ST
    8.70 -	cp /media/cdrom/boot/isolinux/*.kbd    $TARGET_ROOT/boot/$ST
    8.71 -	cp /media/cdrom/boot/isolinux/*.c32    $TARGET_ROOT/boot/$ST
    8.72 +	cp /media/cdrom/boot/isolinux/splash.*	$TARGET_ROOT/boot/$ST
    8.73 +	cp /media/cdrom/boot/isolinux/*.cfg	$TARGET_ROOT/boot/$ST
    8.74 +	cp /media/cdrom/boot/isolinux/*.kbd	$TARGET_ROOT/boot/$ST
    8.75 +	cp /media/cdrom/boot/isolinux/*.c32	$TARGET_ROOT/boot/$ST
    8.76  	sed -i -e s/'SliTaz GNU\/Linux'/'SliTaz GNU\/Linux LiveUSB'/ \
    8.77  		-e "s/isolinux/$ST/" $TARGET_ROOT/boot/$ST/$ST.$STE
    8.78  }
    8.79 @@ -569,7 +557,6 @@
    8.80  		get_label
    8.81  		unmount_target_usb
    8.82  		make_fs "$fs_type"
    8.83 -		# mkfs_ext3
    8.84  		separator
    8.85  		longline "$(_ 'Device %s is ready to use as LiveUSB and/or /home partition.' "$label ($DEVICE)")"
    8.86  		;;