diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-21 20:42:53 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-21 20:42:53 -0300 |
commit | 64a660adb9a1ad658874759c186e0e9cbf138e63 (patch) | |
tree | 310ed3d87e92f803f9951e7bc402bf616339e3ff /configs | |
parent | be5fc1d5c788df0f2d8d050e97581977caf133a3 (diff) | |
parent | aca6dbaec9cc8af34ffad79b48054ac6b405174c (diff) |
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts:
configs/releng/packages.i686
configs/releng/packages.x86_64
Diffstat (limited to 'configs')
-rwxr-xr-x | configs/baseline/build.sh | 2 | ||||
-rw-r--r-- | configs/releng/aitab.core | 2 | ||||
-rw-r--r-- | configs/releng/aitab.netinstall | 2 | ||||
-rwxr-xr-x | configs/releng/build.sh | 4 | ||||
-rw-r--r-- | configs/releng/packages.i686 | 4 | ||||
-rw-r--r-- | configs/releng/packages.x86_64 | 4 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.conf | 2 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.d/functions.d/automated_script | 2 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | configs/releng/root-image/etc/rc.d/functions.d/setup_special_console (renamed from configs/releng/root-image/etc/rc.d/archiso) | 26 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/syslinux_head.cfg | 1 |
11 files changed, 29 insertions, 31 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 780194d..3ae50e7 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" } 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 @@ # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> 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 @@ # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> 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% diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 8c96c76..4a48b0a 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -167,7 +167,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" } @@ -211,7 +211,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 diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index b4633ac..197dff3 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -13,8 +13,11 @@ elinks gnu-netcat hdparm inetutils +irssi lftp lilo +linux-atm +mtools netcfg nfs-utils nilfs-utils @@ -29,6 +32,7 @@ parted pptpclient rp-pppoe rsync +smartmontools tcpdump vpnc wireless_tools diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index b4633ac..197dff3 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -13,8 +13,11 @@ elinks gnu-netcat hdparm inetutils +irssi lftp lilo +linux-atm +mtools netcfg nfs-utils nilfs-utils @@ -29,6 +32,7 @@ parted pptpclient rp-pppoe rsync +smartmontools tcpdump vpnc wireless_tools diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf index 14775ee..f34f828 100644 --- a/configs/releng/root-image/etc/rc.conf +++ b/configs/releng/root-image/etc/rc.conf @@ -30,4 +30,4 @@ USELVM="no" HOSTNAME="libreiso" -DAEMONS=(hwclock syslog-ng archiso) +DAEMONS=(hwclock syslog-ng) 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/archiso b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console index cc930f6..7badfe3 100755..100644 --- a/configs/releng/root-image/etc/rc.d/archiso +++ b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console @@ -1,20 +1,6 @@ -# 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() +setup_special_console() { local cmdline_console if cmdline_console=$(kernel_cmdline console); then @@ -24,7 +10,7 @@ do_special_console() options=${cmdline_console#${port}} options=${options#,} baud=${options%%[neo]*} - [[ ${options} =~ r$ ]] && rts="-h" + [[ ${options} == *r ]] && rts="-h" if ! grep -q "^${port}" /etc/securetty; then echo ${port} >> /etc/securetty fi @@ -36,10 +22,4 @@ do_special_console() fi } -case "$1" in - start) - do_locale_gen - do_special_console - ;; -esac -exit 0 +add_hook sysinit_end setup_special_console diff --git a/configs/releng/syslinux.dual/syslinux_head.cfg b/configs/releng/syslinux.dual/syslinux_head.cfg index 84a755f..4953b18 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 Parabola GNU/Linux-libre |