summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-08-01 17:48:54 -0400
committerDavid P <megver83@parabola.nu>2020-08-01 17:48:54 -0400
commit639655512cca739816fcee7ad911fd95a5dd8815 (patch)
tree384520dc4091a793ad597e820c2bdc4de3460573
parentd74b3dd5dada3e4c976a5c3c191c4b75aceca1b9 (diff)
sync lxde-openrc with releng-openrc
Signed-off-by: David P <megver83@parabola.nu>
-rwxr-xr-xconfigs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector5
-rw-r--r--configs/lxde-openrc/airootfs/etc/conf.d/agetty.tty13
-rw-r--r--configs/lxde-openrc/airootfs/etc/conf.d/hostname3
-rw-r--r--configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf3
-rwxr-xr-xconfigs/lxde-openrc/airootfs/etc/local.d/pacman-init.start3
-rw-r--r--configs/lxde-openrc/airootfs/etc/locale.conf3
-rw-r--r--configs/lxde-openrc/airootfs/etc/mkinitcpio.conf69
-rw-r--r--configs/lxde-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset11
-rw-r--r--configs/lxde-openrc/airootfs/etc/motd20
-rw-r--r--configs/lxde-openrc/airootfs/etc/pam.d/su6
-rw-r--r--configs/lxde-openrc/airootfs/etc/passwd1
l---------configs/lxde-openrc/airootfs/etc/runlevels/default/NetworkManager1
-rw-r--r--configs/lxde-openrc/airootfs/etc/shadow1
-rw-r--r--configs/lxde-openrc/airootfs/etc/ssh/sshd_config116
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/.automated_script.sh4
-rw-r--r--configs/lxde-openrc/airootfs/root/.zlogin3
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/customize_airootfs.sh17
-rw-r--r--configs/lxde-openrc/airootfs/root/install.txt2
-rwxr-xr-xconfigs/lxde-openrc/airootfs/usr/local/bin/Installation_guide5
-rwxr-xr-xconfigs/lxde-openrc/build.sh141
-rw-r--r--configs/lxde-openrc/mkinitcpio.conf3
-rw-r--r--configs/lxde-openrc/packages.both28
-rw-r--r--configs/lxde-openrc/packages.x86_642
-rw-r--r--configs/lxde-openrc/pacman.conf5
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso.cfg3
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_head.cfg5
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg9
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg9
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg3
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg3
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg3
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg8
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_sys64.cfg8
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg3
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg3
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg3
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_tail.cfg11
-rw-r--r--configs/lxde-openrc/syslinux/syslinux.cfg3
38 files changed, 394 insertions, 135 deletions
diff --git a/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector b/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
index 07dcc16..a186bbf 100755
--- a/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
+++ b/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
@@ -1,4 +1,7 @@
#!/bin/bash
-if [ $2 = up ]; then
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+if [ "$2" = up ]; then
/usr/bin/reflector --protocol https --age 1 --sort rate --save /etc/pacman.d/mirrorlist
fi
diff --git a/configs/lxde-openrc/airootfs/etc/conf.d/agetty.tty1 b/configs/lxde-openrc/airootfs/etc/conf.d/agetty.tty1
index 997909c..c2b62f5 100644
--- a/configs/lxde-openrc/airootfs/etc/conf.d/agetty.tty1
+++ b/configs/lxde-openrc/airootfs/etc/conf.d/agetty.tty1
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
baud="38400"
term_type="linux"
agetty_options="--autologin root --noclear"
diff --git a/configs/lxde-openrc/airootfs/etc/conf.d/hostname b/configs/lxde-openrc/airootfs/etc/conf.d/hostname
index 5a912cd..6d381fc 100644
--- a/configs/lxde-openrc/airootfs/etc/conf.d/hostname
+++ b/configs/lxde-openrc/airootfs/etc/conf.d/hostname
@@ -1 +1,4 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
hostname="parabolaiso"
diff --git a/configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf b/configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf
index f3ecb39..c6b17a4 100644
--- a/configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf
+++ b/configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
[Login]
HandleSuspendKey=ignore
HandleHibernateKey=ignore
diff --git a/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start b/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start
index 5ab34f7..b57d737 100755
--- a/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start
+++ b/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start
@@ -1,4 +1,7 @@
#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
if ! [ -d /etc/pacman.d/gnupg ]; then
pacman-key --init
pacman-key --populate archlinux archlinux32 parabola
diff --git a/configs/lxde-openrc/airootfs/etc/locale.conf b/configs/lxde-openrc/airootfs/etc/locale.conf
index 01ec548..9bf7aef 100644
--- a/configs/lxde-openrc/airootfs/etc/locale.conf
+++ b/configs/lxde-openrc/airootfs/etc/locale.conf
@@ -1 +1,4 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
LANG=en_US.UTF-8
diff --git a/configs/lxde-openrc/airootfs/etc/mkinitcpio.conf b/configs/lxde-openrc/airootfs/etc/mkinitcpio.conf
new file mode 100644
index 0000000..61ae21d
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/mkinitcpio.conf
@@ -0,0 +1,69 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run. Advanced users may wish to specify all system modules
+# in this array. For instance:
+# MODULES=(piix ide_disk reiserfs)
+MODULES=(loop)
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image. This is run last, so it may be used to
+# override the actual binaries included by a given hook
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=()
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way. This is useful for config files.
+FILES=()
+
+# HOOKS
+# This is the most important setting in this file. The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+## This setup specifies all modules in the MODULES setting above.
+## No raid, lvm2, or encrypted root is needed.
+# HOOKS=(base)
+#
+## This setup will autodetect all modules for your system and should
+## work as a sane default
+# HOOKS=(base udev autodetect block filesystems)
+#
+## This setup will generate a 'full' image which supports most systems.
+## No autodetection is done.
+# HOOKS=(base udev block filesystems)
+#
+## This setup assembles a pata mdadm array with an encrypted root FS.
+## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+# HOOKS=(base udev block mdadm encrypt filesystems)
+#
+## This setup loads an lvm2 volume group on a usb device.
+# HOOKS=(base udev block lvm2 filesystems)
+#
+## NOTE: If you have /usr on a separate partition, you MUST include the
+# usr, fsck and shutdown hooks.
+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 filesystems keyboard)
+
+# COMPRESSION
+# Use this to compress the initramfs image. By default, gzip compression
+# is used. Use 'cat' to create an uncompressed image.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+#COMPRESSION="lzma"
+COMPRESSION="xz"
+#COMPRESSION="lzop"
+#COMPRESSION="lz4"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=()
diff --git a/configs/lxde-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset b/configs/lxde-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset
new file mode 100644
index 0000000..782d1cd
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/mkinitcpio.d/linux-libre.preset
@@ -0,0 +1,11 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# mkinitcpio preset file for the 'linux-libre' package on parabolaiso
+
+PRESETS=('parabolaiso')
+
+ALL_kver='/boot/vmlinuz-linux-libre'
+ALL_config='/etc/mkinitcpio.conf'
+
+parabolaiso_image="/boot/parabolaiso.img"
diff --git a/configs/lxde-openrc/airootfs/etc/motd b/configs/lxde-openrc/airootfs/etc/motd
index 6742f6f..4c7a45d 100644
--- a/configs/lxde-openrc/airootfs/etc/motd
+++ b/configs/lxde-openrc/airootfs/etc/motd
@@ -1,17 +1,9 @@
+To install Parabola GNU/Linux-libre follow the installation guide:
+https://wiki.parabola.nu/Installation_Guide
-===============================================================================
+For Wi-Fi, authenticate to the wireless network using the iwctl utility.
+Ethernet and Wi-Fi connections using DHCP should work automatically.
- Parabola GNU/Linux-libre live media _DATE_
+After connecting to the internet, the installation guide can be accessed
+via the convenience script Installation_guide.
- To install Parabola, the system must be connected to the internet.
- For instructions, enter this command:
- less install.txt
-
- Press the function keys while holding Alt to switch virtual terminals.
- This allows entering commands without closing less.
-
- For installation itself, enter this command:
- ./install.sh
-
-===============================================================================
-
diff --git a/configs/lxde-openrc/airootfs/etc/pam.d/su b/configs/lxde-openrc/airootfs/etc/pam.d/su
deleted file mode 100644
index a291042..0000000
--- a/configs/lxde-openrc/airootfs/etc/pam.d/su
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth sufficient pam_wheel.so trust use_uid
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/configs/lxde-openrc/airootfs/etc/passwd b/configs/lxde-openrc/airootfs/etc/passwd
new file mode 100644
index 0000000..2807d5d
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/passwd
@@ -0,0 +1 @@
+root:x:0:0:root:/root:/usr/bin/zsh
diff --git a/configs/lxde-openrc/airootfs/etc/runlevels/default/NetworkManager b/configs/lxde-openrc/airootfs/etc/runlevels/default/NetworkManager
new file mode 120000
index 0000000..fc68d44
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/runlevels/default/NetworkManager
@@ -0,0 +1 @@
+/etc/init.d/NetworkManager \ No newline at end of file
diff --git a/configs/lxde-openrc/airootfs/etc/shadow b/configs/lxde-openrc/airootfs/etc/shadow
new file mode 100644
index 0000000..7edfd69
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/shadow
@@ -0,0 +1 @@
+root::14871::::::
diff --git a/configs/lxde-openrc/airootfs/etc/ssh/sshd_config b/configs/lxde-openrc/airootfs/etc/ssh/sshd_config
new file mode 100644
index 0000000..8ef1758
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/ssh/sshd_config
@@ -0,0 +1,116 @@
+# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $
+
+# This is the sshd server system-wide configuration file. See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented. Uncommented options override the
+# default value.
+
+#Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+#HostKey /etc/ssh/ssh_host_ed25519_key
+
+# Ciphers and keying
+#RekeyLimit default none
+
+# Logging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+#PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile .ssh/authorized_keys
+
+#AuthorizedPrincipalsFile none
+
+#AuthorizedKeysCommand none
+#AuthorizedKeysCommandUser nobody
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+#PasswordAuthentication yes
+#PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+ChallengeResponseAuthentication no
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication. Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+UsePAM yes
+
+#AllowAgentForwarding yes
+#AllowTcpForwarding yes
+#GatewayPorts no
+#X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PermitTTY yes
+PrintMotd no # pam does that
+#PrintLastLog yes
+#TCPKeepAlive yes
+#PermitUserEnvironment no
+#Compression delayed
+#ClientAliveInterval 0
+#ClientAliveCountMax 3
+#UseDNS no
+#PidFile /run/sshd.pid
+#MaxStartups 10:30:100
+#PermitTunnel no
+#ChrootDirectory none
+#VersionAddendum none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem sftp /usr/lib/ssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+# X11Forwarding no
+# AllowTcpForwarding no
+# PermitTTY no
+# ForceCommand cvs server
diff --git a/configs/lxde-openrc/airootfs/root/.automated_script.sh b/configs/lxde-openrc/airootfs/root/.automated_script.sh
index 0159a8f..ed3a924 100755
--- a/configs/lxde-openrc/airootfs/root/.automated_script.sh
+++ b/configs/lxde-openrc/airootfs/root/.automated_script.sh
@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
script_cmdline ()
{
local param
for param in $(< /proc/cmdline); do
case "${param}" in
- script=*) echo "${param##*=}" ; return 0 ;;
+ script=*) echo "${param#*=}" ; return 0 ;;
esac
done
}
diff --git a/configs/lxde-openrc/airootfs/root/.zlogin b/configs/lxde-openrc/airootfs/root/.zlogin
index b24dba9..7eab09f 100644
--- a/configs/lxde-openrc/airootfs/root/.zlogin
+++ b/configs/lxde-openrc/airootfs/root/.zlogin
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
~/.automated_script.sh
~/.language.sh
export $(cat /etc/locale.conf)
diff --git a/configs/lxde-openrc/airootfs/root/customize_airootfs.sh b/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
index 47030c3..ee8fb9b 100755
--- a/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
+++ b/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
@@ -1,7 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
set -e -u
+echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.'
+
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
sed -i 's/#\(es_ES\.UTF-8\)/\1/' /etc/locale.gen
sed -i 's/#\(gl_ES\.UTF-8\)/\1/' /etc/locale.gen
@@ -12,15 +16,4 @@ sed -i 's/#\(fr_FR\.UTF-8\)/\1/' /etc/locale.gen
sed -i 's/#\(eo\)/\1/' /etc/locale.gen
locale-gen
-ln -sf /usr/share/zoneinfo/UTC /etc/localtime
-
-usermod -s /usr/bin/zsh root
-cp -aT /etc/skel/ /root/
-chmod 700 /root
-
-sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
-
-rc-update add NetworkManager default
-
-sed -i "s/_DATE_/$(date +%Y.%m.%d)/" /etc/motd
diff --git a/configs/lxde-openrc/airootfs/root/install.txt b/configs/lxde-openrc/airootfs/root/install.txt
deleted file mode 100644
index a594b97..0000000
--- a/configs/lxde-openrc/airootfs/root/install.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-View this installation guide online at
-https://wiki.parabola.nu/Installation_Guide
diff --git a/configs/lxde-openrc/airootfs/usr/local/bin/Installation_guide b/configs/lxde-openrc/airootfs/usr/local/bin/Installation_guide
new file mode 100755
index 0000000..876fbd2
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/usr/local/bin/Installation_guide
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+exec lynx 'https://wiki.parabola.nu/Installation_Guide'
diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh
index 32f74ed..a25c000 100755
--- a/configs/lxde-openrc/build.sh
+++ b/configs/lxde-openrc/build.sh
@@ -7,7 +7,6 @@ iso_label="PARA_$(date +%Y%m)"
iso_publisher="Parabola GNU/Linux-libre <http://www.parabola.nu>"
iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
iso_version=$(date +%Y.%m.%d)
-iso_title="Parabola GNU/Linux-libre - LXDE Desktop LiveCD"
install_dir=parabola
work_dir=work
out_dir=out
@@ -15,15 +14,7 @@ gpg_key=""
arch=$(uname -m)
verbose=""
-script_path=$(readlink -f "${0%/*}")
-
-# Init system. Options are:
-# - openrc
-# - sysvinit
-# - systemd
-#
-# sysvinit uses OpenRC as service manager
-init=openrc
+script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
_usage ()
{
@@ -69,55 +60,45 @@ make_pacman_conf() {
"${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
}
-# Base installation, plus needed packages (airootfs)
-make_basefs() {
- if [ -n "${verbose}" ]; then
- arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
- arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" \
- -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh refind" install
- else
- arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
- arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" \
- -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh refind" install
+# Prepare working directory and copy custom airootfs files (airootfs)
+make_custom_airootfs() {
+ local _airootfs="${work_dir}/${arch}/airootfs"
+ mkdir -p -- "${_airootfs}"
+
+ if [[ -d "${script_path}/airootfs" ]]; then
+ cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
+
+ [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
+ [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
+
+ # Set up user home directories and permissions
+ if [[ -e "${_airootfs}/etc/passwd" ]]; then
+ while IFS=':' read -a passwd -r; do
+ [[ "${passwd[5]}" == '/' ]] && continue
+
+ if [[ -d "${_airootfs}${passwd[5]}" ]]; then
+ chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
+ chmod -f 0750 -- "${_airootfs}${passwd[5]}"
+ else
+ install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
+ fi
+ done < "${_airootfs}/etc/passwd"
+ fi
fi
}
-# Additional packages (airootfs)
+# Packages (airootfs)
make_packages() {
- if [ -n "${verbose}" ]; then
- arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- else
- arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- fi
-}
-
-# Copy mkinitcpio parabolaiso hooks and build initramfs (airootfs)
-make_setup_mkinitcpio() {
- local _hook
- mkdir -p "${work_dir}/${arch}/airootfs/etc/initcpio/hooks"
- mkdir -p "${work_dir}/${arch}/airootfs/etc/initcpio/install"
- for _hook in parabolaiso parabolaiso_shutdown parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_loop_mnt; do
- cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/${arch}/airootfs/etc/initcpio/hooks"
- cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/${arch}/airootfs/etc/initcpio/install"
- done
- sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${work_dir}/${arch}/airootfs/etc/initcpio/install/parabolaiso_shutdown"
- cp /usr/lib/initcpio/install/parabolaiso_kms "${work_dir}/${arch}/airootfs/etc/initcpio/install"
- cp /usr/lib/initcpio/parabolaiso_shutdown "${work_dir}/${arch}/airootfs/etc/initcpio"
- cp "${script_path}/mkinitcpio.conf" "${work_dir}/${arch}/airootfs/etc/mkinitcpio-parabolaiso.conf"
if [[ "${gpg_key}" ]]; then
gpg --export "${gpg_key}" >"${work_dir}/gpgkey"
exec 17<>"${work_dir}/gpgkey"
fi
if [ -n "${verbose}" ]; then
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" \
- -D "${install_dir}" \
- -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
+ PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
else
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" \
- -D "${install_dir}" \
- -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
+ PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
fi
if [[ "${gpg_key}" ]]; then
exec 17<&-
@@ -126,35 +107,43 @@ make_setup_mkinitcpio() {
# Customize installation (airootfs)
make_customize_airootfs() {
- cp -af --no-preserve=ownership "${script_path}/airootfs" "${work_dir}/${arch}"
+ if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
+ while IFS=':' read -a passwd -r; do
+ [[ "${passwd[5]}" == '/' ]] && continue
+ cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/${arch}/airootfs/etc/skel" "${work_dir}/${arch}/airootfs${passwd[5]}"
+ chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/${arch}/airootfs${passwd[5]}"
- cp "${script_path}/pacman.conf" "${work_dir}/${arch}/airootfs/etc"
-
- lynx -dump -nolist 'https://wiki.parabola.nu/index.php/Installation_Guide?action=render' >> \
- "${work_dir}/${arch}/airootfs/root/install.txt"
+ done < "${script_path}/airootfs/etc/passwd"
+ fi
- if [ -n "${verbose}" ]; then
- arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- else
- arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
+ if [[ -e "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh" ]]; then
+ if [ -n "${verbose}" ]; then
+ arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ -r '/root/customize_airootfs.sh' run
+ else
+ arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ -r '/root/customize_airootfs.sh' run
+ fi
+ rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh"
fi
- rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh"
}
# Prepare kernel/initramfs ${install_dir}/boot/
make_boot() {
mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
- cp "${work_dir}/${arch}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/parabolaiso.img"
- cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz"
+ cp "${work_dir}/${arch}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/"
+ cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/"
}
# Add other aditional/extra files to ${install_dir}/boot/
make_boot_extra() {
- cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
- cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \
- "${work_dir}/iso/${install_dir}/boot/memtest.COPYING"
+ if [[ -e "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" ]]; then
+ # rename for PXE: https://wiki.parabola.nu/Syslinux#Using_memtest
+ cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
+ mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
+ cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \
+ "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
+ fi
}
# Prepare /${install_dir}/boot/syslinux
@@ -165,16 +154,13 @@ make_syslinux() {
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
done
- cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux"
+ cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux/"
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt"
gzip -c -9 "${work_dir}/${arch}/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
"${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
-
- # inject edition title
- sed -i "s|_EDITION_TITLE_|${iso_title}|" ${work_dir}/iso/${install_dir}/boot/syslinux/parabolaiso_head.cfg
}
# Prepare /isolinux
@@ -202,7 +188,7 @@ make_efi() {
# edk2-shell based UEFI shell
# shellx64.efi is picked up automatically when on /
- cp /usr/share/edk2-shell/x64/Shell_Full.efi "${work_dir}/iso/shellx64.efi"
+ cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
}
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
@@ -215,8 +201,8 @@ make_efiboot() {
mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img" "${work_dir}/efiboot"
mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/parabolaiso/vmlinuz.efi"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img" "${work_dir}/efiboot/EFI/parabolaiso/parabolaiso.img"
+ cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux-libre" "${work_dir}/efiboot/EFI/parabolaiso/"
+ cp "${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img" "${work_dir}/efiboot/EFI/parabolaiso/"
mkdir -p "${work_dir}/efiboot/EFI/boot/entries"
cp "${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi" \
@@ -288,15 +274,14 @@ done
mkdir -p "${work_dir}"
run_once make_pacman_conf
+run_once make_custom_airootfs
# Do all stuff for each airootfs
for arch in i686 x86_64; do
- run_once make_basefs
run_once make_packages
done
for arch in i686 x86_64; do
- run_once make_setup_mkinitcpio
run_once make_customize_airootfs
done
diff --git a/configs/lxde-openrc/mkinitcpio.conf b/configs/lxde-openrc/mkinitcpio.conf
deleted file mode 100644
index 2c4a846..0000000
--- a/configs/lxde-openrc/mkinitcpio.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULES=(loop)
-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 filesystems keyboard)
-COMPRESSION="xz"
diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both
index 0faa899..08b0aa0 100644
--- a/configs/lxde-openrc/packages.both
+++ b/configs/lxde-openrc/packages.both
@@ -1,19 +1,19 @@
#Base
arch-install-scripts
+base
+bind-tools
btrfs-progs
crda
darkhttpd
ddrescue
dhclient
dhcpcd-openrc
-dialog
diffutils
dmraid
dnsmasq
-dnsutils
dosfstools
efibootmgr
-elinks
+elogind
ethtool
exfat-utils
f2fs-tools
@@ -22,21 +22,31 @@ gnu-netcat
gpm-openrc
gptfdisk
grml-zsh-config
+haveged-openrc
hdparm-openrc
irssi
iwd
jfsutils
+kitty-terminfo
lftp
linux-atm
+linux-libre
+linux-libre
linux-libre-firmware
-lvm2-openrc
lsscsi
+lvm2-openrc
+lynx
man-db
man-pages
mc
mdadm-openrc
+memtest86+
+mkinitcpio
+mkinitcpio-parabolaiso
+mkinitcpio-nfs-utils
mtools
nano
+nbd
ndisc6
networkmanager-openrc
nfs-utils-openrc
@@ -45,6 +55,7 @@ nmap
ntfs-3g
nvme-cli
openconnect
+openrc-init
openssh-openrc
openvpn-openrc
partclone
@@ -52,19 +63,23 @@ parted
partimage
ppp
pptpclient
+reflector
reiserfsprogs
rp-pppoe
-reflector
rsync-openrc
+rxvt-unicode-terminfo
sdparm
sg3_utils
smartmontools
sudo
+syslinux
tcpdump
+terminus-font
+termite-terminfo
testdisk
usb_modeswitch
usbutils
-vim-minimal
+vim
vpnc
wireless-regdb
wireless_tools
@@ -72,6 +87,7 @@ wpa_supplicant-openrc
wvdial
xfsprogs
xl2tpd
+zsh
#X11
xorg
diff --git a/configs/lxde-openrc/packages.x86_64 b/configs/lxde-openrc/packages.x86_64
index e69de29..c00c3b2 100644
--- a/configs/lxde-openrc/packages.x86_64
+++ b/configs/lxde-openrc/packages.x86_64
@@ -0,0 +1,2 @@
+edk2-shell
+refind \ No newline at end of file
diff --git a/configs/lxde-openrc/pacman.conf b/configs/lxde-openrc/pacman.conf
index 0730db9..cf65292 100644
--- a/configs/lxde-openrc/pacman.conf
+++ b/configs/lxde-openrc/pacman.conf
@@ -2,6 +2,8 @@
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
#
# GENERAL OPTIONS
@@ -16,10 +18,9 @@
#GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/
HoldPkg = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
#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
diff --git a/configs/lxde-openrc/syslinux/parabolaiso.cfg b/configs/lxde-openrc/syslinux/parabolaiso.cfg
index 473e245..e38642c 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
DEFAULT select
LABEL select
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_head.cfg b/configs/lxde-openrc/syslinux/parabolaiso_head.cfg
index aa6f03c..f1f7635 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_head.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_head.cfg
@@ -1,6 +1,9 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
SERIAL 0 38400
UI boot/syslinux/vesamenu.c32
-MENU TITLE _EDITION_TITLE_
+MENU TITLE Parabola GNU/Linux-libre
MENU BACKGROUND boot/syslinux/splash.png
MENU WIDTH 78
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg
index 9df86b7..4e88b06 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg
@@ -1,10 +1,13 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
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.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD)
-LINUX boot/i686/vmlinuz
+LINUX boot/i686/vmlinuz-linux-libre
INITRD boot/i686/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
SYSAPPEND 3
@@ -15,7 +18,7 @@ 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
+LINUX boot/i686/vmlinuz-linux-libre
INITRD boot/i686/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt
SYSAPPEND 3
@@ -26,7 +29,7 @@ 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
+LINUX boot/i686/vmlinuz-linux-libre
INITRD boot/i686/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/
SYSAPPEND 3
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg
index be3e3de..4f6ca04 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg
@@ -1,10 +1,13 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
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.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD)
-LINUX boot/x86_64/vmlinuz
+LINUX boot/x86_64/vmlinuz-linux-libre
INITRD boot/x86_64/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
SYSAPPEND 3
@@ -15,7 +18,7 @@ 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
+LINUX boot/x86_64/vmlinuz-linux-libre
INITRD boot/x86_64/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt
SYSAPPEND 3
@@ -26,7 +29,7 @@ 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
+LINUX boot/x86_64/vmlinuz-linux-libre
INITRD boot/x86_64/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/
SYSAPPEND 3
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg
index ba514cb..c5c00e6 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe_32_inc.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
INCLUDE boot/syslinux/parabolaiso_head.cfg
INCLUDE boot/syslinux/parabolaiso_pxe32.cfg
INCLUDE boot/syslinux/parabolaiso_tail.cfg
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg
index 9396d9b..0c5be94 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe_both_inc.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
INCLUDE boot/syslinux/parabolaiso_head.cfg
INCLUDE boot/syslinux/parabolaiso_pxe64.cfg
INCLUDE boot/syslinux/parabolaiso_pxe32.cfg
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg
index a3a768f..079fd7d 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe_choose.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
DEFAULT choose
LABEL choose
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
index 4abdf7a..819dd56 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
@@ -1,9 +1,15 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+DEFAULT parabola32
+TIMEOUT 30
+
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.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686)
-LINUX boot/i686/vmlinuz
+LINUX boot/i686/vmlinuz-linux-libre
INITRD boot/i686/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys64.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys64.cfg
index b154459..265464a 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_sys64.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_sys64.cfg
@@ -1,9 +1,15 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+DEFAULT parabola64
+TIMEOUT 30
+
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.
ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (x86_64)
-LINUX boot/x86_64/vmlinuz
+LINUX boot/x86_64/vmlinuz-linux-libre
INITRD boot/x86_64/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg
index c641201..1e7c196 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_sys_32_inc.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
INCLUDE boot/syslinux/parabolaiso_head.cfg
INCLUDE boot/syslinux/parabolaiso_sys32.cfg
INCLUDE boot/syslinux/parabolaiso_tail.cfg
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg
index 9dfb87f..04f89d4 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_sys_both_inc.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
INCLUDE boot/syslinux/parabolaiso_head.cfg
INCLUDE boot/syslinux/parabolaiso_sys64.cfg
INCLUDE boot/syslinux/parabolaiso_sys32.cfg
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg
index d436062..2d41bb9 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_sys_choose.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
DEFAULT choose
LABEL choose
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg b/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg
index e85d8e1..685e1c8 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_tail.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
LABEL existing
TEXT HELP
Boot an existing operating system.
@@ -19,9 +22,17 @@ COM32 boot/syslinux/hdt.c32
APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz
LABEL reboot
+TEXT HELP
+Reboot computer.
+The computer's firmware must support APM.
+ENDTEXT
MENU LABEL Reboot
COM32 boot/syslinux/reboot.c32
LABEL poweroff
+TEXT HELP
+Power off computer.
+The computer's firmware must support APM.
+ENDTEXT
MENU LABEL Power Off
COM32 boot/syslinux/poweroff.c32
diff --git a/configs/lxde-openrc/syslinux/syslinux.cfg b/configs/lxde-openrc/syslinux/syslinux.cfg
index 0869ed2..f0239ac 100644
--- a/configs/lxde-openrc/syslinux/syslinux.cfg
+++ b/configs/lxde-openrc/syslinux/syslinux.cfg
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
DEFAULT loadconfig
LABEL loadconfig