From 745e9a4158fa22fc17d8845d4d443cac2dedac4e Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 30 Mar 2013 20:30:07 -0300 Subject: [archiso] Prepare release Signed-off-by: Gerardo Exequiel Pozzi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f17343f..33054a3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=6 +V=7 INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) -- cgit v1.2.2 From 86e1f5057256d29490f26a7c2b576ef4f508bf62 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 13 Apr 2013 15:58:37 +0200 Subject: [configs/releng] pacman 4.1 compatibility * Remove the unattended-keyring-init patch as this was applied by upstream with pacamn 4.1 * Update our pacman.conf following the new upstream default Signed-off-by: Pierre Schmitz Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 1 - .../pacman-key-4.0.3_unattended-keyring-init.patch | 32 ---------------------- configs/releng/pacman.conf | 14 ++++------ 3 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 560fda2..6e9e2f8 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -79,7 +79,6 @@ make_setup_mkinitcpio() { make_customize_root_image() { cp -af ${script_path}/root-image ${work_dir}/${arch} - patch ${work_dir}/${arch}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch curl -o ${work_dir}/${arch}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt diff --git a/configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch b/configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch deleted file mode 100644 index 0a5117f..0000000 --- a/configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Pierre Schmitz - -* pacman-key: Use lsign_keys function in --populate -* pacman-key: reduce verbosity of --populate - ---- pacman-key 2012-07-10 18:45:32.000000000 -0300 -+++ pacman-key 2012-07-18 16:38:18.264110004 -0300 -@@ -376,7 +376,7 @@ - # Add keys from requested keyrings - for keyring in "${KEYRINGIDS[@]}"; do - msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" -- "${GPG_PACMAN[@]}" --import "${KEYRING_IMPORT_DIR}/${keyring}.gpg" -+ "${GPG_PACMAN[@]}" --quiet --import "${KEYRING_IMPORT_DIR}/${keyring}.gpg" - done - - # Read the trusted key IDs to an array. Because this is an ownertrust -@@ -403,12 +403,13 @@ - msg "$(gettext "Locally signing trusted keys in keyring...")" - for key_id in "${!trusted_ids[@]}"; do - msg2 "$(gettext "Locally signing key %s...")" "${key_id}" -- "${GPG_PACMAN[@]}" --quiet --lsign-key "${key_id}" -+ KEYIDS=("${key_id}") -+ lsign_keys - done - msg "$(gettext "Importing owner trust values...")" - for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then -- "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" -+ "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" 2>/dev/null - fi - done - fi diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index 821f9a5..45fe03d 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -15,11 +15,10 @@ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled +#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -31,7 +30,7 @@ Architecture = auto # Misc options #UseSyslog -#UseDelta +#Color #TotalDownload # We cannot check disk space from within a chroot environment #CheckSpace @@ -39,7 +38,9 @@ Architecture = auto # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. -#SigLevel = Optional TrustedOnly +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Arch Linux @@ -69,23 +70,18 @@ Architecture = auto # after the header, and they will be used before the default mirrors. #[testing] -#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [core] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [extra] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist #[community-testing] -#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [community] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for -- cgit v1.2.2 From 1d8bb94dc601dcbcf9e7328ee4675000630d9e89 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Apr 2013 16:05:46 -0300 Subject: [archiso] Prepare release Signed-off-by: Gerardo Exequiel Pozzi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 33054a3..33bd97f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=7 +V=8 INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) -- cgit v1.2.2 From e266e32a861b565e2dd03e046d037b26f1ed15b5 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Fri, 19 Apr 2013 00:45:38 -0300 Subject: [archiso] patch not needed anymore Signed-off-by: Gerardo Exequiel Pozzi --- docs/README.build | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/README.build b/docs/README.build index 2037f89..3286a1a 100644 --- a/docs/README.build +++ b/docs/README.build @@ -19,7 +19,6 @@ INDEX ** For configs/releng build.sh needs theses packages (build host): + dosfstools for mkfs.vfat - + patch for patch + lynx for fetching the latest installation guide ** For these hooks needs these packages (on target root-image) -- cgit v1.2.2 From 47f39ec5d3b93f95bcf67ef3db18893cb06b99e8 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 12 May 2013 01:22:57 -0300 Subject: [archiso] /usr/sbin -> /usr/bin Signed-off-by: Gerardo Exequiel Pozzi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 33bd97f..e1ced09 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ all: install: install-program install-initcpio install-examples install-doc install-program: - install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/sbin/mkarchiso + install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/bin/mkarchiso install-initcpio: install -d $(SCRIPT_DIR) $(HOOKS_DIR) $(INSTALL_DIR) -- cgit v1.2.2 From 8fd197a420558a6b9b55f2e61a7cc2008a0200e6 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 12 May 2013 01:59:01 -0300 Subject: [configs/releng] Add gpm and f2fs-tools "gpm" requested at arch-releng and "f2fs-tools" at FS#35101 Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.both | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/releng/packages.both b/configs/releng/packages.both index 87a9d5a..eb1f375 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -12,8 +12,10 @@ dnsutils dosfstools elinks ethtool +f2fs-tools fsarchiver gnu-netcat +gpm gptfdisk grml-zsh-config grub-bios -- cgit v1.2.2 From 718089f7cb499d2a9935de71dcbc8b3e53c6fb2a Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 26 May 2013 18:56:25 -0300 Subject: [configs/releng] Use drop-in feature of systemd for getty autologin Signed-off-by: Gerardo Exequiel Pozzi --- .../etc/systemd/system/getty@tty1.service.d/autologin.conf | 3 +++ configs/releng/root-image/root/customize_root_image.sh | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf diff --git a/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf new file mode 100644 index 0000000..d1d8474 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux diff --git a/configs/releng/root-image/root/customize_root_image.sh b/configs/releng/root-image/root/customize_root_image.sh index cc47845..ba106c8 100755 --- a/configs/releng/root-image/root/customize_root_image.sh +++ b/configs/releng/root-image/root/customize_root_image.sh @@ -17,9 +17,4 @@ chmod 440 /etc/sudoers.d/g_wheel sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -sed 's#\(^ExecStart=-/sbin/agetty\)#\1 --autologin root#; - s#\(^Alias=getty.target.wants/\).\+#\1autologin@tty1.service#' \ - /usr/lib/systemd/system/getty@.service > /etc/systemd/system/autologin@.service - -systemctl disable getty@tty1.service -systemctl enable multi-user.target pacman-init.service autologin@.service dhcpcd.service +systemctl enable multi-user.target pacman-init.service dhcpcd.service -- cgit v1.2.2 From 7d14796716939fbabb9daba6b6f5294016d63cd4 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Tue, 28 May 2013 11:51:30 -0300 Subject: [configs/releng] Use a udev rule instead of dhcpcd.service https://mailman.archlinux.org/pipermail/arch-releng/2013-May/003163.html Thanks Dave & Thomas Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules | 1 + configs/releng/root-image/root/customize_root_image.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules diff --git a/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules b/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules new file mode 100644 index 0000000..970da69 --- /dev/null +++ b/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="net", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service" diff --git a/configs/releng/root-image/root/customize_root_image.sh b/configs/releng/root-image/root/customize_root_image.sh index ba106c8..2fccf47 100755 --- a/configs/releng/root-image/root/customize_root_image.sh +++ b/configs/releng/root-image/root/customize_root_image.sh @@ -17,4 +17,4 @@ chmod 440 /etc/sudoers.d/g_wheel sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -systemctl enable multi-user.target pacman-init.service dhcpcd.service +systemctl enable multi-user.target pacman-init.service -- cgit v1.2.2 From 34c38fb78cdf89062a3aeadfb43e6ebafad23771 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 30 May 2013 12:11:09 -0300 Subject: prepare release Signed-off-by: Gerardo Exequiel Pozzi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1ced09..15e8143 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=8 +V=9 INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) -- cgit v1.2.2 From b065dcaf9b15ba2f7ad0a9ab1a279fd56d536a7f Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 30 May 2013 19:35:58 -0300 Subject: [configs/releng] Remove lilo, not in repos anymore Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.both | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/releng/packages.both b/configs/releng/packages.both index eb1f375..9c7610a 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -25,7 +25,6 @@ ipw2100-fw ipw2200-fw irssi lftp -lilo linux-atm mc mtools -- cgit v1.2.2 From 2e9e57b5bd11d8b8a4840a708ee3dbd4791c2a62 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 30 May 2013 19:38:41 -0300 Subject: [configs/releng] Adjust TEXT HELP width of syslinux menus. Keep < 80 chars Fixes FS#35533 Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/syslinux/archiso_pxe32.cfg | 12 ++++++------ configs/releng/syslinux/archiso_pxe64.cfg | 12 ++++++------ configs/releng/syslinux/archiso_sys32.cfg | 4 ++-- configs/releng/syslinux/archiso_sys64.cfg | 4 ++-- configs/releng/syslinux/archiso_tail.cfg | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configs/releng/syslinux/archiso_pxe32.cfg b/configs/releng/syslinux/archiso_pxe32.cfg index 4bdeefa..383094a 100644 --- a/configs/releng/syslinux/archiso_pxe32.cfg +++ b/configs/releng/syslinux/archiso_pxe32.cfg @@ -1,7 +1,7 @@ LABEL arch32_nbd TEXT HELP -Boot the Arch Linux (i686) live medium (Using NBD). It allows you to install Arch Linux or -perform system maintenance. +Boot the Arch Linux (i686) live medium (Using NBD). +It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) (NBD) LINUX boot/i686/vmlinuz @@ -11,8 +11,8 @@ IPAPPEND 3 LABEL arch32_nfs TEXT HELP -Boot the Arch Linux (i686) live medium (Using NFS). It allows you to install Arch Linux or -perform system maintenance. +Boot the Arch Linux (i686) live medium (Using NFS). +It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) (NFS) LINUX boot/i686/vmlinuz @@ -22,8 +22,8 @@ IPAPPEND 3 LABEL arch32_http TEXT HELP -Boot the Arch Linux (i686) live medium (Using HTTP). It allows you to install Arch Linux or -perform system maintenance. +Boot the Arch Linux (i686) live medium (Using HTTP). +It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) (HTTP) LINUX boot/i686/vmlinuz diff --git a/configs/releng/syslinux/archiso_pxe64.cfg b/configs/releng/syslinux/archiso_pxe64.cfg index 1676236..6227393 100644 --- a/configs/releng/syslinux/archiso_pxe64.cfg +++ b/configs/releng/syslinux/archiso_pxe64.cfg @@ -1,7 +1,7 @@ LABEL arch64_nbd TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using NBD). It allows you to install Arch Linux or -perform system maintenance. +Boot the Arch Linux (x86_64) live medium (Using NBD). +It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) (NBD) LINUX boot/x86_64/vmlinuz @@ -11,8 +11,8 @@ IPAPPEND 3 LABEL arch64_nfs TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using NFS). It allows you to install Arch Linux or -perform system maintenance. +Boot the Arch Linux (x86_64) live medium (Using NFS). +It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) (NFS) LINUX boot/x86_64/vmlinuz @@ -22,8 +22,8 @@ IPAPPEND 3 LABEL arch64_http TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using HTTP). It allows you to install Arch Linux or -perform system maintenance. +Boot the Arch Linux (x86_64) live medium (Using HTTP). +It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz diff --git a/configs/releng/syslinux/archiso_sys32.cfg b/configs/releng/syslinux/archiso_sys32.cfg index 261579e..43f839e 100644 --- a/configs/releng/syslinux/archiso_sys32.cfg +++ b/configs/releng/syslinux/archiso_sys32.cfg @@ -1,7 +1,7 @@ LABEL arch32 TEXT HELP -Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or -perform system maintenance. +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/vmlinuz diff --git a/configs/releng/syslinux/archiso_sys64.cfg b/configs/releng/syslinux/archiso_sys64.cfg index eb89813..9d6c4de 100644 --- a/configs/releng/syslinux/archiso_sys64.cfg +++ b/configs/releng/syslinux/archiso_sys64.cfg @@ -1,7 +1,7 @@ LABEL arch64 TEXT HELP -Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or -perform system maintenance. +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/vmlinuz diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg index a55548c..5d95b3b 100644 --- a/configs/releng/syslinux/archiso_tail.cfg +++ b/configs/releng/syslinux/archiso_tail.cfg @@ -1,7 +1,7 @@ LABEL existing TEXT HELP -Boot an existing operating system. Press TAB to edit the disk and partition -number to boot. +Boot an existing operating system. +Press TAB to edit the disk and partition number to boot. ENDTEXT MENU LABEL Boot existing OS COM32 boot/syslinux/chain.c32 -- cgit v1.2.2 From 6634f0a7814e121e25a52eca2f70bd09c1adc122 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 30 May 2013 20:22:08 -0300 Subject: prepare release Signed-off-by: Gerardo Exequiel Pozzi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 15e8143..fc89288 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=9 +V=10 INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) -- cgit v1.2.2 From 5d75049c119983aad719d03e92557f10aef5d199 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Tue, 4 Jun 2013 21:33:52 -0300 Subject: [configs/releng] Update zsh path to match /etc/shells Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/root-image/root/customize_root_image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/releng/root-image/root/customize_root_image.sh b/configs/releng/root-image/root/customize_root_image.sh index 2fccf47..97e2874 100755 --- a/configs/releng/root-image/root/customize_root_image.sh +++ b/configs/releng/root-image/root/customize_root_image.sh @@ -7,10 +7,10 @@ locale-gen ln -sf /usr/share/zoneinfo/UTC /etc/localtime -usermod -s /bin/zsh root +usermod -s /usr/bin/zsh root cp -aT /etc/skel/ /root/ -useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /bin/zsh arch +useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /usr/bin/zsh arch chmod 750 /etc/sudoers.d chmod 440 /etc/sudoers.d/g_wheel -- cgit v1.2.2 From 0696e888012f89da0b67d6999f14dfe422497914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Sun, 16 Jun 2013 11:27:58 +0200 Subject: releng: Allow specifying a mirror on the kernel command line. The new mirror= option takes a mirror URL and creates a new mirrorlist. When setting mirror=auto, the mirror is taken from archiso_http_srv in order to keep using the mirror selected in the netboot menu. --- .../root-image/etc/systemd/scripts/choose-mirror | 26 ++++++++++++++++++++++ .../etc/systemd/system/choose-mirror.service | 10 +++++++++ .../releng/root-image/root/customize_root_image.sh | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100755 configs/releng/root-image/etc/systemd/scripts/choose-mirror create mode 100644 configs/releng/root-image/etc/systemd/system/choose-mirror.service diff --git a/configs/releng/root-image/etc/systemd/scripts/choose-mirror b/configs/releng/root-image/etc/systemd/scripts/choose-mirror new file mode 100755 index 0000000..0ae0806 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/scripts/choose-mirror @@ -0,0 +1,26 @@ +#!/bin/bash + +get_cmdline() { + local param + for param in $(< /proc/cmdline); do + case "${param}" in + $1=*) echo "${param##*=}"; + return 0 + ;; + esac + done +} + +mirror=$(get_cmdline mirror) +[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv) +[[ $mirror ]] || exit 0 + +mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig +cat >/etc/pacman.d/mirrorlist << EOF +# +# Arch Linux repository mirrorlist +# Generated by archiso +# + +Server = ${mirror%%/}/\$repo/os/\$arch +EOF diff --git a/configs/releng/root-image/etc/systemd/system/choose-mirror.service b/configs/releng/root-image/etc/systemd/system/choose-mirror.service new file mode 100644 index 0000000..1e4d771 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/system/choose-mirror.service @@ -0,0 +1,10 @@ +[Unit] +Description=Choose mirror from the kernel command line +ConditionKernelCommandLine=mirror + +[Service] +Type=oneshot +ExecStart=/etc/systemd/scripts/choose-mirror + +[Install] +WantedBy=multi-user.target diff --git a/configs/releng/root-image/root/customize_root_image.sh b/configs/releng/root-image/root/customize_root_image.sh index 97e2874..a60f308 100755 --- a/configs/releng/root-image/root/customize_root_image.sh +++ b/configs/releng/root-image/root/customize_root_image.sh @@ -17,4 +17,4 @@ chmod 440 /etc/sudoers.d/g_wheel sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -systemctl enable multi-user.target pacman-init.service +systemctl enable multi-user.target pacman-init.service choose-mirror.service -- cgit v1.2.2 From 3e4740484edd23d6c1db42ab24c3555e8ab6b03a Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 19 Jun 2013 20:28:33 -0300 Subject: [configs/releng] Add SecureBoot support via prebootloader Tested only under QEMU using OVMF SecureBoot enabled firmware plus lockdown-ms. Both loader.efi (gummiboot) and vmlinuz.efi should be hashed before boot in secure mode. Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 10 ++++++++-- configs/releng/packages.x86_64 | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 6e9e2f8..bec9a42 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -128,7 +128,10 @@ make_isolinux() { # Prepare /EFI make_efi() { mkdir -p ${work_dir}/iso/EFI/boot - cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/ + + cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/loader.efi mkdir -p ${work_dir}/iso/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ @@ -159,7 +162,10 @@ make_efiboot() { cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img mkdir -p ${work_dir}/efiboot/EFI/boot - cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi + cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/ + + cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi mkdir -p ${work_dir}/efiboot/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index aceb6cf..3b75077 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,3 +1,4 @@ grub-efi-x86_64 gummiboot +prebootloader refind-efi -- cgit v1.2.2 From f19f6173c8650ebc43dc166ee2a2f3f92a753afe Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 20 Jun 2013 18:30:00 -0300 Subject: [archiso] Add support to isohybrid-gpt for EFI boot Tested and works fine under qemu using seabios and ovmf $ qemu-system-x86_64 -enable-kvm -drive file=~/archlinux-2013.06.20-dual.iso $ qemu-system-x86_64 -enable-kvm -drive file=~/archlinux-2013.06.20-dual.iso,media=cdrom $ qemu-system-x86_64 -enable-kvm -bios ~/arch/OVMF/bios.bin -drive file=~/archlinux-2013.06.20-dual.iso $ qemu-system-x86_64 -enable-kvm -bios ~/arch/OVMF/bios.bin -drive file=~/archlinux-2013.06.20-dual.iso,media=cdrom Signed-off-by: Gerardo Exequiel Pozzi --- archiso/mkarchiso | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index fa32b62..8f9ed42 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -414,7 +414,10 @@ command_iso () { # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image. if [[ -f "${work_dir}/iso/EFI/archiso/efiboot.img" ]]; then - _iso_efi_boot_args="--efi-boot EFI/archiso/efiboot.img" + _iso_efi_boot_args="-eltorito-alt-boot + -e EFI/archiso/efiboot.img + -no-emul-boot + -isohybrid-gpt-basdat" fi _show_config iso @@ -436,8 +439,8 @@ command_iso () { -eltorito-boot isolinux/isolinux.bin \ -eltorito-catalog isolinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - ${_iso_efi_boot_args} \ -isohybrid-mbr ${work_dir}/iso/isolinux/isohdpfx.bin \ + ${_iso_efi_boot_args} \ -output "${out_dir}/${img_name}" \ "${work_dir}/iso/" _msg_info "Done! | $(ls -sh ${out_dir}/${img_name})" -- cgit v1.2.2 From acd4eac21ca125e7f2de37afed22a15b6803994f Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 23 Jun 2013 12:19:30 -0300 Subject: [configs/releng] Update package list for grub Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/packages.both | 2 +- configs/releng/packages.x86_64 | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/releng/packages.both b/configs/releng/packages.both index 9c7610a..105f01e 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -18,7 +18,7 @@ gnu-netcat gpm gptfdisk grml-zsh-config -grub-bios +grub haveged hdparm ipw2100-fw diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 3b75077..407ead2 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,4 +1,3 @@ -grub-efi-x86_64 gummiboot prebootloader refind-efi -- cgit v1.2.2 From d01e0548ab6cca0e2a68bf8bd331567cd79f9a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Sun, 9 Jun 2013 14:59:16 +0200 Subject: configs/releng: ppp 2.4.5-7 has been removed from the base group, add it to packages.both --- configs/releng/packages.both | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/releng/packages.both b/configs/releng/packages.both index 105f01e..8d6c9ff 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -40,6 +40,7 @@ partclone parted partimage pptpclient +ppp rfkill rp-pppoe rsync -- cgit v1.2.2 From e6cae1d3e8ee8db15de9f0f40f8f38f2d464402e Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Fri, 28 Jun 2013 12:39:52 -0300 Subject: [archiso] Document mirror= bootparam Signed-off-by: Gerardo Exequiel Pozzi --- docs/README.bootparams | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/README.bootparams b/docs/README.bootparams index 13e1ead..8063bd1 100644 --- a/docs/README.bootparams +++ b/docs/README.bootparams @@ -9,6 +9,8 @@ INDEX * hooks/archiso_pxe_nfs * hooks/archiso_loop_mnt +* Boot parameters (configs/releng) + * scripts/choose-mirror *** Boot parameters (initramfs stage) @@ -125,3 +127,15 @@ INDEX Default: (unset) or "/dev/disk/by-label/${img_label}" * img_loop= Full path where archiso-image.iso is located on ${img_dev} Default: (unset) + + + +*** Boot parameters (configs/releng) + +** scripts/choose-mirror + +* mirror= Takes a mirror URL and creates a new mirrorlist. + When setting mirror=auto, the mirror is taken from + archiso_http_srv= in order to keep using the mirror + selected in the netboot menu. + Default: (unset) -- cgit v1.2.2 From ce9c853292e0d37e3931634f43ce697ccd33ad11 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Fri, 28 Jun 2013 12:49:46 -0300 Subject: [archiso] Document isohybrid-gpt boot method Signed-off-by: Gerardo Exequiel Pozzi --- docs/README.knownissues | 11 ----------- docs/README.transfer | 13 ++++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/README.knownissues b/docs/README.knownissues index 2f9cf70..3a94764 100644 --- a/docs/README.knownissues +++ b/docs/README.knownissues @@ -9,15 +9,4 @@ (A.K.A deinitramfs), build at initramfs by [archiso_shutdown] initcpio hook. Proper shutdown is mostly important when persistent is used. -** (2) ISOHYBRID-MBR does boot on some hardware: - Some firmwares (BIOS) gets confused about using this hack - (first partition start at offset 0 -> MBR "infinite recursion"). - Solutions: - (a) Do not use this method, instead copy files manually and - setup the bootloader [PC-BIOS (MBR)] (See README.transfer). - (b) Change offset of the partition on the ISO or on the target medium - (if ISO is already dumped): - # isohybrid.pl -offset 1 - OR - # isohybrid.pl -offset 1 diff --git a/docs/README.transfer b/docs/README.transfer index d3ec720..c2883ad 100644 --- a/docs/README.transfer +++ b/docs/README.transfer @@ -7,6 +7,7 @@ INDEX * PC-BIOS (MBR) * PC-BIOS (ISOHYBRID-MBR) * PC-EFI (GPT) [x86_64 only] + * PC-EFI (ISOHYBRID-GPT) [x86_64 only] @@ -95,7 +96,7 @@ Note: COW is not supported on NTFS. Note: This method is the most easily, quick and dirty, but is the most limited if you want to use your target medium for other purposes. - See README.knownissues (2) if using this method does not boot. + If using this does not work, use PC-BIOS (MBR) method instead. 1) Dump ISO file to target medium. # dd if= of= @@ -120,3 +121,13 @@ Note: Using here a GPT partition mode as example, but MBR should also works 5) Unmount target filesystem. # umount + + +* PC-EFI (ISOHYBRID-GPT) [x86_64 only] + +Note: This method is the most easily, quick and dirty, but is the most limited + if you want to use your target medium for other purposes. + If using this does not work, use PC-EFI (GPT) method instead. + +1) Dump ISO file to target medium. +# dd if= of= -- cgit v1.2.2 From ab97a2161b71258efa2c17a2ac339224b5dac80e Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Fri, 28 Jun 2013 12:54:00 -0300 Subject: [archiso] README.build update Signed-off-by: Gerardo Exequiel Pozzi --- docs/README.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/README.build b/docs/README.build index 3286a1a..80d4b2c 100644 --- a/docs/README.build +++ b/docs/README.build @@ -76,9 +76,7 @@ It consists of some fields which define the behaviour of images. The /isolinux directory holds files needed for the ISOLINUX boot loader module of SYSLINUX. ISOLINUX can not find config files on -/arch/boot/syslinux, like other boot loaders modules (EXTLINUX, SYSLINUX, etc). -When make your custom boot-pendrive, you need to copy /arch directory to it. -/isolinux/isolinux.cfg just holds /arch/boot/syslinux/syslinux.cfg +/arch/boot/syslinux, like other boot loaders modules (SYSLINUX, PXELINUX). @@ -101,7 +99,7 @@ used to build official images with much more things. *** Building official Arch Linux live media. (configs/releng) * Install needed packages. - # pacman -S git make squashfs-tools libisoburn dosfstools lynx patch --needed + # pacman -S git make squashfs-tools libisoburn dosfstools lynx --needed * Install archiso. # git clone git://projects.archlinux.org/archiso.git -- cgit v1.2.2 From c7925edadf412018ca989a678dba40b1d2f27f59 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 29 Jun 2013 16:49:52 -0300 Subject: prepare release Signed-off-by: Gerardo Exequiel Pozzi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fc89288..274d8f8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=10 +V=11 INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) -- cgit v1.2.2 From 491b627eb4b6af909ba8e19751378672930328eb Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Tue, 23 Jul 2013 11:46:51 -0300 Subject: [configs/releng] Unlist timestamp initcpio hook Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/mkinitcpio.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index f676106..2f46da4 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS="base udev timestamp memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard" +HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard" COMPRESSION="xz" -- cgit v1.2.2