Merge pull request #240 from dagwieers/syslinux5-support

Hopefully last batch of syslinux v5 related fixes
rear · Jun 7, 2013 · c092087 · c092087
2 parents 5f44479 + cffbefb
commit c092087
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/usr/share/rear/lib/bootloader-functions.sh b/usr/share/rear/lib/bootloader-functions.sh
@@ -263,10 +263,16 @@ function make_syslinux_config {
 		echo ""
 	fi
 
-	# Add needed libraries for syslinux v5
+	# Add needed libraries for syslinux v5 and hdt
 	if [[ -r "$SYSLINUX_DIR/ldlinux.c32" ]]; then
 		cp $v "$SYSLINUX_DIR/ldlinux.c32" "$BOOT_DIR/ldlinux.c32" >&2
 	fi
+	if [[ -r "$SYSLINUX_DIR/libcom32.c32" ]]; then
+		cp $v "$SYSLINUX_DIR/libcom32.c32" "$BOOT_DIR/libcom32.c32" >&2
+	fi
+	if [[ -r "$SYSLINUX_DIR/libgpl.c32" ]]; then
+		cp $v "$SYSLINUX_DIR/libgpl.c32" "$BOOT_DIR/libgpl.c32" >&2
+	fi
 	if [[ -r "$SYSLINUX_DIR/libmenu.c32" ]]; then
 		cp $v "$SYSLINUX_DIR/libmenu.c32" "$BOOT_DIR/libmenu.c32" >&2
 	fi

diff --git a/usr/share/rear/output/USB/Linux-i386/30_create_extlinux.sh b/usr/share/rear/output/USB/Linux-i386/30_create_extlinux.sh
@@ -250,8 +250,10 @@ Log "Creating $SYSLINUX_PREFIX/extlinux.conf"
     syslinux_has "sysdump.c32"
     syslinux_has "vesamenu.c32"
 
-    # Add needed libraries for syslinux v5
+    # Add needed libraries for syslinux v5 and hdt
     syslinux_has "ldlinux.c32"
+    syslinux_has "libcom32.c32"
+    syslinux_has "libgpl.c32"
     syslinux_has "libmenu.c32"
     syslinux_has "libutil.c32"