[arch-releng] [PATCH 1/5] comment IPAPPEND option in isolinux.cfg
Avoid warning about unknown keyword when boot with syslinux. This option is valid under pxelinux. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso2dual/isolinux.cfg | 4 ++-- .../syslinux-iso/boot-files/isolinux/isolinux.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg index 5ed26e1..22641aa 100644 --- a/archiso2dual/isolinux.cfg +++ b/archiso2dual/isolinux.cfg @@ -39,7 +39,7 @@ ENDTEXT MENU LABEL Boot Arch Linux (i686) KERNEL /boot/i686/vmlinuz26 APPEND initrd=/boot/i686/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 -IPAPPEND 0 +#IPAPPEND 1 LABEL arch64 TEXT HELP @@ -49,7 +49,7 @@ ENDTEXT MENU LABEL Boot Arch Linux (x86_64) KERNEL /boot/x86_64/vmlinuz26 APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 -IPAPPEND 0 +#IPAPPEND 1 LABEL existing TEXT HELP diff --git a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg index 2d604ba..5c71325 100644 --- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg +++ b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg @@ -39,7 +39,7 @@ ENDTEXT MENU LABEL Boot Arch Linux KERNEL /boot/vmlinuz26 APPEND initrd=/boot/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 -IPAPPEND 0 +#IPAPPEND 1 LABEL existing TEXT HELP -- 1.7.1
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso2dual/isolinux.cfg | 4 ++-- .../syslinux-iso/boot-files/isolinux/isolinux.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg index 22641aa..4147b27 100644 --- a/archiso2dual/isolinux.cfg +++ b/archiso2dual/isolinux.cfg @@ -39,7 +39,7 @@ ENDTEXT MENU LABEL Boot Arch Linux (i686) KERNEL /boot/i686/vmlinuz26 APPEND initrd=/boot/i686/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 -#IPAPPEND 1 +#IPAPPEND 3 LABEL arch64 TEXT HELP @@ -49,7 +49,7 @@ ENDTEXT MENU LABEL Boot Arch Linux (x86_64) KERNEL /boot/x86_64/vmlinuz26 APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 -#IPAPPEND 1 +#IPAPPEND 3 LABEL existing TEXT HELP diff --git a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg index 5c71325..715b319 100644 --- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg +++ b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg @@ -39,7 +39,7 @@ ENDTEXT MENU LABEL Boot Arch Linux KERNEL /boot/vmlinuz26 APPEND initrd=/boot/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 -#IPAPPEND 1 +#IPAPPEND 3 LABEL existing TEXT HELP -- 1.7.1
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso2dual/isolinux.cfg | 2 ++ .../syslinux-iso/boot-files/isolinux/isolinux.cfg | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg index 4147b27..6dd4bbb 100644 --- a/archiso2dual/isolinux.cfg +++ b/archiso2dual/isolinux.cfg @@ -39,6 +39,7 @@ ENDTEXT MENU LABEL Boot Arch Linux (i686) KERNEL /boot/i686/vmlinuz26 APPEND initrd=/boot/i686/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 +# Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 LABEL arch64 @@ -49,6 +50,7 @@ ENDTEXT MENU LABEL Boot Arch Linux (x86_64) KERNEL /boot/x86_64/vmlinuz26 APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 +# Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 LABEL existing diff --git a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg index 715b319..dd9ef86 100644 --- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg +++ b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg @@ -39,6 +39,7 @@ ENDTEXT MENU LABEL Boot Arch Linux KERNEL /boot/vmlinuz26 APPEND initrd=/boot/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 +# Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 LABEL existing -- 1.7.1
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/syslinux-iso/packages.i686 | 7 +------ configs/syslinux-iso/packages.x86_64 | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/configs/syslinux-iso/packages.i686 b/configs/syslinux-iso/packages.i686 index 36ae337..6833707 100644 --- a/configs/syslinux-iso/packages.i686 +++ b/configs/syslinux-iso/packages.i686 @@ -13,13 +13,10 @@ gnu-netcat inetutils ipw2100-fw ipw2200-fw -iwlwifi-3945-ucode -iwlwifi-4965-ucode -iwlwifi-5000-ucode -iwlwifi-5150-ucode joe lftp lilo +linux-firmware memtest86+ ndiswrapper ndiswrapper-utils @@ -32,8 +29,6 @@ openssh openvpn parted pptpclient -rt2x00-rt61-fw -rt2x00-rt71w-fw speedtouch squashfs-tools syslinux diff --git a/configs/syslinux-iso/packages.x86_64 b/configs/syslinux-iso/packages.x86_64 index 36ae337..6833707 100644 --- a/configs/syslinux-iso/packages.x86_64 +++ b/configs/syslinux-iso/packages.x86_64 @@ -13,13 +13,10 @@ gnu-netcat inetutils ipw2100-fw ipw2200-fw -iwlwifi-3945-ucode -iwlwifi-4965-ucode -iwlwifi-5000-ucode -iwlwifi-5150-ucode joe lftp lilo +linux-firmware memtest86+ ndiswrapper ndiswrapper-utils @@ -32,8 +29,6 @@ openssh openvpn parted pptpclient -rt2x00-rt61-fw -rt2x00-rt71w-fw speedtouch squashfs-tools syslinux -- 1.7.1
Latest init script mounts a /dev FS, so /dev/loop0 will disappear. Create loop0 on /lib/udev/devices so udev copy to /dev on startup. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/install/archiso | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/archiso/install/archiso b/archiso/install/archiso index ad1c1d0..9b45080 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -14,7 +14,7 @@ install () add_dir /tmpfs.sqfs add_dir /bootmnt - add_device /dev/loop0 b 7 0 + add_device /lib/udev/devices/loop0 b 7 0 add_binary /lib/udev/cdrom_id -- 1.7.1
On Tue, Jun 22, 2010 at 10:13 PM, Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> wrote:
Avoid warning about unknown keyword when boot with syslinux. This option is valid under pxelinux.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> ---
With this and the next two commits, you should probably combine them into one patch rather than hang out your mistakes to dry. Take a look at `git rebase -i` and the squash and fixup stuff there. -Dan
On 06/23/2010 12:16 AM, Dan McGee wrote:
On Tue, Jun 22, 2010 at 10:13 PM, Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> wrote:
Avoid warning about unknown keyword when boot with syslinux. This option is valid under pxelinux.
Signed-off-by: Gerardo Exequiel Pozzi<vmlinuz386@yahoo.com.ar> ---
With this and the next two commits, you should probably combine them into one patch rather than hang out your mistakes to dry. Take a look at `git rebase -i` and the squash and fixup stuff there.
-Dan
WOW! very interesting option, thanks for the tip, re-sending... PS: finally fixed my smtp problem via smtp+tls :) -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (2)
-
Dan McGee
-
Gerardo Exequiel Pozzi