summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfig/binary_local-hooks/syslinux-config1
-rw-r--r--config/binary_syslinux/isolinux.cfg4
-rw-r--r--config/binary_syslinux/live.cfg27
3 files changed, 27 insertions, 5 deletions
diff --git a/config/binary_local-hooks/syslinux-config b/config/binary_local-hooks/syslinux-config
index 179ba14..90ff293 100755
--- a/config/binary_local-hooks/syslinux-config
+++ b/config/binary_local-hooks/syslinux-config
@@ -12,3 +12,4 @@ esac
mkdir -p binary/isolinux
cp config/binary_syslinux/* binary/isolinux/
+ cp chroot/usr/share/misc/pci.ids binary/isolinux/
diff --git a/config/binary_syslinux/isolinux.cfg b/config/binary_syslinux/isolinux.cfg
index 804f690..f584c47 100644
--- a/config/binary_syslinux/isolinux.cfg
+++ b/config/binary_syslinux/isolinux.cfg
@@ -1,4 +1,6 @@
-include menu.cfg
+include stdmenu.cfg
+include live.cfg
+include advanced.cfg
default vesamenu.c32
prompt 0
timeout 50
diff --git a/config/binary_syslinux/live.cfg b/config/binary_syslinux/live.cfg
index 4ba71c7..f186aa3 100644
--- a/config/binary_syslinux/live.cfg
+++ b/config/binary_syslinux/live.cfg
@@ -1,8 +1,27 @@
prompt 0
-menu title Kanotix
+menu title KANOTIX-LIVE
-label kanotix
- menu label Kanotix-DE
+label kanotix-live-de
+ menu label Start Kanotix-DE
menu default
kernel /live/vmlinuz
- append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys splash
+ append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys nocompiz quiet splash
+
+label kanotix-live-en
+ menu label Start Kanotix-EN
+ kernel /live/vmlinuz
+ append initrd=/live/initrd.img boot=live config utc=yes locales=en_US.UTF-8_US nocompiz quiet splash
+
+label kanotix-live-de-failsafe
+ menu label Start Kanotix-DE (failsafe)
+ kernel /live/vmlinuz
+ append initrd=/live/initrd.img boot=live config utc=no timezone=Europe/Berlin locales=de_DE.UTF-8,en_US.UTF-8_US keyboard-layouts=de keyboard-variants=nodeadkeys noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal nocompiz quiet splash
+
+label kanotix-live-en-failsafe
+ menu label Start Kanotix EN (failsafe)
+ kernel /live/vmlinuz
+ append initrd=/live/initrd.img boot=live config utc=yes locales=en_US.UTF-8_US noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal nocompiz quiet splash
+
+label memtest
+ menu label Memtest86+
+ kernel /live/memtest