October 2010 - Arch-releng - lists.archlinux.org

[arch-releng] [PATCH - help needed] archiso2dual: Autodetect whether we can boot x86_64
by Thomas Bächler 03 Dec '10

03 Dec '10

--- I'd like to have autodetection for 64 bit CPUs. I have attached a patch for archiso2dual, which works fine - however, as the configuration file is split into several files, I don't know how to make this work with archiso2dual's -S option. Does anyone have an idea on how to do this? archiso2dual/syslinux.cfg | 88 +++---------------------------------- archiso2dual/syslinux_32only.cfg | 3 + archiso2dual/syslinux_arch32.cfg | 10 ++++ archiso2dual/syslinux_arch64.cfg | 10 ++++ archiso2dual/syslinux_both.cfg | 4 ++ archiso2dual/syslinux_head.cfg | 32 ++++++++++++++ archiso2dual/syslinux_tail.cfg | 29 ++++++++++++ 7 files changed, 96 insertions(+), 80 deletions(-) create mode 100755 archiso2dual/syslinux_32only.cfg create mode 100644 archiso2dual/syslinux_arch32.cfg create mode 100644 archiso2dual/syslinux_arch64.cfg create mode 100755 archiso2dual/syslinux_both.cfg create mode 100644 archiso2dual/syslinux_head.cfg create mode 100644 archiso2dual/syslinux_tail.cfg diff --git a/archiso2dual/syslinux.cfg b/archiso2dual/syslinux.cfg index b53b883..ac92998 100644 --- a/archiso2dual/syslinux.cfg +++ b/archiso2dual/syslinux.cfg @@ -1,84 +1,12 @@ -DEFAULT vesamenu.c32 +DEFAULT choose PROMPT 0 -MENU TITLE Arch Linux -MENU BACKGROUND /boot/splash.png -TIMEOUT 3000 -# TODO: Replace these crappy messages with something useful -F1 boot.txt -F2 options.txt -F3 help.txt +LABEL choose +KERNEL ifcpu64.c32 +APPEND have64 -- nohave64 -MENU WIDTH 78 -MENU MARGIN 4 -MENU ROWS 6 -MENU VSHIFT 10 -MENU TIMEOUTROW 13 -MENU TABMSGROW 11 -MENU CMDLINEROW 11 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW 29 +LABEL have64 +CONFIG syslinux_both.cfg -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu - -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std - -LABEL arch32 -TEXT HELP -Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -MENU LABEL Boot Arch Linux (i686) -LINUX /boot/i686/vmlinuz26 -APPEND initrd=/boot/i686/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 -# Next line should be uncommented when prepare enviroment to boot from PXE. -#IPAPPEND 3 - -LABEL arch64 -TEXT HELP -Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) -LINUX /boot/x86_64/vmlinuz26 -APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 -# Next line should be uncommented when prepare enviroment to boot from PXE. -#IPAPPEND 3 - -LABEL existing -TEXT HELP -Boot an existing operating system. Press TAB to edit the disk and partition -number to boot. -ENDTEXT -MENU LABEL Boot existing OS -COM32 chain.c32 -APPEND hd0 0 - -# http://www.memtest.org/ -LABEL memtest -MENU LABEL Run Memtest86+ (RAM test) -LINUX /boot/memtest - -# http://hdt-project.org/ -LABEL hdt -MENU LABEL Hardware Information (HDT) -COM32 hdt.c32 -APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz - -LABEL reboot -MENU LABEL Reboot -COM32 reboot.c32 - -LABEL poweroff -MENU LABEL Power Off -COMBOOT poweroff.com - -ONTIMEOUT arch32 +LABEL nohave64 +CONFIG syslinux_32only.cfg diff --git a/archiso2dual/syslinux_32only.cfg b/archiso2dual/syslinux_32only.cfg new file mode 100755 index 0000000..c7a452d --- /dev/null +++ b/archiso2dual/syslinux_32only.cfg @@ -0,0 +1,3 @@ +INCLUDE syslinux_head.cfg +INCLUDE syslinux_arch32.cfg +INCLUDE syslinux_tail.cfg diff --git a/archiso2dual/syslinux_arch32.cfg b/archiso2dual/syslinux_arch32.cfg new file mode 100644 index 0000000..29a7745 --- /dev/null +++ b/archiso2dual/syslinux_arch32.cfg @@ -0,0 +1,10 @@ +LABEL arch32 +TEXT HELP +Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or +perform system maintenance. +ENDTEXT +MENU LABEL Boot Arch Linux (i686) +LINUX /boot/i686/vmlinuz26 +APPEND initrd=/boot/i686/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 +# Next line should be uncommented when prepare enviroment to boot from PXE. +#IPAPPEND 3 diff --git a/archiso2dual/syslinux_arch64.cfg b/archiso2dual/syslinux_arch64.cfg new file mode 100644 index 0000000..ac8f764 --- /dev/null +++ b/archiso2dual/syslinux_arch64.cfg @@ -0,0 +1,10 @@ +LABEL arch64 +TEXT HELP +Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or +perform system maintenance. +ENDTEXT +MENU LABEL Boot Arch Linux (x86_64) +LINUX /boot/x86_64/vmlinuz26 +APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 +# Next line should be uncommented when prepare enviroment to boot from PXE. +#IPAPPEND 3 diff --git a/archiso2dual/syslinux_both.cfg b/archiso2dual/syslinux_both.cfg new file mode 100755 index 0000000..9cd1584 --- /dev/null +++ b/archiso2dual/syslinux_both.cfg @@ -0,0 +1,4 @@ +INCLUDE syslinux_head.cfg +INCLUDE syslinux_arch32.cfg +INCLUDE syslinux_arch64.cfg +INCLUDE syslinux_tail.cfg diff --git a/archiso2dual/syslinux_head.cfg b/archiso2dual/syslinux_head.cfg new file mode 100644 index 0000000..246ecef --- /dev/null +++ b/archiso2dual/syslinux_head.cfg @@ -0,0 +1,32 @@ +DEFAULT vesamenu.c32 +PROMPT 0 +MENU TITLE Arch Linux +MENU BACKGROUND /boot/splash.png +TIMEOUT 3000 + +# TODO: Replace these crappy messages with something useful +F1 boot.txt +F2 options.txt +F3 help.txt + +MENU WIDTH 78 +MENU MARGIN 4 +MENU ROWS 6 +MENU VSHIFT 10 +MENU TIMEOUTROW 13 +MENU TABMSGROW 11 +MENU CMDLINEROW 11 +MENU HELPMSGROW 16 +MENU HELPMSGENDROW 29 + +# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu + +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 31;40 #30ffffff #00000000 std diff --git a/archiso2dual/syslinux_tail.cfg b/archiso2dual/syslinux_tail.cfg new file mode 100644 index 0000000..4b59e06 --- /dev/null +++ b/archiso2dual/syslinux_tail.cfg @@ -0,0 +1,29 @@ +LABEL existing +TEXT HELP +Boot an existing operating system. Press TAB to edit the disk and partition +number to boot. +ENDTEXT +MENU LABEL Boot existing OS +COM32 chain.c32 +APPEND hd0 0 + +# http://www.memtest.org/ +LABEL memtest +MENU LABEL Run Memtest86+ (RAM test) +LINUX /boot/memtest + +# http://hdt-project.org/ +LABEL hdt +MENU LABEL Hardware Information (HDT) +COM32 hdt.c32 +APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz + +LABEL reboot +MENU LABEL Reboot +COM32 reboot.c32 + +LABEL poweroff +MENU LABEL Power Off +COMBOOT poweroff.com + +ONTIMEOUT arch32 -- 1.7.3.1

3 6

[arch-releng] Unify directory scheme between single and dual .iso images
by Gerardo Exequiel Pozzi 06 Nov '10

06 Nov '10

This work is tested and pushed in my install_dir git branch. http://github.com/djgera/archiso/tree/install_dir An example "ls -lR": http://djgera.pastebin.com/SLKS4hzC

1 4

[arch-releng] [RFC] Finalized work about install_dir
by Gerardo Exequiel Pozzi 21 Oct '10

21 Oct '10

All this work is in my install_dir branch (based on experimental). Tested and works. http://github.com/djgera/archiso/compare/experimental...install_dir Today images sizes: (*dual build with -T split, otherwise core-dual is 725M and net-dual 355M): 666M archlinux-2010.10.21-core-dual.iso 357M archlinux-2010.10.21-core-i686.iso 374M archlinux-2010.10.21-core-x86_64.iso 297M archlinux-2010.10.21-netinstall-dual.iso 176M archlinux-2010.10.21-netinstall-i686.iso 185M archlinux-2010.10.21-netinstall-x86_64.iso

2 7

[arch-releng] Final work about squashfs compression support
by Gerardo Exequiel Pozzi 21 Oct '10

21 Oct '10

All this work is in my experimental branch. Tested and works (gzip only). As plus, there is a patch for support multiple "syslinux.cfg" in archiso2dual. http://github.com/djgera/archiso/compare/master...experimental

1 3

[arch-releng] test
by Arch Linus 19 Oct '10

19 Oct '10

test..!!! ok?

2 1

[arch-releng] [RFC] [PATCH] [archiso] Add support for squashfs compression types
by Gerardo Exequiel Pozzi 19 Oct '10

19 Oct '10

Add a note about supported status in Linux versions. Needs squashfs-tools-4.1 (now on extra). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/mkarchiso | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index c7de1da..e836a35 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -7,6 +7,7 @@ PACCONFIG="/etc/pacman.conf" export LABEL="ARCH_$(date +%Y%m)" PUBLISHER="Arch Linux <http://www.archlinux.org>" APPLICATION="Arch Linux Live/Rescue CD" +COMPRESSION="gzip" CREATE_DEFAULT="n" APPNAME=$(basename "${0}") @@ -22,6 +23,10 @@ usage () echo " -L <label> Set a label for the disk" echo " -P <publisher> Set a publisher for the disk" echo " -A <application> Set an application name for the disk" + echo " -c <compressor> Set SquashFS compression type: gzip, lzma or lzo. Default $COMPRESSION" + echo " NOTES:" + echo " lzma: not officially supported yet by Linux (2.6.36)" + echo " lzo: needs Linux >= 2.6.36" echo " -d Create default user directory /home/arch" echo " -v Enable verbose output" echo " -h This message" @@ -34,13 +39,14 @@ usage () exit $1 } -while getopts 'p:C:L:P:A:dfvh' arg; do +while getopts 'p:C:L:P:A:cdfvh' arg; do case "${arg}" in p) PKGLIST="${PKGLIST} ${OPTARG}" ;; C) PACCONFIG="${OPTARG}" ;; L) LABEL="${OPTARG}" ;; P) PUBLISHER="${OPTARG}" ;; A) APPLICATION="${OPTARG}" ;; + c) COMPRESSION="${OPTARG}" ;; d) CREATE_DEFAULT="y" ;; f) FORCE="y" ;; v) QUIET="n" ;; @@ -187,9 +193,9 @@ _mksquash () { echo "Creating SquashFS image. This may take some time..." start=$(date +%s) if [ "${QUIET}" = "y" ]; then - mksquashfs "${1}" "${sqimg}" -noappend >/dev/null + mksquashfs "${1}" "${sqimg}" -noappend -comp "${COMPRESSION}" >/dev/null else - mksquashfs "${1}" "${sqimg}" -noappend + mksquashfs "${1}" "${sqimg}" -noappend -comp "${COMPRESSION}" fi minutes=$(echo $start $(date +%s) | awk '{ printf "%0.2f",($2-$1)/60 }') echo "Image creation done in $minutes minutes." -- 1.7.3.1

4 19

[arch-releng] [RFC] [PATCH] [archiso2dual] Add support for squashfs compression types
by Gerardo Exequiel Pozzi 17 Oct '10

17 Oct '10

Add -c option with defaults to 'auto' thats autodetect current compression type of squashfs images to be processed. Add a note about supported status in Linux versions. Needs squashfs-tools-4.1 (now on extra). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso2dual/archiso2dual | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual index 5b17b4a..f34f078 100755 --- a/archiso2dual/archiso2dual +++ b/archiso2dual/archiso2dual @@ -19,6 +19,7 @@ work_dir="/tmp/archiso2dual" isomounts_file="/usr/share/archiso2dual/isomounts" syslinuxcfg_file="/usr/share/archiso2dual/syslinux.cfg" removefiles_file="/usr/share/archiso2dual/removefiles.lst" +compression="auto" appname=${0##*/} _error="0" _confirm="n" @@ -111,11 +112,16 @@ mksquashfs_image() { echo "Executing: ${FUNCNAME}" img=${1} arch=${2} + if [ "${compression}" = "auto" ]; then + _compression=$(unsquashfs -s ${work_dir}/iso/${arch}/${img}.sqfs | awk '/^Compression/ { print $2 }') + else + _compression=${compression} + fi rm -f ${work_dir}/iso/${arch}/${img}.sqfs if [ "${quiet}" = "y" ]; then - mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs > /dev/null + mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs -comp ${_compression} > /dev/null else - mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs + mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs -comp ${_compression} fi } @@ -239,6 +245,12 @@ show_help() (default to '${publisher}')" echo " -A <application> Set an application name for the disk (default to '${application}')" + echo " -c <compressor> Set SquashFS compression type: auto, gzip, lzma or lzo + (default to '${compression}')" + echo " NOTES:" + echo " lzma: not officially supported yet by Linux (2.6.36)" + echo " lzo: needs Linux >= 2.6.36" + echo " -y Confirm execution (otherwise only show configuration)" echo " -v Enable verbose output" echo " -h This message" @@ -334,7 +346,7 @@ if [ "$EUID" != "0" ]; then exit 1 fi -while getopts '3:6:o:T:M:S:R:L:P:A:yvh' arg; do +while getopts '3:6:o:T:M:S:R:L:P:A:c:yvh' arg; do case "${arg}" in 3) isofile_i686="${OPTARG}" ;; 6) isofile_x86_64="${OPTARG}" ;; @@ -350,6 +362,7 @@ while getopts '3:6:o:T:M:S:R:L:P:A:yvh' arg; do L) label="${OPTARG}" ;; P) publisher="${OPTARG}" ;; A) application="${OPTARG}" ;; + c) compression="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; y) _confirm="y" ;; v) quiet="n"; _v="-v" ;; -- 1.7.3.1

1 0

[arch-releng] [PATCH] [archiso] Update nbd hook to match newer nbd operation mode.
by Gerardo Exequiel Pozzi 12 Oct '10

12 Oct '10

Newer nbd-server uses config file instead of parameters via cmd line (deprecated). Also does not use a fixed port (oldstyle). Sample nbd-server.conf that works with this change: -- CUT HERE -- [generic] [archiso] readonly = true exportname = /tmp/archlinux.iso -- CUT HERE -- Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso_pxe_nbd | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archiso/hooks/archiso_pxe_nbd b/archiso/hooks/archiso_pxe_nbd index 125b75c..9f47116 100644 --- a/archiso/hooks/archiso_pxe_nbd +++ b/archiso/hooks/archiso_pxe_nbd @@ -68,11 +68,11 @@ archiso_pxe_nbd_mount_handler () { sleep 1 done - msg "::: Setup NBD from ${nbdserver}:9040 at /dev/nbd0" + msg "::: Setup NBD from ${nbdserver} at /dev/nbd0" if [ "${copytoram}" = "y" ]; then - nbd-client ${nbdserver} 9040 /dev/nbd0 + nbd-client ${nbdserver} -N archiso /dev/nbd0 else - nbd-client ${nbdserver} 9040 /dev/nbd0 -persist + nbd-client ${nbdserver} -N archiso /dev/nbd0 -persist fi archisodevice=/dev/nbd0 -- 1.7.3.1

1 0

[arch-releng] [PATCH] [syslinux-iso] Add rsync to live-enviroment
by Gerardo Exequiel Pozzi 09 Oct '10

09 Oct '10

Requested at FS#21040 Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/syslinux-iso/packages.i686 | 1 + configs/syslinux-iso/packages.x86_64 | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configs/syslinux-iso/packages.i686 b/configs/syslinux-iso/packages.i686 index 726903e..1b73057 100644 --- a/configs/syslinux-iso/packages.i686 +++ b/configs/syslinux-iso/packages.i686 @@ -30,6 +30,7 @@ openssh openvpn parted pptpclient +rsync speedtouch squashfs-tools syslinux diff --git a/configs/syslinux-iso/packages.x86_64 b/configs/syslinux-iso/packages.x86_64 index 726903e..1b73057 100644 --- a/configs/syslinux-iso/packages.x86_64 +++ b/configs/syslinux-iso/packages.x86_64 @@ -30,6 +30,7 @@ openssh openvpn parted pptpclient +rsync speedtouch squashfs-tools syslinux -- 1.7.3.1

1 0