From 50e62e68f3af64d70bb572e868108d073ffdcb54 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 9 Mar 2011 17:11:36 +0100 Subject: [PATCH] Adding upstream version 3.0~a8. --- VERSION | 2 +- hooks/live | 7 ++ manpages/de/live-boot.de.7 | 8 ++- manpages/de/live-snapshot.de.1 | 2 +- manpages/en/live-boot.7 | 4 +- manpages/en/live-snapshot.1 | 2 +- manpages/po/de/live-boot.7.po | 106 +++++++++++++++++------------- manpages/po/de/live-snapshot.1.po | 48 +++++++------- manpages/pot/live-boot.7.pot | 100 ++++++++++++++++------------ manpages/pot/live-snapshot.1.pot | 42 ++++++------ scripts/live | 21 +++++- 11 files changed, 202 insertions(+), 140 deletions(-) diff --git a/VERSION b/VERSION index f47d7b5..c28f039 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a7 +3.0~a8 diff --git a/hooks/live b/hooks/live index 85a98a3..93a2831 100755 --- a/hooks/live +++ b/hooks/live @@ -246,3 +246,10 @@ then #mkdir -p $DESTDIR/etc #cp -p /etc/nsswitch.conf $DESTDIR/etc fi + +if [ "${LIVE_UNIONMOUNT}" = "true" ] +then + # UnionMount + # only mount from patched util-linux can do this currently + copy_exec /bin/mount /bin/mount_full +fi diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 963e019..5652ef8 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 25.09.2010 3.0~a7 "Debian Live Projekt" +.TH LIVE\-BOOT 7 02.10.2010 3.0~a8 "Debian Live Projekt" .SH NAME \fBlive\-boot\fP \- System Boot Skripte @@ -175,6 +175,12 @@ times. 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 have multiple directories on the same partition to store persistency files. +.IP \fBpersistent\-subtext\fP=\fISUFFIX\fP 4 +Add a suffix when searching for the image filenames or partition labels to +use for the above mentioned persistent feature, the SUFFIX will be added +after a dash (e.g.: "live\-sn" would transform to "live\-sn\-SUFFIX"). This is +handy to test multiple live\-boot based live\-systems with different +persistent storage choices. .IP {\fBpreseed/file\fP|\fBfile\fP}=\fIFILE\fP 4 A path to a file present on the rootfs could be used to preseed debconf database. diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1 index 4dcac2a..c972de4 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 25.09.2010 3.0~a7 "Debian Live Projekt" +.TH LIVE\-BOOT 1 02.10.2010 3.0~a8 "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 0467a97..2f2fec3 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2010\-09\-25 3.0~a7 "Debian Live Project" +.TH LIVE\-BOOT 7 2010\-10\-02 3.0~a8 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts @@ -104,6 +104,8 @@ This parameter enables usage of local swap partitions. live\-boot will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at live\-snapshot(1) for more informations. If "nofiles" is specified, only filesystems with matching labels will be searched; no filesystems will be traversed looking for archives or image files. This results in shorter boot times. .IP "\fBpersistent\-path\fR=\fIPATH\fR" 4 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 have multiple directories on the same partition to store persistency files. +.IP "\fBpersistent\-subtext\fR=\fISUFFIX\fR" 4 +Add a suffix when searching for the image filenames or partition labels to use for the above mentioned persistent feature, the SUFFIX will be added after a dash (e.g.: "live-sn" would transform to "live-sn-SUFFIX"). This is handy to test multiple live-boot based live-systems with different persistent storage choices. .IP "{\fBpreseed/file\fR|\fBfile\fR}=\fIFILE\fR" 4 A path to a file present on the rootfs could be used to preseed debconf database. .IP "\fBpackage/question\fR=\fIVALUE\fR" 4 diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1 index f4dd2f6..1a56a5c 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2010\-09\-25 3.0~a7 "Debian Live Project" +.TH LIVE\-BOOT 1 2010\-10\-02 3.0~a8 "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 4c688b7..e979f7b 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 3.0~a6\n" -"POT-Creation-Date: 2010-09-25 22:45+0300\n" +"Project-Id-Version: live-boot 3.0~a8\n" +"POT-Creation-Date: 2010-10-02 10:16+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-09-25" -msgstr "25.09.2010" +msgid "2010-10-02" +msgstr "02.10.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a7" -msgstr "3.0~a7" +msgid "3.0~a8" +msgstr "3.0~a8" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 @@ -556,24 +556,40 @@ msgstr "" #. type: IP #: en/live-boot.7:107 #, no-wrap +msgid "B=I" +msgstr "B=I" + +#. type: Plain text +#: en/live-boot.7:109 +msgid "" +"Add a suffix when searching for the image filenames or partition labels to " +"use for the above mentioned persistent feature, the SUFFIX will be added " +"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This " +"is handy to test multiple live-boot based live-systems with different " +"persistent storage choices." +msgstr "" + +#. type: IP +#: en/live-boot.7:109 +#, no-wrap msgid "{B|B}=I" msgstr "{B|B}=I" #. type: Plain text -#: en/live-boot.7:109 +#: en/live-boot.7:111 msgid "" "A path to a file present on the rootfs could be used to preseed debconf " "database." msgstr "" #. type: IP -#: en/live-boot.7:109 +#: en/live-boot.7:111 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:111 +#: en/live-boot.7:113 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 " @@ -581,26 +597,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:111 +#: en/live-boot.7:113 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:113 +#: en/live-boot.7:115 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:113 +#: en/live-boot.7:115 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:115 +#: en/live-boot.7:117 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/live\". This is not enabled by default because " @@ -609,26 +625,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:115 +#: en/live-boot.7:117 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:117 +#: en/live-boot.7:119 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:117 +#: en/live-boot.7:119 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:119 +#: en/live-boot.7:121 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 " @@ -638,13 +654,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:119 +#: en/live-boot.7:121 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:121 +#: en/live-boot.7:123 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 " @@ -652,14 +668,14 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:121 +#: en/live-boot.7:123 #, no-wrap msgid "B=aufs|unionfs" msgstr "B=aufs|unionfs" #. FIXME #. type: Plain text -#: en/live-boot.7:124 +#: en/live-boot.7:126 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." @@ -667,32 +683,32 @@ msgstr "" #. FIXME #. type: SH -#: en/live-boot.7:126 +#: en/live-boot.7:128 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:127 en/live-snapshot.1:43 +#: en/live-boot.7:129 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 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:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 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 \"/" @@ -705,13 +721,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:49 +#: en/live-boot.7:135 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. " @@ -720,7 +736,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:136 en/live-snapshot.1:51 +#: en/live-boot.7:138 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 " @@ -729,69 +745,69 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:137 en/live-snapshot.1:42 +#: en/live-boot.7:139 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "DATEIEN" #. type: IP -#: en/live-boot.7:138 +#: en/live-boot.7:140 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:139 +#: en/live-boot.7:141 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:140 +#: en/live-boot.7:142 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:141 +#: en/live-boot.7:143 #, no-wrap msgid "B" msgstr "B" #. type: SH -#: en/live-boot.7:143 en/live-snapshot.1:52 +#: en/live-boot.7:145 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: Plain text -#: en/live-boot.7:145 +#: en/live-boot.7:147 msgid "I(1)" msgstr "I(1)" #. type: Plain text -#: en/live-boot.7:147 en/live-snapshot.1:56 +#: en/live-boot.7:149 en/live-snapshot.1:56 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:149 en/live-snapshot.1:58 +#: en/live-boot.7:151 en/live-snapshot.1:58 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:151 en/live-snapshot.1:60 +#: en/live-boot.7:153 en/live-snapshot.1:60 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:152 en/live-snapshot.1:61 +#: en/live-boot.7:154 en/live-snapshot.1:61 #, no-wrap msgid "HOMEPAGE" msgstr "HOMEPAGE" #. type: Plain text -#: en/live-boot.7:154 en/live-snapshot.1:63 +#: en/live-boot.7:156 en/live-snapshot.1:63 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 +818,13 @@ msgstr "" "unter EIE gefunden werden." #. type: SH -#: en/live-boot.7:155 en/live-snapshot.1:64 +#: en/live-boot.7:157 en/live-snapshot.1:64 #, no-wrap msgid "BUGS" msgstr "FEHLER" #. type: Plain text -#: en/live-boot.7:157 en/live-snapshot.1:66 +#: en/live-boot.7:159 en/live-snapshot.1:66 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 +838,13 @@ msgstr "" "werden." #. type: SH -#: en/live-boot.7:158 en/live-snapshot.1:67 +#: en/live-boot.7:160 en/live-snapshot.1:67 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:159 en/live-snapshot.1:68 +#: en/live-boot.7:161 en/live-snapshot.1:68 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 7a41a6f..ff03f10 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 3.0~a6\n" -"POT-Creation-Date: 2010-09-25 22:45+0300\n" +"Project-Id-Version: live-boot 3.0~a8\n" +"POT-Creation-Date: 2010-10-02 10:16+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-09-25" -msgstr "25.09.2010" +msgid "2010-10-02" +msgstr "02.10.2010" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a7" -msgstr "3.0~a7" +msgid "3.0~a8" +msgstr "3.0~a8" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 @@ -58,26 +58,26 @@ msgid "OPTIONS" msgstr "OPTIONEN" #. type: IP -#: en/live-boot.7:127 en/live-snapshot.1:43 +#: en/live-boot.7:129 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 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:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 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:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:49 +#: en/live-boot.7:135 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:136 en/live-snapshot.1:51 +#: en/live-boot.7:138 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,40 +114,40 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:137 en/live-snapshot.1:42 +#: en/live-boot.7:139 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "DATEIEN" #. type: SH -#: en/live-boot.7:143 en/live-snapshot.1:52 +#: en/live-boot.7:145 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: Plain text -#: en/live-boot.7:147 en/live-snapshot.1:56 +#: en/live-boot.7:149 en/live-snapshot.1:56 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:149 en/live-snapshot.1:58 +#: en/live-boot.7:151 en/live-snapshot.1:58 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:151 en/live-snapshot.1:60 +#: en/live-boot.7:153 en/live-snapshot.1:60 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:152 en/live-snapshot.1:61 +#: en/live-boot.7:154 en/live-snapshot.1:61 #, no-wrap msgid "HOMEPAGE" msgstr "HOMEPAGE" #. type: Plain text -#: en/live-boot.7:154 en/live-snapshot.1:63 +#: en/live-boot.7:156 en/live-snapshot.1:63 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -158,13 +158,13 @@ msgstr "" "unter EIE gefunden werden." #. type: SH -#: en/live-boot.7:155 en/live-snapshot.1:64 +#: en/live-boot.7:157 en/live-snapshot.1:64 #, no-wrap msgid "BUGS" msgstr "FEHLER" #. type: Plain text -#: en/live-boot.7:157 en/live-snapshot.1:66 +#: en/live-boot.7:159 en/live-snapshot.1:66 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -178,13 +178,13 @@ msgstr "" "werden." #. type: SH -#: en/live-boot.7:158 en/live-snapshot.1:67 +#: en/live-boot.7:160 en/live-snapshot.1:67 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:159 en/live-snapshot.1:68 +#: en/live-boot.7:161 en/live-snapshot.1:68 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 1e83d05..8b00b43 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-09-25 22:45+0300\n" +"POT-Creation-Date: 2010-10-02 10:16+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-09-25" +msgid "2010-10-02" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a7" +msgid "3.0~a8" msgstr "" #. type: TH @@ -551,24 +551,40 @@ msgstr "" #. type: IP #: en/live-boot.7:107 #, no-wrap -msgid "{B|B}=I" +msgid "B=I" msgstr "" #. type: Plain text #: en/live-boot.7:109 msgid "" +"Add a suffix when searching for the image filenames or partition labels to " +"use for the above mentioned persistent feature, the SUFFIX will be added " +"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This " +"is handy to test multiple live-boot based live-systems with different " +"persistent storage choices." +msgstr "" + +#. type: IP +#: en/live-boot.7:109 +#, no-wrap +msgid "{B|B}=I" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:111 +msgid "" "A path to a file present on the rootfs could be used to preseed debconf " "database." msgstr "" #. type: IP -#: en/live-boot.7:109 +#: en/live-boot.7:111 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:111 +#: en/live-boot.7:113 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 " @@ -576,26 +592,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:111 +#: en/live-boot.7:113 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:113 +#: en/live-boot.7:115 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:113 +#: en/live-boot.7:115 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:115 +#: en/live-boot.7:117 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/live\". This is not enabled by default because " @@ -604,26 +620,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:115 +#: en/live-boot.7:117 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:117 +#: en/live-boot.7:119 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:117 +#: en/live-boot.7:119 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:119 +#: en/live-boot.7:121 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 " @@ -633,13 +649,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:119 +#: en/live-boot.7:121 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:121 +#: en/live-boot.7:123 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 " @@ -647,14 +663,14 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:121 +#: en/live-boot.7:123 #, no-wrap msgid "B=aufs|unionfs" msgstr "" #. FIXME #. type: Plain text -#: en/live-boot.7:124 +#: en/live-boot.7:126 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." @@ -662,32 +678,32 @@ msgstr "" #. FIXME #. type: SH -#: en/live-boot.7:126 +#: en/live-boot.7:128 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:127 en/live-snapshot.1:43 +#: en/live-boot.7:129 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 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:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 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 \"/" @@ -700,13 +716,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:49 +#: en/live-boot.7:135 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. " @@ -715,7 +731,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:136 en/live-snapshot.1:51 +#: en/live-boot.7:138 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 " @@ -724,69 +740,69 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:137 en/live-snapshot.1:42 +#: en/live-boot.7:139 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "" #. type: IP -#: en/live-boot.7:138 +#: en/live-boot.7:140 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:139 +#: en/live-boot.7:141 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:140 +#: en/live-boot.7:142 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:141 +#: en/live-boot.7:143 #, no-wrap msgid "B" msgstr "" #. type: SH -#: en/live-boot.7:143 en/live-snapshot.1:52 +#: en/live-boot.7:145 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:145 +#: en/live-boot.7:147 msgid "I(1)" msgstr "" #. type: Plain text -#: en/live-boot.7:147 en/live-snapshot.1:56 +#: en/live-boot.7:149 en/live-snapshot.1:56 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:149 en/live-snapshot.1:58 +#: en/live-boot.7:151 en/live-snapshot.1:58 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:151 en/live-snapshot.1:60 +#: en/live-boot.7:153 en/live-snapshot.1:60 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:152 en/live-snapshot.1:61 +#: en/live-boot.7:154 en/live-snapshot.1:61 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:154 en/live-snapshot.1:63 +#: en/live-boot.7:156 en/live-snapshot.1:63 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -794,13 +810,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:155 en/live-snapshot.1:64 +#: en/live-boot.7:157 en/live-snapshot.1:64 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:157 en/live-snapshot.1:66 +#: en/live-boot.7:159 en/live-snapshot.1:66 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -809,13 +825,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:158 en/live-snapshot.1:67 +#: en/live-boot.7:160 en/live-snapshot.1:67 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:159 en/live-snapshot.1:68 +#: en/live-boot.7:161 en/live-snapshot.1:68 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 e1055c1..e61e534 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-09-25 22:45+0300\n" +"POT-Creation-Date: 2010-10-02 10:16+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2010-09-25" +msgid "2010-10-02" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a7" +msgid "3.0~a8" msgstr "" #. type: TH @@ -59,26 +59,26 @@ msgid "OPTIONS" msgstr "" #. type: IP -#: en/live-boot.7:127 en/live-snapshot.1:43 +#: en/live-boot.7:129 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 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:129 en/live-snapshot.1:45 +#: en/live-boot.7:131 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 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 \"/" @@ -91,13 +91,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:131 en/live-snapshot.1:47 +#: en/live-boot.7:133 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:133 en/live-snapshot.1:49 +#: en/live-boot.7:135 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. " @@ -106,7 +106,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:136 en/live-snapshot.1:51 +#: en/live-boot.7:138 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 " @@ -115,40 +115,40 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:137 en/live-snapshot.1:42 +#: en/live-boot.7:139 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "" #. type: SH -#: en/live-boot.7:143 en/live-snapshot.1:52 +#: en/live-boot.7:145 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:147 en/live-snapshot.1:56 +#: en/live-boot.7:149 en/live-snapshot.1:56 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:149 en/live-snapshot.1:58 +#: en/live-boot.7:151 en/live-snapshot.1:58 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:151 en/live-snapshot.1:60 +#: en/live-boot.7:153 en/live-snapshot.1:60 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:152 en/live-snapshot.1:61 +#: en/live-boot.7:154 en/live-snapshot.1:61 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:154 en/live-snapshot.1:63 +#: en/live-boot.7:156 en/live-snapshot.1:63 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -156,13 +156,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:155 en/live-snapshot.1:64 +#: en/live-boot.7:157 en/live-snapshot.1:64 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:157 en/live-snapshot.1:66 +#: en/live-boot.7:159 en/live-snapshot.1:66 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -171,13 +171,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:158 en/live-snapshot.1:67 +#: en/live-boot.7:160 en/live-snapshot.1:67 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:159 en/live-snapshot.1:68 +#: en/live-boot.7:161 en/live-snapshot.1:68 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/scripts/live b/scripts/live index ad2d48e..309d5aa 100755 --- a/scripts/live +++ b/scripts/live @@ -1267,9 +1267,16 @@ setup_unionfs () log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}." fi - mkdir -p "${croot}/${imagename}" - log_begin_msg "Mounting \"${image}\" on \"${croot}${imagename}\" via \"${backdev}\"" - mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}" + if [ "${UNIONTYPE}" != "unionmount" ] + then + mpoint="${croot}/${imagename}" + rofsstring="${mpoint}=${roopt}:${rofsstring}" && rofslist="${mpoint} ${rofslist}" + else + mpoint="${rootmnt}" + fi + mkdir -p "${mpoint}" + log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\"" + mount -t "${fstype}" -o ro,noatime "${backdev}" "${mpoint}" || panic "Can not mount ${backdev} (${image}) on ${mpoint}" log_end_msg fi done @@ -1383,6 +1390,9 @@ setup_unionfs () cow_mountopt="rw,noatime,mode=755" fi + if [ "${UNIONTYPE}" != "unionmount" ] + then + if [ "${cow_fstype}" = "nfs" ] then log_begin_msg \ @@ -1393,6 +1403,7 @@ setup_unionfs () mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \ panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow" fi + fi rofscount=$(echo ${rofslist} |wc -w) @@ -1437,6 +1448,10 @@ setup_unionfs () pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true ;; + unionmount) + mount_full -t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice} "${rootmnt}" || panic "${UNIONTYPE} ${cowdevice} on ${rootmnt} failed with option noatime,union,${cow_mountopt}" + ;; + *) mount -t ${UNIONTYPE} -o noatime,${noxino_opt}dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,${noxino_opt}dirs=/cow=rw:${rofsstring}" ;;