From 197f97e2f612b767fa47a9ab391e3112d93d6bc2 Mon Sep 17 00:00:00 2001
From: root <root@tftp-build.ostrach.tld>
Date: Wed, 12 Apr 2023 20:49:50 +0000
Subject: [PATCH] minor changes

---
 config-full.sh             |  1 +
 config-non-free.sh         |  7 -------
 configure-debian-system.sh |  7 ++++---
 download-free.sh           |  4 ++++
 resources/default-full     | 20 ++++++++++----------
 5 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 config-non-free.sh
 create mode 100644 download-free.sh

diff --git a/config-full.sh b/config-full.sh
index 8b13d9d..4348548 100755
--- a/config-full.sh
+++ b/config-full.sh
@@ -2,6 +2,7 @@
 
 . ./settings.sh
 
+echo "Generating PXE Menu..."
 cat ./resources/default-full | \
   sed -e "s/__NFSSERVERIP__/${NFSSERVERIP}/g" \
       -e "s/__MENUTITLE__/${MENUTUTLE}/g" \
diff --git a/config-non-free.sh b/config-non-free.sh
deleted file mode 100644
index bd73960..0000000
--- a/config-non-free.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. ./settings.sh
-
-cat ./resources/default-full | sed "s/__NFSSERVERIP__/${NFSSERVERIP}/g" > ${TFTP}/default
-cp -av ./free ${TFTP}/
-cp -av ./non-free ${TFTP}/
diff --git a/configure-debian-system.sh b/configure-debian-system.sh
index eec8c56..8712f5a 100755
--- a/configure-debian-system.sh
+++ b/configure-debian-system.sh
@@ -14,9 +14,10 @@ cp ./resources/splash.png ${TFTP}/
 cp -a /usr/lib/syslinux/modules/bios ${TFTP}/
 
 # Link needed Files from installed Debian Packages to the TFTP-Root:
-ln /usr/lib/PXELINUX/pxelinux.0 $TFTP/
-ln /boot/ipxe.lkrn              $TFTP/
-ln ${TFTP}/bios/ldlinux.c32     $TFTP/
+ln /usr/lib/PXELINUX/pxelinux.0 ${TFTP}/
+ln /boot/ipxe.lkrn              ${TFTP}/
+ln /usr/lib/syslinux/memdisk    ${TFTP}/
+ln ${TFTP}/bios/ldlinux.c32     ${TFTP}/
 ln ${TFTP}/pxelinux.cfg/default ${TFTP}/default -s
 
 # set file access
diff --git a/download-free.sh b/download-free.sh
new file mode 100644
index 0000000..b2b349f
--- /dev/null
+++ b/download-free.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+
+
diff --git a/resources/default-full b/resources/default-full
index c06b00a..2150479 100644
--- a/resources/default-full
+++ b/resources/default-full
@@ -42,7 +42,7 @@ MENU BEGIN
 
   LABEL slitazf
    MENU LABEL * Slitaz Linux Floppyimage
-   kernel bios/memdisk
+   kernel memdisk
    append initrd=img/floppy-grub4dos
 
   LABEL zurueck...
@@ -78,20 +78,20 @@ MENU BEGIN
 
   LABEL acr11
     MENU LABEL * Acronis True Image Home 2011
-    LINUX  bios/memdisk
-    INITRD acronis/acronis2011.iso
+    LINUX  memdisk
+    INITRD non-free/acronis/acronis2011.iso
     APPEND iso raw
 
   LABEL acr10
     MENU LABEL * Acronis True Image 2010
-    LINUX  bios/memdisk
-    INITRD acronis/acronis2010.iso
+    LINUX  memdisk
+    INITRD non-free/acronis/acronis2010.iso
     APPEND iso raw
 
   LABEL acr09
     MENU LABEL * Acronis True Image 2009
-    LINUX  bios/memdisk
-    INITRD acronis/acronis2009.iso
+    LINUX  memdisk
+    INITRD non-free/acronis/acronis2009.iso
     APPEND iso raw
 
   LABEL zurueck...
@@ -140,7 +140,7 @@ MENU BEGIN
 
   label sbm
     MENU LABEL * Smart Boot Manager
-    kernel bios/memdisk
+    kernel memdisk
     append initrd=free/sbm.imz
 
   LABEL plop
@@ -157,12 +157,12 @@ MENU BEGIN
 
   label win98
     MENU LABEL * Windows 98 Bootdisk (DOS 7)
-    kernel bios/memdisk
+    kernel memdisk
     append initrd=non-free/win98.img
 
   label ether
     MENU LABEL * Etherboot
-    kernel bios/memdisk
+    kernel memdisk
     append initrd=free/ether.img
 
   LABEL zurueck...