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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-18 11:02:41 +0000 (Fri, 18 May 2007)
New Revision: 1546

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
Log:
Ben, this is all for you.

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 08:43:57 UTC (rev 1545)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 11:02:41 UTC (rev 1546)
@@ -1,3 +1,8 @@
+2007-06-18  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/live, scripts/live-bottom/05mountpoints:
+	  - Replaced 'mount -o move' with 'mount --move'.
+
 2007-06-12  Daniel Baumann  <daniel at debian.org>
 
 	* scripts/live-bottom/*:

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-18 08:43:57 UTC (rev 1545)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-18 11:02:41 UTC (rev 1546)
@@ -230,7 +230,7 @@
     mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
     cp -a ${copyfrom}/* ${copyto} # "cp -a" from busybox also copies hidden files
     umount ${copyfrom}
-    mount -r -o move ${copyto} ${copyfrom}
+    mount -r --move ${copyto} ${copyfrom}
     rmdir ${copyto}
     return 0
 }
@@ -499,7 +499,7 @@
             case d in
                 *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/live/${d##*/}"
                     ;;
-                *) mount -o move "${d}" "${rootmnt}/live/${d##*/}"
+                *) mount --move "${d}" "${rootmnt}/live/${d##*/}"
                     ;;
             esac
         done

Modified: dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints	2007-05-18 08:43:57 UTC (rev 1545)
+++ dists/trunk/live-initramfs/scripts/live-bottom/05mountpoints	2007-05-18 11:02:41 UTC (rev 1546)
@@ -29,7 +29,7 @@
 # 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 -o move /live_media /root/live_media
+    mount -n --move /live_media /root/live_media
 fi
 
 log_end_msg