From c91d1354c4a565c82cfb857c2d1316c39d25d8be Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 1 Dec 2010 20:00:08 +0100 Subject: [PATCH] Fix splashscreen on USB-Stick installer. Remove extra option page. Add missing unattended.conf to USB-Stick. --- config/syslinux/boot.msg | 6 ++---- config/syslinux/options.msg | 12 ------------ config/syslinux/syslinux.cfg | 6 ++---- lfs/cdrom | 3 +-- lfs/usb-stick | 4 ++-- 5 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 config/syslinux/options.msg diff --git a/config/syslinux/boot.msg b/config/syslinux/boot.msg index f20088163..dd6fc1fd0 100644 --- a/config/syslinux/boot.msg +++ b/config/syslinux/boot.msg @@ -2,9 +2,7 @@ splash.lss - - To install IPFire on your system, press the 0407 key. + - To disable vga mode, type: 04novga 07. + - To test the memory in your system type: 04memtest 07. - - Use the function keys listed below for more information. - -0f[F1-Main] [F2-Options]07 diff --git a/config/syslinux/options.msg b/config/syslinux/options.msg deleted file mode 100644 index c4e725ffb..000000000 --- a/config/syslinux/options.msg +++ /dev/null @@ -1,12 +0,0 @@ -00 - - - 0fInstaller Boot Options07 - - - To disable vga mode, type: 04novga 07. - - - To test the memory in your system type: 04memtest 07. - - - To install in unattended mode, type: 04unattended 07. - -0f[F1-Main] [F2-Options]07 diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index ac9bdc322..68ad82afd 100644 --- a/config/syslinux/syslinux.cfg +++ b/config/syslinux/syslinux.cfg @@ -1,16 +1,14 @@ TIMEOUT 5000 DISPLAY boot.msg PROMPT 1 -F1 boot.msg -F2 options.msg -DEFAULT vmlinuz +DEFAULT vmlinuz APPEND initrd=instroot vga=791 splash=silent ro LABEL novga KERNEL vmlinuz APPEND initrd=instroot ro LABEL unattended KERNEL vmlinuz - APPEND ide=nodma initrd=instroot vga=791 splash=silent unattended ro + APPEND initrd=instroot vga=791 splash=silent unattended ro LABEL memtest KERNEL memtest APPEND - diff --git a/lfs/cdrom b/lfs/cdrom index 0c4668d89..064769de1 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -84,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz; \ cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/cdrom/boot/isolinux/isolinux.cfg; \ cp $(DIR_SRC)/config/syslinux/boot.msg /install/cdrom/boot/isolinux/boot.msg; \ - cp $(DIR_SRC)/config/syslinux/options.msg /install/cdrom/boot/isolinux/options.msg; \ cp $(DIR_SRC)/config/syslinux/splash.lss /install/cdrom/boot/isolinux/splash.lss; \ cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest; \ cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin; \ diff --git a/lfs/usb-stick b/lfs/usb-stick index 76b97024f..427efe0de 100644 --- a/lfs/usb-stick +++ b/lfs/usb-stick @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -66,7 +66,7 @@ define COPY_TO_IMG losetup $$LOOPDEV $$IMAGE && \ mount -t vfat $$LOOPDEV /install/mnt && \ cp -fR /install/cdrom/* /install/mnt && \ - mv /install/mnt/boot/isolinux/{instroot,vmlinuz,*\.msg,memtest} /install/mnt && \ + mv /install/mnt/boot/isolinux/{instroot,vmlinuz,unattended.conf,splash.lss,*\.msg,memtest} /install/mnt && \ rm -rf /install/mnt/boot && \ cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \ umount /install/mnt && \ -- 2.39.2