[Debian-live-changes] r1335 - in dists/trunk/live-initramfs: doc scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 16:55:07 +0000 (Sun, 06 May 2007)
New Revision: 1335

Modified:
   dists/trunk/live-initramfs/doc/ChangeLog
   dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
Log:


Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 16:52:20 UTC (rev 1334)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 16:55:07 UTC (rev 1335)
@@ -25,6 +25,8 @@
 	  - Added patch to change /cdrom to more generic /live_media.
 	* scripts/live-bottom/01etch_live_conf:
 	  - Added patch to add script updating live.conf file.
+	* scripts/live-bottom/05mountpoints:
+	  - Added patch to change /cdrom to more generic /live_media.
 
 2007-05-06  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints	2007-05-06 16:52:20 UTC (rev 1334)
+++ dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints	2007-05-06 16:55:07 UTC (rev 1335)
@@ -21,7 +21,9 @@
 log_begin_msg "$DESCRIPTION"
 
 # Move to the new root filesystem so that programs there can get at it.
-mkdir -p /root/cdrom
-mount -n -o move /cdrom /root/cdrom
+if [ ! -d /root/live_media ]; then
+    mkdir -p /root/live_media
+    mount -n -o move /live_media /root/live_media
+fi
 
 log_end_msg