From 3f86cca0bb1bdc2581d468457650348d4a4d72a5 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 18 Aug 2011 12:40:34 -0300 Subject: [configs/releng] Add missing -D param to checksum command Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index ab7aae7..e06089a 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -163,7 +163,7 @@ make_prepare() { # args: $1 (core | netinstall) make_iso() { local _iso_type=${1} - mkarchiso ${verbose} checksum "${work_dir}" + mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${_iso_type}-${arch}.iso" } @@ -207,7 +207,7 @@ make_dual() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/} done - mkarchiso ${verbose} checksum "${work_dir}/dual" + mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}/dual" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}/dual" "${name}-${version}-${_iso_type}-dual.iso" : > ${work_dir}/dual/build.${FUNCNAME}_${_iso_type} fi -- cgit v1.2.3-54-g00ecf From b16088ba7e39442937cca8ff204dbe0ae83440d5 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 18 Aug 2011 12:48:05 -0300 Subject: [configs/baseline] Add missing -D param to checksum command Signed-off-by: Gerardo Exequiel Pozzi --- configs/baseline/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index a3775c0..aa75a20 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -78,7 +78,7 @@ make_prepare() { # Build ISO make_iso() { - mkarchiso ${verbose} checksum "${work_dir}" + mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${arch}.iso" } -- cgit v1.2.3-54-g00ecf From a9c02d94881fdf542ffc6ea0525c4726f66f0870 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 17 Aug 2011 20:26:17 -0300 Subject: [configs/releng] Replace rc.d/archiso with initscripts hooks. In this way: * Prepare locales requested by boot param mostly early possible. * Setup special console at end of rc.sysinit Remove unneded include from automated_script (already included by rc.conf) Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/root-image/etc/rc.conf | 2 +- configs/releng/root-image/etc/rc.d/archiso | 45 ---------------------- .../etc/rc.d/functions.d/automated_script | 2 - .../etc/rc.d/functions.d/prepare_locale_gen | 11 ++++++ .../etc/rc.d/functions.d/setup_special_console | 25 ++++++++++++ 5 files changed, 37 insertions(+), 48 deletions(-) delete mode 100755 configs/releng/root-image/etc/rc.d/archiso create mode 100644 configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen create mode 100644 configs/releng/root-image/etc/rc.d/functions.d/setup_special_console diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf index 42084f6..a3e3d8a 100644 --- a/configs/releng/root-image/etc/rc.conf +++ b/configs/releng/root-image/etc/rc.conf @@ -30,4 +30,4 @@ USELVM="no" HOSTNAME="archiso" -DAEMONS=(hwclock syslog-ng archiso) +DAEMONS=(hwclock syslog-ng) diff --git a/configs/releng/root-image/etc/rc.d/archiso b/configs/releng/root-image/etc/rc.d/archiso deleted file mode 100755 index cc930f6..0000000 --- a/configs/releng/root-image/etc/rc.d/archiso +++ /dev/null @@ -1,45 +0,0 @@ -# vim: set ft=sh: -. /etc/rc.conf -. /etc/rc.d/functions - -do_locale_gen () -{ - if [[ ${LOCALE} != "en_US.UTF-8" ]]; then - stat_busy "Generating locales..." - sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen - /usr/sbin/locale-gen > /dev/null - stat_done - fi -} - -# If an alternate console was specified on the kernel command line, -# start agetty on it too. -do_special_console() -{ - local cmdline_console - if cmdline_console=$(kernel_cmdline console); then - stat_busy "Starting agetty on console: ${cmdline_console}" - local port options baud rts - port=${cmdline_console%%,*} - options=${cmdline_console#${port}} - options=${options#,} - baud=${options%%[neo]*} - [[ ${options} =~ r$ ]] && rts="-h" - if ! grep -q "^${port}" /etc/securetty; then - echo ${port} >> /etc/securetty - fi - if ! grep -q "^z0:" /etc/inittab; then - echo "z0:2345:respawn:/sbin/agetty -8 -s ${rts} ${baud:-9600} ${port} linux" >> /etc/inittab - fi - /sbin/telinit q - stat_done - fi -} - -case "$1" in - start) - do_locale_gen - do_special_console - ;; -esac -exit 0 diff --git a/configs/releng/root-image/etc/rc.d/functions.d/automated_script b/configs/releng/root-image/etc/rc.d/functions.d/automated_script index edb8ea3..7a35acb 100644 --- a/configs/releng/root-image/etc/rc.d/functions.d/automated_script +++ b/configs/releng/root-image/etc/rc.d/functions.d/automated_script @@ -1,5 +1,3 @@ -. /etc/archiso/functions - automated_script () { script="$(kernel_cmdline script)" diff --git a/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen b/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen new file mode 100644 index 0000000..47ed79d --- /dev/null +++ b/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen @@ -0,0 +1,11 @@ +prepare_locale_gen () +{ + if [[ ${LOCALE} != "en_US.UTF-8" ]]; then + stat_busy "Generating locales..." + sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen + /usr/sbin/locale-gen > /dev/null + stat_done + fi +} + +add_hook sysinit_postmount prepare_locale_gen diff --git a/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console new file mode 100644 index 0000000..7badfe3 --- /dev/null +++ b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console @@ -0,0 +1,25 @@ +# If an alternate console was specified on the kernel command line, +# start agetty on it too. +setup_special_console() +{ + local cmdline_console + if cmdline_console=$(kernel_cmdline console); then + stat_busy "Starting agetty on console: ${cmdline_console}" + local port options baud rts + port=${cmdline_console%%,*} + options=${cmdline_console#${port}} + options=${options#,} + baud=${options%%[neo]*} + [[ ${options} == *r ]] && rts="-h" + if ! grep -q "^${port}" /etc/securetty; then + echo ${port} >> /etc/securetty + fi + if ! grep -q "^z0:" /etc/inittab; then + echo "z0:2345:respawn:/sbin/agetty -8 -s ${rts} ${baud:-9600} ${port} linux" >> /etc/inittab + fi + /sbin/telinit q + stat_done + fi +} + +add_hook sysinit_end setup_special_console -- cgit v1.2.3-54-g00ecf From 61114497b219efa865ae2ecda414e23a689a66bd Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 18 Aug 2011 22:08:48 -0300 Subject: [configs/releng] Add missing serial console support to syslinux Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/syslinux.dual/syslinux_head.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/releng/syslinux.dual/syslinux_head.cfg b/configs/releng/syslinux.dual/syslinux_head.cfg index 2f692f8..f46ba78 100644 --- a/configs/releng/syslinux.dual/syslinux_head.cfg +++ b/configs/releng/syslinux.dual/syslinux_head.cfg @@ -1,3 +1,4 @@ +SERIAL 0 38400 DEFAULT vesamenu.c32 PROMPT 0 MENU TITLE Arch Linux -- cgit v1.2.3-54-g00ecf From 0f392d148dd9d7d97ce2e1770b98eecc26c276bc Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 18 Aug 2011 22:26:08 -0300 Subject: [configs/releng] Set /lib/modules with 50% of free space Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/aitab.core | 2 +- configs/releng/aitab.netinstall | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/releng/aitab.core b/configs/releng/aitab.core index 5a54bec..6d10a75 100644 --- a/configs/releng/aitab.core +++ b/configs/releng/aitab.core @@ -1,6 +1,6 @@ # root-image / %ARCH% xz ext4 50% -lib-modules /lib/modules %ARCH% xz ext4 10% +lib-modules /lib/modules %ARCH% xz ext4 50% usr-share /usr/share any xz ext4 50% repo-core-%ARCH% /repo/core/%ARCH% %ARCH% xz none 0 repo-core-any /repo/core/any any xz none 0 diff --git a/configs/releng/aitab.netinstall b/configs/releng/aitab.netinstall index 26733d2..2231154 100644 --- a/configs/releng/aitab.netinstall +++ b/configs/releng/aitab.netinstall @@ -1,4 +1,4 @@ # root-image / %ARCH% xz ext4 50% -lib-modules /lib/modules %ARCH% xz ext4 10% +lib-modules /lib/modules %ARCH% xz ext4 50% usr-share /usr/share any xz ext4 50% -- cgit v1.2.3-54-g00ecf From 315dc5d98470e9f02f4a8d0e57340d7194f0c089 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 18 Aug 2011 19:26:02 -0300 Subject: [configs/releng] Add three packages to live-enviroment core/linux-atm: * This was present in 2010.05 * Optionally needed by iproute2. Needed for ATM connections. extra/mtools: * This was present in 2010.05 * Optionally dependency of syslinux. Needed if want to install syslinux on vfat. extra/smartmontools: * Requested by Thomas Mudrunka https://bugs.archlinux.org/task/25633 Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.i686 | 3 +++ configs/releng/packages.x86_64 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index a7427aa..53d4055 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -18,6 +18,8 @@ ipw2100-fw ipw2200-fw lftp lilo +linux-atm +mtools netcfg nfs-utils nilfs-utils @@ -32,6 +34,7 @@ parted pptpclient rp-pppoe rsync +smartmontools speedtouch tcpdump vpnc diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index a7427aa..53d4055 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -18,6 +18,8 @@ ipw2100-fw ipw2200-fw lftp lilo +linux-atm +mtools netcfg nfs-utils nilfs-utils @@ -32,6 +34,7 @@ parted pptpclient rp-pppoe rsync +smartmontools speedtouch tcpdump vpnc -- cgit v1.2.3-54-g00ecf From aca6dbaec9cc8af34ffad79b48054ac6b405174c Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Fri, 19 Aug 2011 13:45:52 -0300 Subject: [configs/releng] Add irssi to live-enviroment extra/irssi: * Requested by Florian Pritz http://mailman.archlinux.org/pipermail/arch-releng/2011-July/001853.html Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.i686 | 1 + configs/releng/packages.x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index 53d4055..27db22c 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -16,6 +16,7 @@ hdparm inetutils ipw2100-fw ipw2200-fw +irssi lftp lilo linux-atm diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 53d4055..27db22c 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -16,6 +16,7 @@ hdparm inetutils ipw2100-fw ipw2200-fw +irssi lftp lilo linux-atm -- cgit v1.2.3-54-g00ecf