get rid of unused isolinux files; change iso cdrom paths

8 files changed, 8 insertions, 70 deletions

diff --git a/isolinux/advanced.cfg b/isolinux/advanced.cfg
deleted file mode 100644
index 373451a..0000000
--- a/isolinux/advanced.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-label hdt
-        menu label ^Hardware Detection Tool (HDT)
-        com32 hdt.c32
-
-label memtest
-        menu label ^Memory Diagnostic Tool (memtest86+)
-        linux /live/memtest
diff --git a/isolinux/install.cfg b/isolinux/install.cfg
deleted file mode 100644
index 23fcdb8..0000000
--- a/isolinux/install.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-label install
-        menu label ^Install
-        linux /install/vmlinuz
-        initrd /install/initrd.gz
-        append vga=788  --- quiet
-
-label installgui
-        menu label ^Graphical install
-        linux /install/gtk/vmlinuz
-        initrd /install/gtk/initrd.gz
-        append video=vesa:ywrap,mtrr vga=788  --- quiet
diff --git a/isolinux/isolinux.cfg b/isolinux/isolinux.cfg
index ae49ae2..3cb8f33 100644
--- a/isolinux/isolinux.cfg
+++ b/isolinux/isolinux.cfg
@@ -1,5 +1,5 @@
-default live-amd64
-label live-amd64
-        linux /live/vmlinuz
-        initrd /live/initrd.img
+default samizdat
+label samizdat
+        linux linux/vmlinuz
+        initrd linux/initrd.img
         append boot=samizdat components quiet splash
diff --git a/isolinux/live.cfg b/isolinux/live.cfg
deleted file mode 100644
index 23f4b76..0000000
--- a/isolinux/live.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-label live-amd64
-        menu label ^Samizdat (amd64)
-        menu default
-        linux /live/vmlinuz
-        initrd /live/initrd.img
-        append boot=samizdat components quiet splash
-
-label live-amd64-failsafe
-        menu label ^Samizdat (amd64 failsafe)
-        linux /live/vmlinuz
-        initrd /live/initrd.img
-        append boot=samizdat components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal
diff --git a/isolinux/menu.cfg b/isolinux/menu.cfg
deleted file mode 100644
index dbc32f1..0000000
--- a/isolinux/menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-menu hshift 7
-menu width 60
-
-menu title Boot menu
-include stdmenu.cfg
-include live.cfg
-include install.cfg
-menu begin advanced
-        menu title ^Advanced options
-        include stdmenu.cfg
-        label mainmenu
-                menu label ^Back..
-                menu exit
-        include advanced.cfg
-menu end
-
-menu clear
diff --git a/isolinux/pxelinux.cfg/default b/isolinux/pxelinux.cfg/default
index af54e61..8e0a05f 100644
--- a/isolinux/pxelinux.cfg/default
+++ b/isolinux/pxelinux.cfg/default
@@ -1,5 +1,5 @@
-default live-amd64
-label live-amd64
-        linux /live/vmlinuz
-        initrd /live/initrd.img
+default samizdat
+label samizdat
+        linux linux/vmlinuz
+        initrd linux/initrd.img
         append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.iso nbddev=/dev/nbd0 ip=dhcp
diff --git a/isolinux/splash.png b/isolinux/splash.png
deleted file mode 100644
index 52d9a8b..0000000
--- a/isolinux/splash.png
+++ /dev/null
diff --git a/isolinux/stdmenu.cfg b/isolinux/stdmenu.cfg
deleted file mode 100644
index 671b16f..0000000
--- a/isolinux/stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-menu background splash.png
-menu color title        * #FFFFFFFF *
-menu color border       * #00000000 #00000000 none
-menu color sel          * #ffffffff #76a1d0ff *
-menu color hotsel       1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg       * #ffffffff #00000000 *
-menu color help         37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot or TAB to edit a menu entry