Release new version 0.29.5

[grml-live.git] / scripts / generate_netboot_package.sh

diff --git a/scripts/generate_netboot_package.sh b/scripts/generate_netboot_package.sh
index 5eae60a..bcf622a 100755 (executable)
--- a/scripts/generate_netboot_package.sh
+++ b/scripts/generate_netboot_package.sh
@@ -22,7 +22,7 @@ fi
 GRML_VERSION="$(awk '{print $1"_"$2}' ${CHROOT}/etc/grml_version)"
 
 if ! [ -r "${CHROOT}/usr/lib/syslinux/pxelinux.0" ] ; then
 GRML_VERSION="$(awk '{print $1"_"$2}' ${CHROOT}/etc/grml_version)"
 
 if ! [ -r "${CHROOT}/usr/lib/syslinux/pxelinux.0" ] ; then

-  echo "Error: /usr/lib/syslinux/pxelinux.0 not found. Please install syslinux[-common." >&2
+  echo "Error: /usr/lib/syslinux/pxelinux.0 not found. Please install syslinux[-common]." >&2

   exit 1
 fi
 
   exit 1
 fi
 


@@ -30,15 +30,19 @@ OUTPUTDIR="$(mktemp -d)" || exit 1
 WORKING_DIR="${OUTPUTDIR}/grml_netboot_package_${GRML_VERSION}/tftpboot/"
 mkdir -p "$WORKING_DIR" || exit 2
 
 WORKING_DIR="${OUTPUTDIR}/grml_netboot_package_${GRML_VERSION}/tftpboot/"
 mkdir -p "$WORKING_DIR" || exit 2
 

-cp "$CHROOT"/boot/vmlinuz-*    "$WORKING_DIR"/linux26
+cp "$CHROOT"/boot/vmlinuz-*    "$WORKING_DIR"/vmlinuz

 cp "$CHROOT"/boot/initrd.img-* "$WORKING_DIR"/initrd.img
 cp "$CHROOT"/usr/lib/syslinux/pxelinux.0 "${WORKING_DIR}/pxelinux.0"
 
 cp "$CHROOT"/boot/initrd.img-* "$WORKING_DIR"/initrd.img
 cp "$CHROOT"/usr/lib/syslinux/pxelinux.0 "${WORKING_DIR}/pxelinux.0"
 

+if [ -r "$CHROOT"/usr/lib/syslinux/modules/bios/ldlinux.c32 ] ; then
+  cp "$CHROOT"/usr/lib/syslinux/modules/bios/ldlinux.c32 "${WORKING_DIR}"/
+fi
+

 mkdir -p "${WORKING_DIR}/pxelinux.cfg"
 cat > "${WORKING_DIR}/pxelinux.cfg/default" << EOF
 default grml
 label grml
 mkdir -p "${WORKING_DIR}/pxelinux.cfg"
 cat > "${WORKING_DIR}/pxelinux.cfg/default" << EOF
 default grml
 label grml

-  kernel linux26
+  kernel vmlinuz

   append initrd=initrd.img root=/dev/nfs rw nfsroot=192.168.0.1:/live/image boot=live apm=power-off quiet nomce noprompt noeject vga=791 
 EOF
 
   append initrd=initrd.img root=/dev/nfs rw nfsroot=192.168.0.1:/live/image boot=live apm=power-off quiet nomce noprompt noeject vga=791 
 EOF