diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/binary_burg/burg.cfg | 6 | ||||
| -rw-r--r-- | config/binary_grub/grub.cfg | 8 | ||||
| -rw-r--r-- | config/binary_grub/grub.cfg.cz | 12 | ||||
| -rw-r--r-- | config/binary_grub/loopback.cfg | 8 | ||||
| -rw-r--r-- | config/binary_syslinux/live.cfg | 8 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/03-distro | 2 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/03-lxde-fixes | 14 |
7 files changed, 36 insertions, 22 deletions
diff --git a/config/binary_burg/burg.cfg b/config/binary_burg/burg.cfg index ed49810..49d2c15 100644 --- a/config/binary_burg/burg.cfg +++ b/config/binary_burg/burg.cfg @@ -38,7 +38,7 @@ insmod gettext menuentry 'Start Kanotix' --class kanotix --group main { echo 'Loading Linux ...' - linux /live/vmlinuz boot=live config ${lang_opt} quiet splash + linux /live/vmlinuz boot=live config ${lang_opt} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -46,7 +46,7 @@ menuentry 'Start Kanotix' --class kanotix --group main { if test -d /gfxoverlay ; then menuentry 'Start Kanotix (gfxoverlay)' --class kanotix --group main { echo 'Loading Linux ...' - linux /live/vmlinuz boot=live config ${lang_opt} gfx=auto quiet splash + linux /live/vmlinuz boot=live config ${lang_opt} gfx=auto quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -54,7 +54,7 @@ fi menuentry 'Start Kanotix (failsafe)' --class kanotix --group main { echo 'Loading Linux ...' - linux /live/vmlinuz boot=live config ${lang_opt} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz boot=live config ${lang_opt} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg index c49c37a..57f248d 100644 --- a/config/binary_grub/grub.cfg +++ b/config/binary_grub/grub.cfg @@ -57,7 +57,7 @@ fi ##### menuentry 'Start Kanotix DE' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -71,7 +71,7 @@ menuentry 'Start Kanotix DE (gfxdetect)' { menuentry 'Start Kanotix EN' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -85,7 +85,7 @@ menuentry 'Start Kanotix EN (gfxdetect)' { menuentry 'Start Kanotix DE (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -93,7 +93,7 @@ menuentry 'Start Kanotix DE (failsafe)' { menuentry 'Start Kanotix EN (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_grub/grub.cfg.cz b/config/binary_grub/grub.cfg.cz index 4ddfff3..83e1842 100644 --- a/config/binary_grub/grub.cfg.cz +++ b/config/binary_grub/grub.cfg.cz @@ -58,7 +58,7 @@ fi ##### menuentry 'Start Kanotix DE' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -72,7 +72,7 @@ menuentry 'Start Kanotix DE (gfxdetect)' { menuentry 'Start Kanotix EN' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -86,7 +86,7 @@ menuentry 'Start Kanotix EN (gfxdetect)' { menuentry 'Start Kanotix CZ' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_cs} quiet splash + linux /live/vmlinuz ${boot_cs} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -100,7 +100,7 @@ menuentry 'Start Kanotix CZ (gfxdetect)' { menuentry 'Start Kanotix DE (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_de} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } @@ -108,14 +108,14 @@ menuentry 'Start Kanotix DE (failsafe)' { menuentry 'Start Kanotix EN (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_en} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix CZ (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_cs} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_cs} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_grub/loopback.cfg b/config/binary_grub/loopback.cfg index b69cb37..288027c 100644 --- a/config/binary_grub/loopback.cfg +++ b/config/binary_grub/loopback.cfg @@ -61,28 +61,28 @@ fi ##### menuentry 'Start Kanotix DE' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} ${loopback} quiet splash + linux /live/vmlinuz ${boot_de} ${loopback} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix EN' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} ${loopback} quiet splash + linux /live/vmlinuz ${boot_en} ${loopback} quiet splash loglevel=3 echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix DE (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_de} ${loopback} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_de} ${loopback} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } menuentry 'Start Kanotix EN (failsafe)' { echo 'Loading Linux ...' - linux /live/vmlinuz ${boot_en} ${loopback} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal + linux /live/vmlinuz ${boot_en} ${loopback} quiet splash loglevel=3 noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal echo 'Loading initial ramdisk ...' initrd /live/initrd.img } diff --git a/config/binary_syslinux/live.cfg b/config/binary_syslinux/live.cfg index f186aa3..d562bd4 100644 --- a/config/binary_syslinux/live.cfg +++ b/config/binary_syslinux/live.cfg @@ -5,22 +5,22 @@ 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 nocompiz quiet 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 loglevel=3 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 + append initrd=/live/initrd.img boot=live config utc=yes locales=en_US.UTF-8_US nocompiz quiet splash loglevel=3 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 + 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 loglevel=3 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 + 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 loglevel=3 label memtest menu label Memtest86+ diff --git a/config/chroot_local-hooks/03-distro b/config/chroot_local-hooks/03-distro index a26ee4f..12c3a01 100755 --- a/config/chroot_local-hooks/03-distro +++ b/config/chroot_local-hooks/03-distro @@ -12,7 +12,7 @@ rsync -Ha --ignore-existing /usr/share/kanotix/profile/ /etc/skel/ perl -pi -e 's/^(GRUB_DISTRIBUTOR)=.*/\1=`[ "\$\(uname -m\)" = "x86_64" ] && echo Kanotix64 || echo Kanotix`/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_LINUX_RECOVERY)=.*/\1="true"/' /etc/default/grub perl -pi -e 's/.*(GRUB_DISABLE_RECOVERY)=.*/\1="true"/' /etc/default/grub -perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash"/' /etc/default/grub +perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet splash loglevel=3"/' /etc/default/grub perl -pi -e 's/#GRUB_DISABLE_OS_PROBER=false/GRUB_DISABLE_OS_PROBER=false/g' /etc/default/grub diff --git a/config/chroot_local-hooks/03-lxde-fixes b/config/chroot_local-hooks/03-lxde-fixes index abdbaec..78143f7 100755 --- a/config/chroot_local-hooks/03-lxde-fixes +++ b/config/chroot_local-hooks/03-lxde-fixes @@ -45,6 +45,20 @@ cat <<"EOF" >/etc/skel/.config/lxsession/LXDE/autostart @xfce4-power-manager-wrapper EOF + # hotfix for key PRINT + if [ -e /etc/skel/.config/openbox/lxde-rc.xml ]; then + sed -i 's/gnome-screenshot --interactive/ksnip/' /etc/skel/.config/openbox/lxde-rc.xml + if [ -e /var/lib/dpkg/info/xfce4-screenshooter.list ]; then + sed -i 's/ksnip/xfce4-screenshooter/' /etc/skel/.config/openbox/lxde-rc.xml + fi + fi + if [ -e /etc/skel/.config/compiz/compizconfig/Default.ini ]; then + sed -i 's/gnome-screenshot -i -w/ksnip/' /etc/skel/.config/compiz/compizconfig/Default.ini + sed -i 's/gnome-screenshot -i/ksnip/' /etc/skel/.config/compiz/compizconfig/Default.ini + if [ -e /var/lib/dpkg/info/xfce4-screenshooter.list ]; then + sed -i 's/ksnip/xfce4-screenshooter/' /etc/skel/.config/compiz/compizconfig/Default.ini + fi + fi # awesome in lightdm-menu if [ -e /usr/share/xsessions/awesome.desktop ]; then sed -i '/NoDisplay/d' /usr/share/xsessions/awesome.desktop |
