July 2012 - Arch-releng - lists.archlinux.org

[arch-releng] [PATCH] Ust zsh as default interactive shell
by Pierre Schmitz 06 Aug '12

06 Aug '12

This installs zsh and sets it as default for root and the arch user. grml-zsh-config is installed as a userfriendly default configuration. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- This might look controversial, so let me explain. As our new install method is based on the usage of various cli tools our plain ash setup gets a little inconvinient. This patch adds zsh and a feature rich default config. We will get menu based completion and inline help for e.g. pacman but also our install scripts, rc.d and a lot of other tools. This should make the iso easier to use and more accessable. I haven't found any real downside here, so let me know if you can think of any. Also please try it first if you haven't yet. E.g. try things like pacstrap -<tab> etc.. If there are no major concerns I would suggest we try this for at least one release. With our monthly releases we can simply revert this for the next one if user feedback is all negative. configs/releng/build.sh | 5 ++++- configs/releng/packages.i686 | 2 ++ configs/releng/packages.x86_64 | 2 ++ 3 Dateien geändert, 8 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 5352000..f1b1693 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -153,7 +153,10 @@ make_customize_root_image() { -r 'locale-gen' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" arch' \ + -r 'usermod -s /bin/zsh root' \ + run + mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ + -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ run : > ${work_dir}/build.${FUNCNAME} fi diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index aaf0f37..0b23596 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -14,6 +14,7 @@ efibootmgr elinks gnu-netcat gptfdisk +grml-zsh-config grub-bios haveged hdparm @@ -45,3 +46,4 @@ vpnc wireless_tools wpa_actiond zd1211-firmware +zsh diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 24f655f..09c3c94 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -14,6 +14,7 @@ efibootmgr elinks gnu-netcat gptfdisk +grml-zsh-config grub-bios grub-efi-x86_64 haveged @@ -46,3 +47,4 @@ vpnc wireless_tools wpa_actiond zd1211-firmware +zsh -- 1.7.11.3

10 15

[arch-releng] Removing GRUB from AIF
by Jeremiah Dodds 03 Aug '12

03 Aug '12

So I started poking around with the current state of AIF and archiso, and it looks like the very first thing that needs to be done to AIF is to remove its dependency on grub legacy, and update it for grub2 and/or syslinux, which shouldn't be *too* hard... I can't handle removing the dependency on the package itself, but you guys probably don't want me doing that anyhow at this point :P -- Jeremiah Dodds github: https://github.com/jdodds irc : exhortatory

3 5

[arch-releng] Helping with AIF
by Jeremiah Dodds 01 Aug '12

01 Aug '12

I'd really like to lend a hand with AIF, considering Dieter's recent resignation. I've been using Linux as my primary OS for more than a decade, and have been using Arch for a few years now, and love it. Tools like AIF are what I tend to get really into -- I love being able to automate things like installing a system or making it easy for someone to customize an installation. One of my (not yet live) pet projects is a web service that lets people generate their own install and live cds, the proof-of-concept I threw together is on top of Arch, using AIF -- I've done a bit of reading through it's codebase already, although I'm far from grokking it in full. Besides, I've been wanting to start giving back to Arch. I've gotten a lot of joy from this distro. Anyhow, if AIF is being entirely trashed, I'd still like to be involved in similar efforts. If not, it would be great if anyone had good info on what needs done that they'd be willing to share. Thanks for your time, and for everyones work on Arch, -- Jeremiah Dodds github: https://github.com/jdodds irc : exhortatory

3 8

[arch-releng] Reviving archiso releases?
by Pierre Schmitz 31 Jul '12

31 Jul '12

Hi, as I plan a new iso for next week, I was wondering if we should create tags for archiso so I can create an actual package to be put into the repos. This would simplify the building process and reduces some possible issues from e.g. an inconsistent archiso install. (e.g. if you just run make install old files wont get removed from the root-image directory. Imho the more we can automate and standardize here the better. I guess the easiest way would be to use a versioning scheme like in arch-install scripts (every tag increments the version by one) or a date based one (e.g. 20120728). We could just tag a new release a few days before the new iso gets created and update the package. So, what do you think about this? Greetings, Pierre -- Pierre Schmitz, https://pierre-schmitz.com

4 8

[arch-releng] [PATCH] archiso_pxe_http: curl should follow redirects
by Florian Pritz 30 Jul '12

30 Jul '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- This is actually untested, but since it's the only call to curl and my box downloaded the redirect page, I'm pretty sure it will work. archiso/hooks/archiso_pxe_http | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archiso/hooks/archiso_pxe_http b/archiso/hooks/archiso_pxe_http index ae56210..32e8ab0 100644 --- a/archiso/hooks/archiso_pxe_http +++ b/archiso/hooks/archiso_pxe_http @@ -19,7 +19,7 @@ _curl_get() { local _dst="${2}" msg ":: Downloading '${_url}'" - if ! curl -f -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then + if ! curl -L -f -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then echo "ERROR: Downloading '${_url}'" echo " Falling back to interactive prompt" echo " You can try to fix the problem manually, log out when you are finished" -- 1.7.11.3

2 1

[arch-releng] [RFC] gpg related commands fail if clock is off
by Florian Pritz 30 Jul '12

30 Jul '12

gpg won't import any keys if they have been created "in the future" so if you try to boot archiso on a system that has never been synced (new board), the clock will most likely be off by a few years and pacman-key during boot will (silently) fail to import the master keys. Later pacman (during pacstrap) will tell you that importing any key failed (still without giving you any good clue) and only when you run `pacman-key -r <some id>` it will tell you that the key has been created in the future and tells you to fix your clock. I propose the following changes: - Let pacman-key display errors instead of redirecting everything to /dev/null: `pacman-key --populate archlinux |& grep -v -e "<some regex that matches non-interesting message>" -e "..."` - change inittab so that agetty doesn't clean the first tty so users can see any errors output by pacman-key or others - check the system time against /usr/share/pacman/keyrings/archlinux.gpg and either warn the user or run `ntpd -qg` to sync the clock I haven't yet looked at the code/git/mailinglist so if any of those have already been brought up, fixed or rejected, sorry for the noise. -- Florian Pritz

1 0

[arch-releng] [PATCH] Copy default config files from /etc/skel to /root
by Pierre Schmitz 30 Jul '12

30 Jul '12

Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- configs/releng/build.sh | 1 + 1 Datei geändert, 1 Zeile hinzugefügt(+) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index f1b1693..b9109b0 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -149,6 +149,7 @@ make_customize_root_image() { sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist patch ${work_dir}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch sed -i 's/#$en_US\.UTF-8$/\1/' ${work_dir}/root-image/etc/locale.gen + cp -a ${work_dir}/root-image/etc/skel/.[^\.]* ${work_dir}/root-image/root/ mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -r 'locale-gen' \ run -- 1.7.11.3

2 2

[arch-releng] [PATCH] Adjust rc.conf for recent initscripts changes
by Pierre Schmitz 30 Jul '12

30 Jul '12

* We use a rc.conf file loser to the upstream default. * rc.conf settings such as LOCALE are no longer interpreted as Bash. We have to remove the "override from the boot prompt" feature for now. * Use the recommend config files to setup hostname, locale, timezone and console Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- We are going to loose some kernel prompt features here. We still should apply this for now as we do not make use of this feature atm and the iso is currently broken otherwise. In future we should avoid injecting code into rc.conf. README | 18 -------- configs/releng/build.sh | 1 + configs/releng/root-image/etc/hostname | 1 + configs/releng/root-image/etc/locale.conf | 1 + configs/releng/root-image/etc/rc.conf | 48 +++++++++------------- .../etc/rc.d/functions.d/prepare_locale_gen | 11 ----- configs/releng/root-image/etc/timezone | 1 + configs/releng/root-image/etc/vconsole.conf | 1 + 8 Dateien geändert, 24 Zeilen hinzugefügt(+), 58 Zeilen entfernt(-) create mode 100644 configs/releng/root-image/etc/hostname create mode 100644 configs/releng/root-image/etc/locale.conf delete mode 100644 configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen create mode 100644 configs/releng/root-image/etc/timezone create mode 100644 configs/releng/root-image/etc/vconsole.conf diff --git a/README b/README index 00ac59e..46350a3 100644 --- a/README +++ b/README @@ -145,24 +145,6 @@ INDEX -*** Boot parameters (only for configs/releng) - -** /etc/rc.conf - -By default these parameters are set by default to these values -if nothing is specified on command line. - -* locale= "en_US.UTF-8" -* daemon_locale= "no" -* hardwareclock= "UTC" -* timezone= "UTC" -* keymap= "us" -* consolefont= (unset) -* consolemap= (unset) -* usecolor= "yes" - - - *** Transfer ISO image to target medium (configs/releng) ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-<TYPE>-<ARCH>.iso diff --git a/configs/releng/build.sh b/configs/releng/build.sh index b9109b0..6e466c0 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -149,6 +149,7 @@ make_customize_root_image() { sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist patch ${work_dir}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch sed -i 's/#$en_US\.UTF-8$/\1/' ${work_dir}/root-image/etc/locale.gen + ln -s /usr/share/zoneinfo/UTC ${work_dir}/root-image/etc/localtime cp -a ${work_dir}/root-image/etc/skel/.[^\.]* ${work_dir}/root-image/root/ mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ -r 'locale-gen' \ diff --git a/configs/releng/root-image/etc/hostname b/configs/releng/root-image/etc/hostname new file mode 100644 index 0000000..2dbe21e --- /dev/null +++ b/configs/releng/root-image/etc/hostname @@ -0,0 +1 @@ +archiso diff --git a/configs/releng/root-image/etc/locale.conf b/configs/releng/root-image/etc/locale.conf new file mode 100644 index 0000000..01ec548 --- /dev/null +++ b/configs/releng/root-image/etc/locale.conf @@ -0,0 +1 @@ +LANG=en_US.UTF-8 diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf index d8dedec..f97ec88 100644 --- a/configs/releng/root-image/etc/rc.conf +++ b/configs/releng/root-image/etc/rc.conf @@ -1,33 +1,23 @@ -# -# /etc/rc.conf - Main Configuration for Arch Linux - . /etc/archiso/functions +# +# /etc/rc.conf - configuration file for initscripts +# +# Most of rc.conf has been replaced by various other configuration +# files. See archlinux(7) for details. +# +# For more details on rc.conf see rc.conf(5). +# -LOCALE_DEFAULT="en_US.UTF-8" -DAEMON_LOCALE_DEFAULT="no" -CLOCK_DEFAULT="UTC" -TIMEZONE_DEFAULT="UTC" -KEYMAP_DEFAULT="us" -CONSOLEFONT_DEFAULT= -CONSOLEMAP_DEFAULT= -USECOLOR_DEFAULT="yes" - -LOCALE="$(kernel_cmdline locale ${LOCALE_DEFAULT})" -DAEMON_LOCALE="$(kernel_cmdline daemon_locale ${DAEMON_LOCALE_DEFAULT})" -HARDWARECLOCK="$(kernel_cmdline clock ${CLOCK_DEFAULT})" -TIMEZONE="$(kernel_cmdline timezone ${TIMEZONE_DEFAULT})" -KEYMAP="$(kernel_cmdline keymap ${KEYMAP_DEFAULT})" -CONSOLEFONT="$(kernel_cmdline consolefont ${CONSOLEFONT_DEFAULT})" -CONSOLEMAP="$(kernel_cmdline consolemap ${CONSOLEMAP_DEFAULT})" -USECOLOR="$(kernel_cmdline usecolor ${USECOLOR_DEFAULT})" - -MODULES=() - -UDEV_TIMEOUT=30 -USEDMRAID="no" -USEBTRFS="no" -USELVM="no" +DAEMONS=(syslog-ng haveged pacman-init) -HOSTNAME="archiso" +# Storage +# +# USEDMRAID="no" +# USELVM="no" -DAEMONS=(hwclock syslog-ng haveged pacman-init) +# Network +# +# interface= +# address= +# netmask= +# gateway= 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 deleted file mode 100644 index 47ed79d..0000000 --- a/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen +++ /dev/null @@ -1,11 +0,0 @@ -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/timezone b/configs/releng/root-image/etc/timezone new file mode 100644 index 0000000..e2e7775 --- /dev/null +++ b/configs/releng/root-image/etc/timezone @@ -0,0 +1 @@ +UTC diff --git a/configs/releng/root-image/etc/vconsole.conf b/configs/releng/root-image/etc/vconsole.conf new file mode 100644 index 0000000..12b81a1 --- /dev/null +++ b/configs/releng/root-image/etc/vconsole.conf @@ -0,0 +1 @@ +KEYMAP=us -- 1.7.11.3

3 7

[arch-releng] [PATCH] Enable network by default
by Pierre Schmitz 29 Jul '12

29 Jul '12

* add the network daemon to rc.conf * configure dhcpd to background immediatly so we don't timeout if network is not up yet Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- This default should make life easier for most people as we can assume dhcp is available in most networks. We should document though that this can be disabled by "rc.d stop network" or better setup rc.conf and restart the network daemon. configs/releng/root-image/etc/conf.d/dhcpcd | 6 ++++++ configs/releng/root-image/etc/rc.conf | 2 +- 2 Dateien geändert, 7 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) create mode 100644 configs/releng/root-image/etc/conf.d/dhcpcd diff --git a/configs/releng/root-image/etc/conf.d/dhcpcd b/configs/releng/root-image/etc/conf.d/dhcpcd new file mode 100644 index 0000000..76b56ff --- /dev/null +++ b/configs/releng/root-image/etc/conf.d/dhcpcd @@ -0,0 +1,6 @@ +# +# Arguments to be passed to the DHCP client daemon +# + +DHCPCD_ARGS="-qb" + diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf index f97ec88..a2e6ebf 100644 --- a/configs/releng/root-image/etc/rc.conf +++ b/configs/releng/root-image/etc/rc.conf @@ -8,7 +8,7 @@ # For more details on rc.conf see rc.conf(5). # -DAEMONS=(syslog-ng haveged pacman-init) +DAEMONS=(syslog-ng network haveged pacman-init) # Storage # -- 1.7.11.3

2 1

[arch-releng] [PATCH] Add dist function to Makefile
by Pierre Schmitz 29 Jul '12

29 Jul '12

This dist function creates a tar archive of a tag. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- archiso/Makefile | 8 +++++++- 1 Datei geändert, 7 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/archiso/Makefile b/archiso/Makefile index 03f9a16..6a73d00 100644 --- a/archiso/Makefile +++ b/archiso/Makefile @@ -1,3 +1,5 @@ +V=1 + all: install: install-program install-hooks install-examples install-doc @@ -54,4 +56,8 @@ uninstall: rm -f $(DESTDIR)/usr/lib/initcpio/install/archiso_kms rm -rf $(DESTDIR)/usr/share/archiso/ -.PHONY: install install-program install-hooks install-examples install-doc uninstall +dist: + git archive --format=tar --prefix=archiso-$(V)/ v$(V) | gzip -9 > archiso-$(V).tar.gz + gpg --detach-sign --use-agent archiso-$(V).tar.gz + +.PHONY: install install-program install-hooks install-examples install-doc uninstall dist -- 1.7.11.3

2 1