From 2c3771deb1f69902c994861a5b6687acc8001a49 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 5 Jun 2010 14:15:34 +0200 Subject: [PATCH] Adding upstream version 2.0~a5. --- Makefile | 5 - VERSION | 2 +- bin/live-snapshot | 6 +- conf/live.conf | 7 -- docs/parameters.txt | 1 + hooks/live | 8 -- manpages/de/live-boot.de.7 | 22 +++- manpages/de/live-snapshot.de.1 | 2 +- manpages/en/live-boot.7 | 19 ++- manpages/en/live-snapshot.1 | 2 +- manpages/po/de/live-boot.7.po | 237 ++++++++++++++++++++--------------- manpages/po/de/live-snapshot.1.po | 48 ++++--- manpages/pot/live-boot.7.pot | 230 ++++++++++++++++++--------------- manpages/pot/live-snapshot.1.pot | 40 +++--- scripts/live | 135 +++++++------------- scripts/live-bottom/02etc_live_conf | 51 -------- scripts/live-bottom/23networking | 2 +- scripts/live-bottom/25configure_init | 2 + scripts/live-bottom/41apt_cdrom | 47 ------- 19 files changed, 399 insertions(+), 467 deletions(-) delete mode 100644 conf/live.conf delete mode 100755 scripts/live-bottom/02etc_live_conf delete mode 100755 scripts/live-bottom/41apt_cdrom diff --git a/Makefile b/Makefile index 7b15560..85b8909 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,6 @@ build: install: # (FIXME) # Installing configuration - install -D -m 0644 conf/live.conf $(DESTDIR)/etc/live.conf install -D -m 0644 conf/compcache $(DESTDIR)/usr/share/initramfs-tools/conf.d/compcache # Installing executables @@ -79,10 +78,6 @@ install: done uninstall: - # (FIXME) - # Uninstalling configuration - rm -f $(DESTDIR)/etc/live.conf - # Uninstalling executables rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile rm -rf $(DESTDIR)/usr/share/live-boot diff --git a/VERSION b/VERSION index b73365a..d670b1b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0~a4 +2.0~a5 diff --git a/bin/live-snapshot b/bin/live-snapshot index 1e080c3..08e5fd6 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -40,7 +40,11 @@ fi . /usr/share/initramfs-tools/scripts/live-helpers LIVE_CONF="/etc/live.conf" -. "${LIVE_CONF}" + +if [ -r "${LIVE_CONF}" ] +then + . "${LIVE_CONF}" +fi export USERNAME USERFULLNAME HOSTNAME diff --git a/conf/live.conf b/conf/live.conf deleted file mode 100644 index 93bf41d..0000000 --- a/conf/live.conf +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/live.conf - configuration file for live-boot(7) - -USERNAME="user" -USERFULLNAME="Debian Live user" -HOSTNAME="debian" - -export USERNAME USERFULLNAME HOSTNAME diff --git a/docs/parameters.txt b/docs/parameters.txt index 60ad650..a9ef77c 100644 --- a/docs/parameters.txt +++ b/docs/parameters.txt @@ -9,6 +9,7 @@ live access=ACCESS live console=TTY,SPEED live debug live fetch=URL +live httpfs=URL live hostname=HOSTNAME live username=USER live userfullname=USERFULLNAME diff --git a/hooks/live b/hooks/live index 645b168..adadab3 100755 --- a/hooks/live +++ b/hooks/live @@ -27,14 +27,6 @@ esac # Handling live-boot # Configuration -if [ -r /etc/live.conf ] -then - . /etc/live.conf - - mkdir -p "${DESTDIR}"/etc - cp /etc/live.conf "${DESTDIR}"/etc -fi - mkdir -p "${DESTDIR}"/usr/share/live-boot cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 60f6f1c..1802607 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 02.06.2010 2.0~a4 "Debian Live Projekt" +.TH LIVE\-BOOT 7 2010\-06\-05 2.0~a5 "Debian Live Projekt" .SH NAME \fBlive\-boot\fP \- System Boot Skripte @@ -54,10 +54,22 @@ Set the default console to be used with the "live\-getty" option. Example: "console=ttyS0,115200" .IP \fBdebug\fP 4 Makes initramfs boot process more verbose. +.br +Use: debug=1 +.br +Without setting debug to a value the messages may not be shown. .IP \fBfetch\fP=\fIURL\fP 4 -Another form of netboot by downloading a squashfs image from a given url, -copying to ram and booting it. Due to current limitations in busyboxs wget -and DNS resolution, an URL can not contain a hostname but an IP only. +.IP \fBhttpfs\fP=\fIURL\fP 4 +Another form of netboot by downloading a squashfs image from a given url. +The fetch method copies the image to ram and the httpfs method uses fuse and +httpfs2 to mount the image in place. Copying to ram requires more memory and +might take a long time for large images. However, it is more likely to work +correctly because it does not require networking afterwards and the system +operates faster once booted because it does not require to contact the +server anymore. +.br +Due to current limitations in busyboxs wget and DNS resolution, an URL can +not contain a hostname but an IP only. .br Not working: http://example.com/path/to/your_filesystem.squashfs .br @@ -66,6 +78,8 @@ Working: http://1.2.3.4/path/to/your_filesystem.squashfs Also note that therefore it's currently not possible to fetch an image from a namebased virtualhost of an httpd if it is sharing the ip with the main httpd instance. +.br +You may also use the live iso image in place of the squashfs image. .IP \fBignore_uuid\fP 4 Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1 index 27d332d..d7104c5 100644 --- a/manpages/de/live-snapshot.de.1 +++ b/manpages/de/live-snapshot.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 1 02.06.2010 2.0~a4 "Debian Live Projekt" +.TH LIVE\-BOOT 1 2010\-06\-05 2.0~a5 "Debian Live Projekt" .SH NAME \fBlive\-snapshot\fP \- simple script to ease persistence usage diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 8788297..4068a6f 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2010\-06\-02 2.0~a4 "Debian Live Project" +.TH LIVE\-BOOT 7 2010\-06\-05 2.0~a5 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts @@ -32,14 +32,29 @@ Set the accessibility level for physically or visually impared users. ACCESS mus Set the default console to be used with the "live\-getty" option. Example: "console=ttyS0,115200" .IP "\fBdebug\fR" 4 Makes initramfs boot process more verbose. +.br +Use: debug=1 +.br +Without setting debug to a value the messages may not be shown. .IP "\fBfetch\fR=\fIURL\fR" 4 -Another form of netboot by downloading a squashfs image from a given url, copying to ram and booting it. Due to current limitations in busyboxs wget and DNS resolution, an URL can not contain a hostname but an IP only. +.IP "\fBhttpfs\fR=\fIURL\fR" 4 +Another form of netboot by downloading a squashfs image from a given url. +The fetch method copies the image to ram and the httpfs method uses fuse and +httpfs2 to mount the image in place. Copying to ram requires more memory and +might take a long time for large images. However, it is more likely to work +correctly because it does not require networking afterwards and the system +operates faster once booted because it does not require to contact the server +anymore. +.br +Due to current limitations in busyboxs wget and DNS resolution, an URL can not contain a hostname but an IP only. .br Not working: http://example.com/path/to/your_filesystem.squashfs .br Working: http://1.2.3.4/path/to/your_filesystem.squashfs .br Also note that therefore it's currently not possible to fetch an image from a namebased virtualhost of an httpd if it is sharing the ip with the main httpd instance. +.br +You may also use the live iso image in place of the squashfs image. .IP "\fBignore_uuid\fR" 4 Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs. .IP "\fBintegrity\-check\fR" 4 diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1 index 7fe40c7..3ac5585 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2010\-06\-02 2.0~a4 "Debian Live Project" +.TH LIVE\-BOOT 1 2010\-06\-05 2.0~a5 "Debian Live Project" .SH NAME \fBlive\-snapshot\fR \- simple script to ease persistence usage diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index f285065..4a6ef79 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 2.0~a4\n" -"POT-Creation-Date: 2010-06-02 22:46+0300\n" +"Project-Id-Version: live-boot 2.0~a5\n" +"POT-Creation-Date: 2010-06-05 14:11+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -23,15 +23,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 -#, no-wrap -msgid "2010-06-02" -msgstr "02.06.2010" +msgid "2010-06-05" +msgstr "05.06.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 -#, no-wrap -msgid "2.0~a4" -msgstr "2.0~a4" +msgid "2.0~a5" +msgstr "2.0~a5" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 @@ -186,46 +184,77 @@ msgstr "B" msgid "Makes initramfs boot process more verbose." msgstr "" +#. type: Plain text +#: en/live-boot.7:37 +msgid "Use: debug=1" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:39 +msgid "Without setting debug to a value the messages may not be shown." +msgstr "" + #. type: IP -#: en/live-boot.7:35 +#: en/live-boot.7:39 #, no-wrap msgid "B=I" msgstr "B=I" +#. type: IP +#: en/live-boot.7:40 +msgid "B=I" +msgstr "B=I" + #. type: Plain text -#: en/live-boot.7:37 +#: en/live-boot.7:48 msgid "" -"Another form of netboot by downloading a squashfs image from a given url, " -"copying to ram and booting it. Due to current limitations in busyboxs wget " -"and DNS resolution, an URL can not contain a hostname but an IP only." +"Another form of netboot by downloading a squashfs image from a given url. " +"The fetch method copies the image to ram and the httpfs method uses fuse and " +"httpfs2 to mount the image in place. Copying to ram requires more memory and " +"might take a long time for large images. However, it is more likely to work " +"correctly because it does not require networking afterwards and the system " +"operates faster once booted because it does not require to contact the " +"server anymore." msgstr "" #. type: Plain text -#: en/live-boot.7:39 +#: en/live-boot.7:50 +msgid "" +"Due to current limitations in busyboxs wget and DNS resolution, an URL can " +"not contain a hostname but an IP only." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:52 msgid "Not working: http://example.com/path/to/your_filesystem.squashfs" msgstr "" #. type: Plain text -#: en/live-boot.7:41 +#: en/live-boot.7:54 msgid "Working: http://1.2.3.4/path/to/your_filesystem.squashfs" msgstr "" #. type: Plain text -#: en/live-boot.7:43 +#: en/live-boot.7:56 msgid "" "Also note that therefore it's currently not possible to fetch an image from " "a namebased virtualhost of an httpd if it is sharing the ip with the main " "httpd instance." msgstr "" +#. type: Plain text +#: en/live-boot.7:58 +msgid "You may also use the live iso image in place of the squashfs image." +msgstr "" + #. type: IP -#: en/live-boot.7:43 +#: en/live-boot.7:58 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:45 +#: en/live-boot.7:60 msgid "" "Do not check that any UUID embedded in the initramfs matches the discovered " "medium. live-boot may be told to generate a UUID by setting " @@ -233,13 +262,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:45 +#: en/live-boot.7:60 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:47 +#: en/live-boot.7:62 msgid "" "If specified, an MD5 sum is calculated on the live media during boot and " "compared to the value found in md5sum.txt found in the root directory of the " @@ -247,13 +276,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:47 +#: en/live-boot.7:62 #, no-wrap msgid "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" msgstr "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" #. type: Plain text -#: en/live-boot.7:49 +#: en/live-boot.7:64 msgid "" "Let you specify the name(s) and the options of the interface(s) that should " "be configured at boot time. Do not specify this if you want to use dhcp " @@ -263,13 +292,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:49 +#: en/live-boot.7:64 #, no-wrap msgid "B=[I]" msgstr "B=[I]" #. type: Plain text -#: en/live-boot.7:51 +#: en/live-boot.7:66 msgid "" "If this variable is set, dhcp and static configuration are just skipped and " "the system will use the (must be) media-preconfigured /etc/network/" @@ -277,13 +306,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:51 +#: en/live-boot.7:66 #, no-wrap msgid "{B|B}=I, {B|B}=I, {B|B}=I, {BI<|>B}=I, B=I" msgstr "{B|B}=I, {B|B}=I, {B|B}=I, {BI<|>B}=I, B=I" #. type: Plain text -#: en/live-boot.7:53 +#: en/live-boot.7:68 msgid "" "Configure the running keyboard as specified, if this one misses live-boot " "behaves as if \"keyb=us\" was specified. It will be interfered from \"locale=" @@ -292,13 +321,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:53 +#: en/live-boot.7:68 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:55 +#: en/live-boot.7:70 msgid "" "This changes the auto-login on virtual terminals to use the (experimental) " "live-getty code. With this option set the standard kernel argument \"console=" @@ -307,13 +336,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:55 +#: en/live-boot.7:70 #, no-wrap msgid "{B|B}=I" msgstr "{B|B}=I" #. type: Plain text -#: en/live-boot.7:57 +#: en/live-boot.7:72 msgid "" "If you specify one of this two equivalent forms, live-boot will first try to " "find this device for the \"/live\" directory where the read-only root " @@ -322,7 +351,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:59 +#: en/live-boot.7:74 msgid "" "Instead of specifing an actual device name, the keyword 'removable' can be " "used to limit the search of acceptable live media to removable type only. " @@ -331,13 +360,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:59 +#: en/live-boot.7:74 #, no-wrap msgid "{B|B}=I" msgstr "{B|B}=I" #. type: Plain text -#: en/live-boot.7:61 +#: en/live-boot.7:76 msgid "" "live-boot will mount the encrypted rootfs TYPE, asking the passphrase, " "useful to build paranoid live systems :-). TYPE supported so far are \"aes\" " @@ -345,13 +374,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:61 +#: en/live-boot.7:76 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:63 +#: en/live-boot.7:78 msgid "" "This way you could tell live-boot that your image starts at offset BYTES in " "the above specified or autodiscovered device, this could be useful to hide " @@ -360,13 +389,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:63 +#: en/live-boot.7:78 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:65 +#: en/live-boot.7:80 msgid "" "Sets the path to the live filesystem on the medium. By default, it is set to " "'/live' and you should not change that unless you have customized your media " @@ -374,26 +403,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:65 +#: en/live-boot.7:80 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:67 +#: en/live-boot.7:82 msgid "" "Set the timeout in seconds for the device specified by \"live-media=\" to " "become ready before giving up." msgstr "" #. type: IP -#: en/live-boot.7:67 +#: en/live-boot.7:82 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:69 +#: en/live-boot.7:84 msgid "" "Instead of using the default optional file \"filesystem.module\" (see below) " "another file could be specified without the extension \".module\"; it should " @@ -401,13 +430,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:69 +#: en/live-boot.7:84 #, no-wrap msgid "B[=nfs|cifs]" msgstr "B[=nfs|cifs]" #. type: Plain text -#: en/live-boot.7:71 +#: en/live-boot.7:86 msgid "" "This tells live-boot to perform a network mount. The parameter \"nfsroot=" "\" (with optional \"nfsopts=\"), should specify where is the location of the " @@ -415,24 +444,24 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:71 +#: en/live-boot.7:86 #, no-wrap msgid "B=" msgstr "B=" #. type: Plain text -#: en/live-boot.7:73 +#: en/live-boot.7:88 msgid "This lets you specify custom nfs options." msgstr "" #. type: IP -#: en/live-boot.7:73 +#: en/live-boot.7:88 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:75 +#: en/live-boot.7:90 msgid "" "This parameter disables the default disabling of filesystem checks in /etc/" "fstab. If you have static filesystems on your harddisk and you want them to " @@ -440,48 +469,48 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:75 +#: en/live-boot.7:90 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:77 +#: en/live-boot.7:92 msgid "" "disables the \"persistent\" feature, useful if the bootloader (like " "syslinux) has been installed with persistent enabled." msgstr "" #. type: IP -#: en/live-boot.7:77 +#: en/live-boot.7:92 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:79 +#: en/live-boot.7:94 msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot." msgstr "" #. type: IP -#: en/live-boot.7:79 +#: en/live-boot.7:94 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:81 +#: en/live-boot.7:96 msgid "This parameter enables usage of local swap partitions." msgstr "" #. type: IP -#: en/live-boot.7:81 +#: en/live-boot.7:96 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:83 +#: en/live-boot.7:98 msgid "" "This parameter disables Xorg auto-reconfiguration at boot time. This is " "valuable if you either do the detection on your own, or, if you want to ship " @@ -489,13 +518,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:83 +#: en/live-boot.7:98 #, no-wrap msgid "B[=nofiles]" msgstr "B[=nofiles]" #. type: Plain text -#: en/live-boot.7:85 +#: en/live-boot.7:100 msgid "" "live-boot will look for persistent and snapshot partitions or files labeled " "\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and " @@ -509,13 +538,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:85 +#: en/live-boot.7:100 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:87 +#: en/live-boot.7:102 msgid "" "live-boot will look for persistency files in the root directory of a " "partition, with this parameter, the path can be configured so that you can " @@ -523,26 +552,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:87 +#: en/live-boot.7:102 #, no-wrap msgid "{B|B}=I" msgstr "{B|B}=I" #. type: Plain text -#: en/live-boot.7:89 +#: en/live-boot.7:104 msgid "" "A path to a file present on the rootfs could be used to preseed debconf " "database." msgstr "" #. type: IP -#: en/live-boot.7:89 +#: en/live-boot.7:104 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:91 +#: en/live-boot.7:106 msgid "" "All debian installed packages could be preseeded from command-line that way, " "beware of blanks spaces, they will interfere with parsing, use a preseed " @@ -550,26 +579,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:91 +#: en/live-boot.7:106 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:93 +#: en/live-boot.7:108 msgid "" "This option causes live-boot to reboot without attempting to eject the media " "and without asking the user to remove the boot media." msgstr "" #. type: IP -#: en/live-boot.7:93 +#: en/live-boot.7:108 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:95 +#: en/live-boot.7:110 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/live\". This is not enabled by default because " @@ -578,38 +607,38 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:95 +#: en/live-boot.7:110 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:97 +#: en/live-boot.7:112 msgid "" "If you boot with the normal quiet parameter, live-boot hides most messages " "of its own. When adding silent, it hides all." msgstr "" #. type: IP -#: en/live-boot.7:97 +#: en/live-boot.7:112 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:99 +#: en/live-boot.7:114 msgid "" "Start up to text-mode shell prompts, disabling the graphical user interface." msgstr "" #. type: IP -#: en/live-boot.7:99 +#: en/live-boot.7:114 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:101 +#: en/live-boot.7:116 msgid "" "Adding this parameter, live-boot will try to copy the entire read-only media " "to the specified device before mounting the root filesystem. It probably " @@ -619,13 +648,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:101 +#: en/live-boot.7:116 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:103 +#: en/live-boot.7:118 msgid "" "Adding this parameter, live-boot will try to copy the whole read-only media " "to the computer's RAM before mounting the root filesystem. This could need a " @@ -633,71 +662,71 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:103 +#: en/live-boot.7:118 #, no-wrap msgid "B=aufs|unionfs" msgstr "B=aufs|unionfs" #. type: Plain text -#: en/live-boot.7:105 +#: en/live-boot.7:120 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." msgstr "" #. type: IP -#: en/live-boot.7:105 +#: en/live-boot.7:120 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:107 +#: en/live-boot.7:122 msgid "" "Uses xdebconfigurator, if present on the rootfs, to configure X instead of " "the standard procedure (experimental)." msgstr "" #. type: IP -#: en/live-boot.7:107 +#: en/live-boot.7:122 #, no-wrap msgid "B=I" msgstr "B=I" #. FIXME #. type: Plain text -#: en/live-boot.7:110 +#: en/live-boot.7:125 msgid "Doesn't do xorg autodetection, but enforces a given resolution." msgstr "" #. FIXME #. type: SH -#: en/live-boot.7:112 +#: en/live-boot.7:127 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:113 en/live-snapshot.1:43 +#: en/live-boot.7:128 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -710,13 +739,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:119 en/live-snapshot.1:49 +#: en/live-boot.7:134 en/live-snapshot.1:49 msgid "" "This optional file (which resides in the rootfs system, not in the live " "media) is used as a list of directories which not need be persistent: ie. " @@ -725,7 +754,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:122 en/live-snapshot.1:51 +#: en/live-boot.7:137 en/live-snapshot.1:51 msgid "" "This saves expensive writes and speeds up operations on volatile data such " "as web caches and temporary files (like e.g. /tmp and .mozilla) which are " @@ -734,64 +763,64 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:123 en/live-snapshot.1:42 +#: en/live-boot.7:138 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "DATEIEN" #. type: IP -#: en/live-boot.7:124 +#: en/live-boot.7:139 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:125 +#: en/live-boot.7:140 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:126 +#: en/live-boot.7:141 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:127 +#: en/live-boot.7:142 #, no-wrap msgid "B" msgstr "B" #. type: SH -#: en/live-boot.7:129 en/live-snapshot.1:52 +#: en/live-boot.7:144 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: Plain text -#: en/live-boot.7:131 +#: en/live-boot.7:146 msgid "I(1)" msgstr "I(1)" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:56 +#: en/live-boot.7:148 en/live-snapshot.1:56 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:135 en/live-snapshot.1:58 +#: en/live-boot.7:150 en/live-snapshot.1:58 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:136 en/live-snapshot.1:59 +#: en/live-boot.7:151 en/live-snapshot.1:59 #, no-wrap msgid "HOMEPAGE" msgstr "HOMEPAGE" #. type: Plain text -#: en/live-boot.7:138 en/live-snapshot.1:61 +#: en/live-boot.7:153 en/live-snapshot.1:61 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -802,13 +831,13 @@ msgstr "" "unter EIE gefunden werden." #. type: SH -#: en/live-boot.7:139 en/live-snapshot.1:62 +#: en/live-boot.7:154 en/live-snapshot.1:62 #, no-wrap msgid "BUGS" msgstr "FEHLER" #. type: Plain text -#: en/live-boot.7:141 en/live-snapshot.1:64 +#: en/live-boot.7:156 en/live-snapshot.1:64 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -822,13 +851,13 @@ msgstr "" "werden." #. type: SH -#: en/live-boot.7:142 en/live-snapshot.1:65 +#: en/live-boot.7:157 en/live-snapshot.1:65 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:143 en/live-snapshot.1:66 +#: en/live-boot.7:158 en/live-snapshot.1:66 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po index 9bfc1a5..60993fd 100644 --- a/manpages/po/de/live-snapshot.1.po +++ b/manpages/po/de/live-snapshot.1.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 2.0~a4\n" -"POT-Creation-Date: 2010-06-02 22:46+0300\n" +"Project-Id-Version: live-boot 2.0~a5\n" +"POT-Creation-Date: 2010-06-05 14:11+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -23,15 +23,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 -#, no-wrap -msgid "2010-06-02" -msgstr "02.06.2010" +msgid "2010-06-05" +msgstr "05.06.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 -#, no-wrap -msgid "2.0~a4" -msgstr "2.0~a4" +msgid "2.0~a5" +msgstr "2.0~a5" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 @@ -58,26 +56,26 @@ msgid "OPTIONS" msgstr "OPTIONEN" #. type: IP -#: en/live-boot.7:113 en/live-snapshot.1:43 +#: en/live-boot.7:128 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -90,13 +88,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:119 en/live-snapshot.1:49 +#: en/live-boot.7:134 en/live-snapshot.1:49 msgid "" "This optional file (which resides in the rootfs system, not in the live " "media) is used as a list of directories which not need be persistent: ie. " @@ -105,7 +103,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:122 en/live-snapshot.1:51 +#: en/live-boot.7:137 en/live-snapshot.1:51 msgid "" "This saves expensive writes and speeds up operations on volatile data such " "as web caches and temporary files (like e.g. /tmp and .mozilla) which are " @@ -114,35 +112,35 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:123 en/live-snapshot.1:42 +#: en/live-boot.7:138 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "DATEIEN" #. type: SH -#: en/live-boot.7:129 en/live-snapshot.1:52 +#: en/live-boot.7:144 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:56 +#: en/live-boot.7:148 en/live-snapshot.1:56 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:135 en/live-snapshot.1:58 +#: en/live-boot.7:150 en/live-snapshot.1:58 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:136 en/live-snapshot.1:59 +#: en/live-boot.7:151 en/live-snapshot.1:59 #, no-wrap msgid "HOMEPAGE" msgstr "HOMEPAGE" #. type: Plain text -#: en/live-boot.7:138 en/live-snapshot.1:61 +#: en/live-boot.7:153 en/live-snapshot.1:61 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -153,13 +151,13 @@ msgstr "" "unter EIE gefunden werden." #. type: SH -#: en/live-boot.7:139 en/live-snapshot.1:62 +#: en/live-boot.7:154 en/live-snapshot.1:62 #, no-wrap msgid "BUGS" msgstr "FEHLER" #. type: Plain text -#: en/live-boot.7:141 en/live-snapshot.1:64 +#: en/live-boot.7:156 en/live-snapshot.1:64 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -173,13 +171,13 @@ msgstr "" "werden." #. type: SH -#: en/live-boot.7:142 en/live-snapshot.1:65 +#: en/live-boot.7:157 en/live-snapshot.1:65 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:143 en/live-snapshot.1:66 +#: en/live-boot.7:158 en/live-snapshot.1:66 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 134f99d..2eb3da4 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2010-06-02 22:46+0300\n" +"POT-Creation-Date: 2010-06-05 14:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,13 +24,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-06-02" +msgid "2010-06-05" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a4" +msgid "2.0~a5" msgstr "" #. type: TH @@ -180,46 +180,78 @@ msgstr "" msgid "Makes initramfs boot process more verbose." msgstr "" +#. type: Plain text +#: en/live-boot.7:37 +msgid "Use: debug=1" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:39 +msgid "Without setting debug to a value the messages may not be shown." +msgstr "" + #. type: IP -#: en/live-boot.7:35 +#: en/live-boot.7:39 #, no-wrap msgid "B=I" msgstr "" +#. type: IP +#: en/live-boot.7:40 +#, no-wrap +msgid "B=I" +msgstr "" + #. type: Plain text -#: en/live-boot.7:37 +#: en/live-boot.7:48 msgid "" -"Another form of netboot by downloading a squashfs image from a given url, " -"copying to ram and booting it. Due to current limitations in busyboxs wget " -"and DNS resolution, an URL can not contain a hostname but an IP only." +"Another form of netboot by downloading a squashfs image from a given url. " +"The fetch method copies the image to ram and the httpfs method uses fuse and " +"httpfs2 to mount the image in place. Copying to ram requires more memory and " +"might take a long time for large images. However, it is more likely to work " +"correctly because it does not require networking afterwards and the system " +"operates faster once booted because it does not require to contact the " +"server anymore." msgstr "" #. type: Plain text -#: en/live-boot.7:39 +#: en/live-boot.7:50 +msgid "" +"Due to current limitations in busyboxs wget and DNS resolution, an URL can " +"not contain a hostname but an IP only." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:52 msgid "Not working: http://example.com/path/to/your_filesystem.squashfs" msgstr "" #. type: Plain text -#: en/live-boot.7:41 +#: en/live-boot.7:54 msgid "Working: http://1.2.3.4/path/to/your_filesystem.squashfs" msgstr "" #. type: Plain text -#: en/live-boot.7:43 +#: en/live-boot.7:56 msgid "" "Also note that therefore it's currently not possible to fetch an image from " "a namebased virtualhost of an httpd if it is sharing the ip with the main " "httpd instance." msgstr "" +#. type: Plain text +#: en/live-boot.7:58 +msgid "You may also use the live iso image in place of the squashfs image." +msgstr "" + #. type: IP -#: en/live-boot.7:43 +#: en/live-boot.7:58 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:45 +#: en/live-boot.7:60 msgid "" "Do not check that any UUID embedded in the initramfs matches the discovered " "medium. live-boot may be told to generate a UUID by setting " @@ -227,13 +259,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:45 +#: en/live-boot.7:60 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:47 +#: en/live-boot.7:62 msgid "" "If specified, an MD5 sum is calculated on the live media during boot and " "compared to the value found in md5sum.txt found in the root directory of the " @@ -241,13 +273,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:47 +#: en/live-boot.7:62 #, no-wrap msgid "B=[I]:[I]:[I]:[I]:[I]:[I]:[I] [,[I]:[I]:[I]:[I]:[I]:[I]:[I]]" msgstr "" #. type: Plain text -#: en/live-boot.7:49 +#: en/live-boot.7:64 msgid "" "Let you specify the name(s) and the options of the interface(s) that should " "be configured at boot time. Do not specify this if you want to use dhcp " @@ -257,13 +289,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:49 +#: en/live-boot.7:64 #, no-wrap msgid "B=[I]" msgstr "" #. type: Plain text -#: en/live-boot.7:51 +#: en/live-boot.7:66 msgid "" "If this variable is set, dhcp and static configuration are just skipped and " "the system will use the (must be) media-preconfigured /etc/network/" @@ -271,13 +303,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:51 +#: en/live-boot.7:66 #, no-wrap msgid "{B|B}=I, {B|B}=I, {B|B}=I, {BI<|>B}=I, B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:53 +#: en/live-boot.7:68 msgid "" "Configure the running keyboard as specified, if this one misses live-boot " "behaves as if \"keyb=us\" was specified. It will be interfered from \"locale=" @@ -286,13 +318,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:53 +#: en/live-boot.7:68 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:55 +#: en/live-boot.7:70 msgid "" "This changes the auto-login on virtual terminals to use the (experimental) " "live-getty code. With this option set the standard kernel argument \"console=" @@ -301,13 +333,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:55 +#: en/live-boot.7:70 #, no-wrap msgid "{B|B}=I" msgstr "" #. type: Plain text -#: en/live-boot.7:57 +#: en/live-boot.7:72 msgid "" "If you specify one of this two equivalent forms, live-boot will first try to " "find this device for the \"/live\" directory where the read-only root " @@ -316,7 +348,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:59 +#: en/live-boot.7:74 msgid "" "Instead of specifing an actual device name, the keyword 'removable' can be " "used to limit the search of acceptable live media to removable type only. " @@ -325,13 +357,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:59 +#: en/live-boot.7:74 #, no-wrap msgid "{B|B}=I" msgstr "" #. type: Plain text -#: en/live-boot.7:61 +#: en/live-boot.7:76 msgid "" "live-boot will mount the encrypted rootfs TYPE, asking the passphrase, " "useful to build paranoid live systems :-). TYPE supported so far are \"aes\" " @@ -339,13 +371,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:61 +#: en/live-boot.7:76 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:63 +#: en/live-boot.7:78 msgid "" "This way you could tell live-boot that your image starts at offset BYTES in " "the above specified or autodiscovered device, this could be useful to hide " @@ -354,13 +386,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:63 +#: en/live-boot.7:78 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:65 +#: en/live-boot.7:80 msgid "" "Sets the path to the live filesystem on the medium. By default, it is set to " "'/live' and you should not change that unless you have customized your media " @@ -368,26 +400,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:65 +#: en/live-boot.7:80 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:67 +#: en/live-boot.7:82 msgid "" "Set the timeout in seconds for the device specified by \"live-media=\" to " "become ready before giving up." msgstr "" #. type: IP -#: en/live-boot.7:67 +#: en/live-boot.7:82 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:69 +#: en/live-boot.7:84 msgid "" "Instead of using the default optional file \"filesystem.module\" (see below) " "another file could be specified without the extension \".module\"; it should " @@ -395,13 +427,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:69 +#: en/live-boot.7:84 #, no-wrap msgid "B[=nfs|cifs]" msgstr "" #. type: Plain text -#: en/live-boot.7:71 +#: en/live-boot.7:86 msgid "" "This tells live-boot to perform a network mount. The parameter \"nfsroot=" "\" (with optional \"nfsopts=\"), should specify where is the location of the " @@ -409,24 +441,24 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:71 +#: en/live-boot.7:86 #, no-wrap msgid "B=" msgstr "" #. type: Plain text -#: en/live-boot.7:73 +#: en/live-boot.7:88 msgid "This lets you specify custom nfs options." msgstr "" #. type: IP -#: en/live-boot.7:73 +#: en/live-boot.7:88 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:75 +#: en/live-boot.7:90 msgid "" "This parameter disables the default disabling of filesystem checks in /etc/" "fstab. If you have static filesystems on your harddisk and you want them to " @@ -434,48 +466,48 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:75 +#: en/live-boot.7:90 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:77 +#: en/live-boot.7:92 msgid "" "disables the \"persistent\" feature, useful if the bootloader (like " "syslinux) has been installed with persistent enabled." msgstr "" #. type: IP -#: en/live-boot.7:77 +#: en/live-boot.7:92 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:79 +#: en/live-boot.7:94 msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot." msgstr "" #. type: IP -#: en/live-boot.7:79 +#: en/live-boot.7:94 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:81 +#: en/live-boot.7:96 msgid "This parameter enables usage of local swap partitions." msgstr "" #. type: IP -#: en/live-boot.7:81 +#: en/live-boot.7:96 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:83 +#: en/live-boot.7:98 msgid "" "This parameter disables Xorg auto-reconfiguration at boot time. This is " "valuable if you either do the detection on your own, or, if you want to ship " @@ -483,13 +515,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:83 +#: en/live-boot.7:98 #, no-wrap msgid "B[=nofiles]" msgstr "" #. type: Plain text -#: en/live-boot.7:85 +#: en/live-boot.7:100 msgid "" "live-boot will look for persistent and snapshot partitions or files labeled " "\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and " @@ -503,13 +535,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:85 +#: en/live-boot.7:100 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:87 +#: en/live-boot.7:102 msgid "" "live-boot will look for persistency files in the root directory of a " "partition, with this parameter, the path can be configured so that you can " @@ -517,26 +549,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:87 +#: en/live-boot.7:102 #, no-wrap msgid "{B|B}=I" msgstr "" #. type: Plain text -#: en/live-boot.7:89 +#: en/live-boot.7:104 msgid "" "A path to a file present on the rootfs could be used to preseed debconf " "database." msgstr "" #. type: IP -#: en/live-boot.7:89 +#: en/live-boot.7:104 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:91 +#: en/live-boot.7:106 msgid "" "All debian installed packages could be preseeded from command-line that way, " "beware of blanks spaces, they will interfere with parsing, use a preseed " @@ -544,26 +576,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:91 +#: en/live-boot.7:106 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:93 +#: en/live-boot.7:108 msgid "" "This option causes live-boot to reboot without attempting to eject the media " "and without asking the user to remove the boot media." msgstr "" #. type: IP -#: en/live-boot.7:93 +#: en/live-boot.7:108 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:95 +#: en/live-boot.7:110 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/live\". This is not enabled by default because " @@ -572,38 +604,38 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:95 +#: en/live-boot.7:110 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:97 +#: en/live-boot.7:112 msgid "" "If you boot with the normal quiet parameter, live-boot hides most messages " "of its own. When adding silent, it hides all." msgstr "" #. type: IP -#: en/live-boot.7:97 +#: en/live-boot.7:112 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:99 +#: en/live-boot.7:114 msgid "" "Start up to text-mode shell prompts, disabling the graphical user interface." msgstr "" #. type: IP -#: en/live-boot.7:99 +#: en/live-boot.7:114 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:101 +#: en/live-boot.7:116 msgid "" "Adding this parameter, live-boot will try to copy the entire read-only media " "to the specified device before mounting the root filesystem. It probably " @@ -613,13 +645,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:101 +#: en/live-boot.7:116 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:103 +#: en/live-boot.7:118 msgid "" "Adding this parameter, live-boot will try to copy the whole read-only media " "to the computer's RAM before mounting the root filesystem. This could need a " @@ -627,71 +659,71 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:103 +#: en/live-boot.7:118 #, no-wrap msgid "B=aufs|unionfs" msgstr "" #. type: Plain text -#: en/live-boot.7:105 +#: en/live-boot.7:120 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." msgstr "" #. type: IP -#: en/live-boot.7:105 +#: en/live-boot.7:120 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:107 +#: en/live-boot.7:122 msgid "" "Uses xdebconfigurator, if present on the rootfs, to configure X instead of " "the standard procedure (experimental)." msgstr "" #. type: IP -#: en/live-boot.7:107 +#: en/live-boot.7:122 #, no-wrap msgid "B=I" msgstr "" #. FIXME #. type: Plain text -#: en/live-boot.7:110 +#: en/live-boot.7:125 msgid "Doesn't do xorg autodetection, but enforces a given resolution." msgstr "" #. FIXME #. type: SH -#: en/live-boot.7:112 +#: en/live-boot.7:127 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:113 en/live-snapshot.1:43 +#: en/live-boot.7:128 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -704,13 +736,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:119 en/live-snapshot.1:49 +#: en/live-boot.7:134 en/live-snapshot.1:49 msgid "" "This optional file (which resides in the rootfs system, not in the live " "media) is used as a list of directories which not need be persistent: ie. " @@ -719,7 +751,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:122 en/live-snapshot.1:51 +#: en/live-boot.7:137 en/live-snapshot.1:51 msgid "" "This saves expensive writes and speeds up operations on volatile data such " "as web caches and temporary files (like e.g. /tmp and .mozilla) which are " @@ -728,64 +760,64 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:123 en/live-snapshot.1:42 +#: en/live-boot.7:138 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "" #. type: IP -#: en/live-boot.7:124 +#: en/live-boot.7:139 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:125 +#: en/live-boot.7:140 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:126 +#: en/live-boot.7:141 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:127 +#: en/live-boot.7:142 #, no-wrap msgid "B" msgstr "" #. type: SH -#: en/live-boot.7:129 en/live-snapshot.1:52 +#: en/live-boot.7:144 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:131 +#: en/live-boot.7:146 msgid "I(1)" msgstr "" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:56 +#: en/live-boot.7:148 en/live-snapshot.1:56 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:135 en/live-snapshot.1:58 +#: en/live-boot.7:150 en/live-snapshot.1:58 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:136 en/live-snapshot.1:59 +#: en/live-boot.7:151 en/live-snapshot.1:59 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:138 en/live-snapshot.1:61 +#: en/live-boot.7:153 en/live-snapshot.1:61 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -793,13 +825,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:139 en/live-snapshot.1:62 +#: en/live-boot.7:154 en/live-snapshot.1:62 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:141 en/live-snapshot.1:64 +#: en/live-boot.7:156 en/live-snapshot.1:64 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -808,13 +840,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:142 en/live-snapshot.1:65 +#: en/live-boot.7:157 en/live-snapshot.1:65 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:143 en/live-snapshot.1:66 +#: en/live-boot.7:158 en/live-snapshot.1:66 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index 38e9ef6..db56633 100644 --- a/manpages/pot/live-snapshot.1.pot +++ b/manpages/pot/live-snapshot.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2010-06-02 22:46+0300\n" +"POT-Creation-Date: 2010-06-05 14:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,13 +24,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-06-02" +msgid "2010-06-05" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2.0~a4" +msgid "2.0~a5" msgstr "" #. type: TH @@ -58,26 +58,26 @@ msgid "OPTIONS" msgstr "" #. type: IP -#: en/live-boot.7:113 en/live-snapshot.1:43 +#: en/live-boot.7:128 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:115 en/live-snapshot.1:45 +#: en/live-boot.7:130 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -90,13 +90,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:117 en/live-snapshot.1:47 +#: en/live-boot.7:132 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:119 en/live-snapshot.1:49 +#: en/live-boot.7:134 en/live-snapshot.1:49 msgid "" "This optional file (which resides in the rootfs system, not in the live " "media) is used as a list of directories which not need be persistent: ie. " @@ -105,7 +105,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:122 en/live-snapshot.1:51 +#: en/live-boot.7:137 en/live-snapshot.1:51 msgid "" "This saves expensive writes and speeds up operations on volatile data such " "as web caches and temporary files (like e.g. /tmp and .mozilla) which are " @@ -114,35 +114,35 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:123 en/live-snapshot.1:42 +#: en/live-boot.7:138 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "" #. type: SH -#: en/live-boot.7:129 en/live-snapshot.1:52 +#: en/live-boot.7:144 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:56 +#: en/live-boot.7:148 en/live-snapshot.1:56 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:135 en/live-snapshot.1:58 +#: en/live-boot.7:150 en/live-snapshot.1:58 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:136 en/live-snapshot.1:59 +#: en/live-boot.7:151 en/live-snapshot.1:59 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:138 en/live-snapshot.1:61 +#: en/live-boot.7:153 en/live-snapshot.1:61 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -150,13 +150,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:139 en/live-snapshot.1:62 +#: en/live-boot.7:154 en/live-snapshot.1:62 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:141 en/live-snapshot.1:64 +#: en/live-boot.7:156 en/live-snapshot.1:64 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -165,13 +165,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:142 en/live-snapshot.1:65 +#: en/live-boot.7:157 en/live-snapshot.1:65 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:143 en/live-snapshot.1:66 +#: en/live-boot.7:158 en/live-snapshot.1:66 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/scripts/live b/scripts/live index afe0f4b..3e604f6 100755 --- a/scripts/live +++ b/scripts/live @@ -8,6 +8,7 @@ echo "/root/lib" >> /etc/ld.so.conf echo "/root/usr/lib" >> /etc/ld.so.conf mountpoint="/live/image" +alt_mountpoint="/media" LIVE_MEDIA_PATH="live" root_persistence="live-rw" @@ -33,9 +34,6 @@ then touch /etc/mtab fi -[ -f /etc/live.conf ] && . /etc/live.conf -export USERNAME USERFULLNAME HOSTNAME - . /scripts/live-helpers if [ ! -f /live.vars ] @@ -53,18 +51,14 @@ Arguments () case "${ARGUMENT}" in skipconfig) NOACCESSIBILITY="Yes" - NOAPTCDROM="Yes" NOAUTOLOGIN="Yes" NOCONSOLEKEYBOARD="Yes" NOFASTBOOT="Yes" NOFSTAB="Yes" - NOHOSTS="Yes" NONETWORKING="Yes" - NOTIMEZONE="Yes" NOXAUTOCONFIG="Yes" - NOXAUTOLOGIN="Yes" - export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN + export NOACCESSIBILITY NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFIG ;; access=*) @@ -84,6 +78,17 @@ Arguments () set -x ;; + dhcp) + # Force dhcp even while netbooting + # Use for debugging in case somebody works on fixing dhclient + DHCP="Force"; + export DHCP + ;; + + nodhcp) + unset DHCP + ;; + ethdevice=*) DEVICE="${ARGUMENT#ethdevice=}" export DEVICE @@ -124,18 +129,6 @@ Arguments () export FROMISO ;; - username=*) - USERNAME="${ARGUMENT#username=}" - LIVECONF="changed" - export USERNAME LIVECONF - ;; - - userfullname=*) - USERFULLNAME="${ARGUMENT#userfullname=}" - LIVECONF="changed" - export USERFULLNAME LIVECONF - ;; - ignore_uuid) IGNORE_UUID="Yes" export IGNORE_UUID @@ -237,21 +230,11 @@ Arguments () export NOACCESSIBILITY ;; - noaptcdrom) - NOAPTCDROM="Yes" - export NOAPTCDROM - ;; - noautologin) NOAUTOLOGIN="Yes" export NOAUTOLOGIN ;; - noxautologin) - NOXAUTOLOGIN="Yes" - export NOXAUTOLOGIN - ;; - noconsolekeyboard) NOCONSOLEKEYBOARD="Yes" export NOCONSOLEKEYBOARD @@ -267,11 +250,6 @@ Arguments () export NOFSTAB ;; - nohosts) - NOHOSTS="Yes" - export NOHOSTS - ;; - nonetworking) NONETWORKING="Yes" export NONETWORKING @@ -287,11 +265,6 @@ Arguments () export NOXAUTOCONFIG ;; - noxscreensaver) - NOXSCREENSAVER="Yes" - export NOXSCREENSAVER - ;; - persistent) PERSISTENT="Yes" export PERSISTENT @@ -338,25 +311,6 @@ Arguments () export NOPRESEED ;; - url=*) - URL_LOCATION="${ARGUMENT#url=}" - - mount -o bind /sys /root/sys - mount -o bind /proc /root/proc - mount -o bind /dev /root/dev - - mkdir -p /root/var/run/network - [ "${NETBOOT}" ] || chroot /root dhclient eth0 - chroot /root wget -P /tmp "${URL_LOCATION}" - [ "${NETBOOT}" ] || chroot /root ifconfig eth0 down - - umount /root/sys - umount /root/proc - umount /root/dev - - LOCATIONS="/tmp/$(basename ${URL_LOCATION}) ${LOCATIONS}" - ;; - */*=*) question="${ARGUMENT%%=*}" value="${ARGUMENT#*=}" @@ -374,21 +328,6 @@ Arguments () export SILENT ;; - textonly) - TEXTONLY="Yes" - export TEXTONLY - ;; - - timezone=*) - TIMEZONE="${ARGUMENT#timezone=}" - export TIMEZONE - ;; - - notimezone) - NOTIMEZONE="Yes" - export NOTIMEZONE - ;; - todisk=*) TODISK="${ARGUMENT#todisk=}" export TODISK @@ -682,8 +621,6 @@ copy_live_to () do_netmount () { - rc=1 - modprobe -q af_packet # For DHCP udevadm trigger @@ -761,10 +698,12 @@ do_netmount () NFSROOT=${ROOTSERVER}:${ROOTPATH} fi - if ( [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ] ) && do_httpmount + rc=1 + + if ( [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ] ) then - rc=0 - return ${rc} + do_httpmount + return $? fi if [ "${NFSROOT#*:}" = "${NFSROOT}" ] && [ "$NETBOOT" != "cifs" ] @@ -791,19 +730,25 @@ do_netmount () do_httpmount () { rc=1 - dest="${mountpoint}/${LIVE_MEDIA_PATH}" - mount -t ramfs ram "${mountpoint}" - mkdir -p "${dest}" for webfile in HTTPFS FTPFS FETCH do - url="$(eval echo \"\$\{${webfile}\}\")" - extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')" + local url="$(eval echo \"\$\{${webfile}\}\")" + local extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')" if [ -n "$url" ] then case "${extension}" in - squashfs|tgz|tar) + iso|squashfs|tgz|tar) + if [ "${extension}" = "iso" ] + then + mkdir -p "${alt_mountpoint}" + dest="${alt_mountpoint}" + else + local dest="${mountpoint}/${LIVE_MEDIA_PATH}" + mount -t ramfs ram "${mountpoint}" + mkdir -p "${dest}" + fi if [ "${webfile}" = "FETCH" ] then case "$url" in @@ -834,6 +779,12 @@ do_httpmount () fi [ ${?} -eq 0 ] && rc=0 [ "${extension}" = "tgz" ] && live_dest="ram" + if [ "${extension}" = "iso" ] + then + isoloop=$(setup_loop "${dest}/$(basename "${url}")" "loop" "/sys/block/loop*" "" '') + mount -t iso9660 "${isoloop}" "${mountpoint}" + rc=${?} + fi break ;; @@ -846,7 +797,15 @@ do_httpmount () if [ ${rc} != 0 ] then - umount "${mountpoint}" + if [ -d "${alt_mountpoint}" ] + then + umount "${alt_mountpoint}" + rmdir "${alt_mountpoint}" + fi + umount "${mountpoint}" + elif [ "${webfile}" != "FETCH" ] ; then + NETBOOT="${webfile}" + export NETBOOT fi return ${rc} @@ -1816,8 +1775,4 @@ mountroot () exec 2>&7 7>&- kill ${tailpid} [ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null - if [ -f /etc/live.conf ] - then - cp /etc/live.conf "${rootmnt}/etc/" - fi } diff --git a/scripts/live-bottom/02etc_live_conf b/scripts/live-bottom/02etc_live_conf deleted file mode 100755 index 8309a15..0000000 --- a/scripts/live-bottom/02etc_live_conf +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -. /scripts/live-functions - -log_begin_msg "Copying config on real root fs" - -# live-boot script - -if [ -f /etc/live.conf ] -then - if [ ! -z "${LIVECONF}" ] - then - # Updating live.conf - sed -i -e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \ - -e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \ - -e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' \ - /etc/live.conf - fi - - cp -p /etc/live.conf /root/etc/live.conf -else - -cat > /root/etc/live.conf << EOF -export USERNAME="${USERNAME}" -export USERFULLNAME="${USERFULLNAME}" -export HOSTNAME="${HOSTNAME}" -EOF - -fi - -log_end_msg diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking index d73f63b..871d8c0 100755 --- a/scripts/live-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -71,7 +71,7 @@ EOF done else - if [ -z "${NETBOOT}" ] + if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ] then # default, dhcp assigned method="dhcp" diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init index a84eb75..b82d2aa 100755 --- a/scripts/live-bottom/25configure_init +++ b/scripts/live-bottom/25configure_init @@ -28,6 +28,8 @@ log_begin_msg "Setting up init" # Arrange for shells on virtual consoles, rather than login prompts +USERNAME="user" + if [ -z "${NOAUTOLOGIN}" ] && [ -n "${USERNAME}" ] then if [ ! -z "${LIVE_GETTY}" ] diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom deleted file mode 100755 index 1a36e7f..0000000 --- a/scripts/live-bottom/41apt_cdrom +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -if [ -n "${NOAPTCDROM}" ] -then - exit 0 -fi - -. /scripts/live-functions - -log_begin_msg "Adding APT-CDROM source" - -# live-boot script - -if [ -d /root/cdrom ] -then - mount -n -o bind /sys /root/sys - mount -n -o bind /proc /root/proc - mount -n -o bind /dev /root/dev - - chroot /root apt-cdrom -o Acquire::cdrom::AutoDetect=false -m add - - umount /root/dev - umount /root/proc - umount /root/sys -fi - -log_end_msg -- 2.1.4