[Debian-live-changes] r2458 - in dists/trunk/live-initramfs: debian docs scripts scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-12 19:08:29 +0000 (Thu, 12 Jul 2007)
New Revision: 2458

Modified:
   dists/trunk/live-initramfs/debian/changelog
   dists/trunk/live-initramfs/debian/init
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
   dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
Log:


Modified: dists/trunk/live-initramfs/debian/changelog
===================================================================
--- dists/trunk/live-initramfs/debian/changelog	2007-07-12 18:27:07 UTC (rev 2457)
+++ dists/trunk/live-initramfs/debian/changelog	2007-07-12 19:08:29 UTC (rev 2458)
@@ -1,4 +1,4 @@
-live-initramfs (1.91.4-1) UNRELEASED; urgency=medium
+live-initramfs (1.91.4-1) unstable; urgency=medium
 
   * New upstream release:
     - Dropping transitional package, not needed anymore.

Modified: dists/trunk/live-initramfs/debian/init
===================================================================
--- dists/trunk/live-initramfs/debian/init	2007-07-12 18:27:07 UTC (rev 2457)
+++ dists/trunk/live-initramfs/debian/init	2007-07-12 19:08:29 UTC (rev 2458)
@@ -83,7 +83,7 @@
     if [ -z ${QUICKREBOOT} ]; then
 	if [ -x /usr/bin/eject ]
 	then
-		eject -p -m /live_media >/dev/null 2>&1
+		eject -p -m /live/image >/dev/null 2>&1
 	fi
 
 	# XXX - i18n

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-07-12 18:27:07 UTC (rev 2457)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-07-12 19:08:29 UTC (rev 2458)
@@ -1,3 +1,9 @@
+2007-07-12  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/live, scripts/live-bottom/01integrity_check, 05mountpoints:
+	  - Moved /live_media to /live/image.
+	* Uploaded 1.91.4-1.
+
 2007-07-07  Daniel Baumann  <daniel at debian.org>
 
 	* scripts/live:

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-07-12 18:27:07 UTC (rev 2457)
+++ dists/trunk/live-initramfs/scripts/live	2007-07-12 19:08:29 UTC (rev 2458)
@@ -7,7 +7,7 @@
 echo "/root/lib" >> /etc/ld.so.conf
 echo "/root/usr/lib" >> /etc/ld.so.conf
 
-mountpoint=/live_media
+mountpoint=/live/image
 
 root_persistence="live-rw"
 home_persistence="home-rw"
@@ -800,7 +800,7 @@
         live_dest="${TODISK}"
     fi
     if [ "${live_dest}" ]; then
-        log_begin_msg "Copying live_media to ${live_dest}"
+        log_begin_msg "Copying live media to ${live_dest}"
         copy_live_to "${livefs_root}" "${live_dest}"
         log_end_msg
     fi

Modified: dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check	2007-07-12 18:27:07 UTC (rev 2457)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01integrity_check	2007-07-12 19:08:29 UTC (rev 2458)
@@ -20,4 +20,4 @@
 
 # live-initramfs script
 
-grep integrity-check /proc/cmdline && live-md5check /live_media /live_media/md5sum.txt < /dev/tty8
+grep integrity-check /proc/cmdline && live-md5check /live/image /live/image/md5sum.txt < /dev/tty8

Modified: dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints	2007-07-12 18:27:07 UTC (rev 2457)
+++ dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints	2007-07-12 19:08:29 UTC (rev 2458)
@@ -27,9 +27,9 @@
 # live-initramfs script
 
 # Move to the new root filesystem so that programs there can get at it.
-if [ ! -d /root/live_media ]; then
-    mkdir -p /root/live_media
-    mount -n --move /live_media /root/live_media
+if [ ! -d /root/live/image ]; then
+    mkdir -p /root/live/image
+    mount -n --move /live/image /root/live/image
 fi
 
 log_end_msg