[Debian-live-changes] r2459 - in dists/trunk/live-initramfs: bin docs manpages scripts

daniel at alioth.debian.org daniel at alioth.debian.org
Thu Jul 12 19:21:00 UTC 2007


Author: daniel
Date: 2007-07-12 19:21:00 +0000 (Thu, 12 Jul 2007)
New Revision: 2459

Modified:
   dists/trunk/live-initramfs/bin/live-snapshot
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/manpages/live-snapshot.en.1
   dists/trunk/live-initramfs/manpages/live-snapshot.it.1
   dists/trunk/live-initramfs/scripts/live
Log:


Modified: dists/trunk/live-initramfs/bin/live-snapshot
===================================================================
--- dists/trunk/live-initramfs/bin/live-snapshot	2007-07-12 19:08:29 UTC (rev 2458)
+++ dists/trunk/live-initramfs/bin/live-snapshot	2007-07-12 19:21:00 UTC (rev 2459)
@@ -3,7 +3,7 @@
 # live-snapshot - utility to manage Debian Live systems snapshots
 #
 #   This program mount a device (fallback to /tmpfs under /mnt/snapshot
-#   and save the /cow (or a different dir) filesystem in it for reusing
+#   and save the /live/cow (or a different dir) filesystem in it for reusing
 #   in another live-initramfs session. Look at manpage for more info.
 #
 # Copyright (C) 2006 Marco Amadori <marco.amadori at gmail.com>
@@ -90,7 +90,7 @@
 	Header
 	echo
 	echo "Options:"
-	echo "  -c, --cow: specifies the copy on write directory (default: /cow)."
+	echo "  -c, --cow: specifies the copy on write directory (default: /live/cow)."
 	echo "  -d, --device: specifies the output snapshot device (default: none)."
 	echo "  -o, --output: specifies the output image file (default: $type dependent)."
     echo "  -r, --resync-string: internally used to resync previous made snapshots."
@@ -224,7 +224,7 @@
 Defaults ()
 {
 	MOUNTP="/mnt/live-snapshot"
-	COW="/cow"
+	COW="/live/cow"
 	DEV=""
 	DEST="${MOUNTP}/live-sn.cpio.gz"
 	TYPE="cpio"
@@ -248,7 +248,7 @@
 				Usage "Unregognized String" ;;
 		esac
 	else
-		DEF_COW="/cow"
+		DEF_COW="/live/cow"
 		# Bad options handling
 		if [ -z "${SNAP_COW}" ]; then
 			COW="${DEF_COW}"

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-07-12 19:08:29 UTC (rev 2458)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-07-12 19:21:00 UTC (rev 2459)
@@ -1,5 +1,7 @@
 2007-07-12  Daniel Baumann  <daniel at debian.org>
 
+	* bin/live-snapshot, scripts/live:
+	  - Moved /cow to /live/cow.
 	* scripts/live, scripts/live-bottom/01integrity_check, 05mountpoints:
 	  - Moved /live_media to /live/image.
 	* Uploaded 1.91.4-1.

Modified: dists/trunk/live-initramfs/manpages/live-snapshot.en.1
===================================================================
--- dists/trunk/live-initramfs/manpages/live-snapshot.en.1	2007-07-12 19:08:29 UTC (rev 2458)
+++ dists/trunk/live-initramfs/manpages/live-snapshot.en.1	2007-07-12 19:21:00 UTC (rev 2459)
@@ -35,7 +35,7 @@
 .SH OPTIONS
 .IP "\fB\-c, \-\-cow\fR \fIDIRECTORY\fR" 4
 specifies the input directory to be cloned in the image file.
-Its default value "/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by live-initramfs as home.
+Its default value "/live/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by live-initramfs as home.
 .IP "\fB\-d, \-\-device\fR \fIDEVICE\fR" 4
 sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext2 fs will be automatically created and labelled according to the values specified after the "--output" value or with a sane default.
 .IP "\fB\-e, \-\-exclude\-list\fR \fIFILE\fR" 4

Modified: dists/trunk/live-initramfs/manpages/live-snapshot.it.1
===================================================================
--- dists/trunk/live-initramfs/manpages/live-snapshot.it.1	2007-07-12 19:08:29 UTC (rev 2458)
+++ dists/trunk/live-initramfs/manpages/live-snapshot.it.1	2007-07-12 19:21:00 UTC (rev 2459)
@@ -34,7 +34,7 @@
 
 .SH OPTIONS
 .IP "\fB\-c, \-\-cow\fR \fIDIRECTORY\fR" 4
-specifica la directory da clonare nel file immagine. Il valore di default \[`e] lo stesso default usato da live\-initramfs per la sua directory COW (copy on write, un tempo situata in "/cow") ed \[`e] sufficiente per gli usi comuni. Pu\[`o] essere utile tuttavia specificare "/home" e come tipo "ext2" per preparare un file immagine adatto per essere montato da live\-initramfs come "/home" al boot.
+specifica la directory da clonare nel file immagine. Il valore di default \[`e] lo stesso default usato da live\-initramfs per la sua directory COW (copy on write, un tempo situata in "/live/cow") ed \[`e] sufficiente per gli usi comuni. Pu\[`o] essere utile tuttavia specificare "/home" e come tipo "ext2" per preparare un file immagine adatto per essere montato da live\-initramfs come "/home" al boot.
 .IP "\fB\-d, \-\-device\fR \fIDEVICE\fR" 4
 seleziona il device dove il file/partizione di snapshot o persistenza dovr\[`a] essere sistemato. Se il device non ha un filesystem, ne verr\[`a] creato uno automaticamente, di tipo ext2 ed etichettato (label) in base al valore specificato nell'opzione "--output" o con un default. Se non viene specificato nessun device, verr\[`a] usato un "tmpfs" linkato sul desktop dell'utente, in modo che port\[`a] essere mosso dove si vuole.
 .IP "\fB\-e, \-\-exclude\-list\fR \fIFILE\fR" 4

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-07-12 19:08:29 UTC (rev 2458)
+++ dists/trunk/live-initramfs/scripts/live	2007-07-12 19:21:00 UTC (rev 2459)
@@ -666,8 +666,8 @@
     fi
 
     # shows cow fs on /cow for use by live-snapshot
-    mkdir -p "${rootmnt}/cow"
-    mount -o bind /cow "${rootmnt}/cow"
+    mkdir -p "${rootmnt}/live/cow"
+    mount -o bind /cow "${rootmnt}/live/cow"
 }
 
 check_dev ()




More information about the Debian-live-changes mailing list