Adjust path of rsync (use /bin)

diff --git a/debian/changelog b/debian/changelog
index 7523a3c..29e7b31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.136.2-2~grml.01) unstable; urgency=low
+
+  * Adjust path of rsync (use /bin).
+
+ -- Michael Prokop <mika@grml.org>  Sun, 20 Jul 2008 16:33:59 +0200
+
 live-initramfs (1.136.2-2~grml.00) unstable; urgency=low
 
   * Rebase against current version of live-initramfs in Debian.

diff --git a/debian/patches/01_add_rsync.dpatch b/debian/patches/01_add_rsync.dpatch
index f634c92..1bb04d3 100755 (executable)
--- a/debian/patches/01_add_rsync.dpatch
+++ b/debian/patches/01_add_rsync.dpatch
@@ -12,7 +12,7 @@
  # Filesystem: jffs2
  manual_add_modules jffs2
  
-+copy_exec /usr/bin/rsync
++copy_exec /usr/bin/rsync /bin
 +
  # Filesystem: squashfs
  copy_exec /sbin/losetup /sbin

diff --git a/debian/patches/02_more_verbose_toram.diff b/debian/patches/02_more_verbose_toram.diff
index da7f5fe..e8955be 100755 (executable)
--- a/debian/patches/02_more_verbose_toram.diff
+++ b/debian/patches/02_more_verbose_toram.diff
@@ -33,14 +33,14 @@
 -                      cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
 -              else
 -                      cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
-+                      if [ -x /usr/bin/rsync ] ; then
++                      if [ -x /bin/rsync ] ; then
 +                      echo " * Copying $MODULETORAMFILE to RAM" 1>/dev/console
 +                         rsync -a --progress ${MODULETORAMFILE} ${copyto} 1>/dev/console # copy only the filesystem module
 +                      else
 +                         cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
 +                      fi
 +              else
-+                      if [ -x /usr/bin/rsync ] ; then
++                      if [ -x /bin/rsync ] ; then
 +                      echo " * Copying medium to RAM" 1>/dev/console
 +                         rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
 +                      else