summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/releng/build.sh11
-rw-r--r--configs/releng/mkinitcpio.conf2
-rw-r--r--configs/releng/packages.both6
-rw-r--r--configs/releng/packages.x86_642
-rw-r--r--configs/releng/pacman-key-4.0.3_unattended-keyring-init.patch32
-rw-r--r--configs/releng/pacman.conf14
-rwxr-xr-xconfigs/releng/root-image/etc/systemd/scripts/choose-mirror26
-rw-r--r--configs/releng/root-image/etc/systemd/system/choose-mirror.service10
-rw-r--r--configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf3
-rw-r--r--configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules1
-rwxr-xr-xconfigs/releng/root-image/root/customize_root_image.sh11
-rw-r--r--configs/releng/syslinux/parabolaiso_pxe32.cfg12
-rw-r--r--configs/releng/syslinux/parabolaiso_pxe64.cfg12
-rw-r--r--configs/releng/syslinux/parabolaiso_sys32.cfg4
-rw-r--r--configs/releng/syslinux/parabolaiso_sys64.cfg4
-rw-r--r--configs/releng/syslinux/parabolaiso_tail.cfg4
16 files changed, 80 insertions, 74 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 03bd844..e7ce4a4 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://parabolagnulinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
lynx -dump -nolist 'https://wiki.parabolagnulinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt
@@ -129,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/
@@ -160,7 +162,10 @@ make_efiboot() {
cp ${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img ${work_dir}/efiboot/EFI/parabolaiso/parabolaiso.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/mkinitcpio.conf b/configs/releng/mkinitcpio.conf
index f980765..1006d1d 100644
--- a/configs/releng/mkinitcpio.conf
+++ b/configs/releng/mkinitcpio.conf
@@ -1,2 +1,2 @@
-HOOKS="base udev timestamp memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard"
+HOOKS="base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard"
COMPRESSION="xz"
diff --git a/configs/releng/packages.both b/configs/releng/packages.both
index 87a9d5a..8d6c9ff 100644
--- a/configs/releng/packages.both
+++ b/configs/releng/packages.both
@@ -12,18 +12,19 @@ dnsutils
dosfstools
elinks
ethtool
+f2fs-tools
fsarchiver
gnu-netcat
+gpm
gptfdisk
grml-zsh-config
-grub-bios
+grub
haveged
hdparm
ipw2100-fw
ipw2200-fw
irssi
lftp
-lilo
linux-atm
mc
mtools
@@ -39,6 +40,7 @@ partclone
parted
partimage
pptpclient
+ppp
rfkill
rp-pppoe
rsync
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index aceb6cf..407ead2 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -1,3 +1,3 @@
-grub-efi-x86_64
gummiboot
+prebootloader
refind-efi
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 <pierre@archlinux.de>
-
-* 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 41e9634..800d572 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 Parabola GNU/Linux-libre
@@ -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
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..13c9f69
--- /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 parabolaiso_http_srv)
+[[ $mirror ]] || exit 0
+
+mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
+cat >/etc/pacman.d/mirrorlist << EOF
+#
+# Parabola GNU/Linux-libre repository mirrorlist
+# Generated by parabolaiso
+#
+
+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/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/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 50c5131..7c9a003 100755
--- a/configs/releng/root-image/root/customize_root_image.sh
+++ b/configs/releng/root-image/root/customize_root_image.sh
@@ -7,19 +7,14 @@ 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 parabola
+useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /usr/bin/zsh parabola
chmod 750 /etc/sudoers.d
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 choose-mirror.service
diff --git a/configs/releng/syslinux/parabolaiso_pxe32.cfg b/configs/releng/syslinux/parabolaiso_pxe32.cfg
index f61664e..60bc713 100644
--- a/configs/releng/syslinux/parabolaiso_pxe32.cfg
+++ b/configs/releng/syslinux/parabolaiso_pxe32.cfg
@@ -1,7 +1,7 @@
LABEL parabola32_nbd
TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD)
LINUX boot/i686/vmlinuz
@@ -11,8 +11,8 @@ IPAPPEND 3
LABEL parabola32_nfs
TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS)
LINUX boot/i686/vmlinuz
@@ -22,8 +22,8 @@ IPAPPEND 3
LABEL parabola32_http
TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP)
LINUX boot/i686/vmlinuz
diff --git a/configs/releng/syslinux/parabolaiso_pxe64.cfg b/configs/releng/syslinux/parabolaiso_pxe64.cfg
index db7a58a..34bf7d7 100644
--- a/configs/releng/syslinux/parabolaiso_pxe64.cfg
+++ b/configs/releng/syslinux/parabolaiso_pxe64.cfg
@@ -1,7 +1,7 @@
LABEL parabola64_nbd
TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD)
LINUX boot/x86_64/vmlinuz
@@ -11,8 +11,8 @@ IPAPPEND 3
LABEL parabola64_nfs
TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS)
LINUX boot/x86_64/vmlinuz
@@ -22,8 +22,8 @@ IPAPPEND 3
LABEL parabola64_http
TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP)
LINUX boot/x86_64/vmlinuz
diff --git a/configs/releng/syslinux/parabolaiso_sys32.cfg b/configs/releng/syslinux/parabolaiso_sys32.cfg
index 6aeeb69..4abdf7a 100644
--- a/configs/releng/syslinux/parabolaiso_sys32.cfg
+++ b/configs/releng/syslinux/parabolaiso_sys32.cfg
@@ -1,7 +1,7 @@
LABEL parabola32
TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium. It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium.
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686)
LINUX boot/i686/vmlinuz
diff --git a/configs/releng/syslinux/parabolaiso_sys64.cfg b/configs/releng/syslinux/parabolaiso_sys64.cfg
index 7c256bb..b154459 100644
--- a/configs/releng/syslinux/parabolaiso_sys64.cfg
+++ b/configs/releng/syslinux/parabolaiso_sys64.cfg
@@ -1,7 +1,7 @@
LABEL parabola64
TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium. It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium.
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (x86_64)
LINUX boot/x86_64/vmlinuz
diff --git a/configs/releng/syslinux/parabolaiso_tail.cfg b/configs/releng/syslinux/parabolaiso_tail.cfg
index a55548c..5d95b3b 100644
--- a/configs/releng/syslinux/parabolaiso_tail.cfg
+++ b/configs/releng/syslinux/parabolaiso_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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-03 23:13:50 +0000