Restore old behaviour: do not move but copy initrd to make it re-executable

diff --git a/debian/changelog b/debian/changelog
index 6526721..a6821a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,6 @@ grml-live (0.0.4) unstable; urgency=low
     - disable pipeline workaround 
     - create /dev/MAKEDEV in chroot to work around the
       "./MAKEDEV: No such file or directory" problem of some packages
-  * Do not copy the initrd of chroot to boot/isolinux/ but instead move
-    it to save a few more MBs of space.
   * Use /var/log/grml-live.log as log file as /var/log/fai/* is too
     dangerous because of automatic removal of the files/dirs via fai.
   * Use class GRML_MEDIUM by default and document GRMLBASE, GRML_* plus

diff --git a/grml-live b/grml-live
index e5d432b..a9eebae 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -305,8 +305,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       # if we don't have an initrd we a) can't boot and b) there was an error
       # during build, so check for the file:
       if [ -f "$CHROOT_OUTPUT"/boot/initrd* ] ; then
-         # do not keep the initrd inside the chroot, let's save space instead:
-         mv "$CHROOT_OUTPUT"/boot/initrd*                     "$BUILD_OUTPUT"/boot/isolinux/initrd.gz
+         cp "$CHROOT_OUTPUT"/boot/initrd*  "$BUILD_OUTPUT"/boot/isolinux/initrd.gz
       else
          log "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting"
          eerror "No initrd found inside $CHROOT_OUTPUT/boot/ - Exiting" ; eend 1