summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-07-15 11:23:14 -0400
committerDavid P <megver83@parabola.nu>2020-07-15 11:23:14 -0400
commit8c48ab20168b51fa3893ad64bccd06411f205bb5 (patch)
tree0ffbef54dd818c3e4aefc11127850e11761b1de2
parentf2d5583a9428f576a09023032a3e3bae95690b9a (diff)
[talkingparabola] sync with talkingarch
talking-arch isn't completely synced with Arch's releng, however I prefer to wait for them to do it, as they may introduce different stuff, or who knows :P Signed-off-by: David P <megver83@parabola.nu>
l---------configs/talkingparabola/airootfs/etc/resolv.conf1
-rw-r--r--configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network11
-rw-r--r--configs/talkingparabola/airootfs/etc/systemd/network/wireless.network11
-rw-r--r--configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules1
-rwxr-xr-xconfigs/talkingparabola/airootfs/root/.automated_script.sh2
-rwxr-xr-xconfigs/talkingparabola/airootfs/root/customize_airootfs.sh4
-rw-r--r--configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in15
-rwxr-xr-xconfigs/talkingparabola/build.sh22
-rw-r--r--configs/talkingparabola/efiboot/loader/entries/uefi-shell-full-x86_64.conf2
-rw-r--r--configs/talkingparabola/efiboot/loader/entries/uefi-shell-v1-x86_64.conf2
-rw-r--r--configs/talkingparabola/efiboot/loader/entries/uefi-shell-v2-x86_64.conf2
-rw-r--r--configs/talkingparabola/efiboot/loader/entries/uefi-shell-x86_64.conf2
-rw-r--r--configs/talkingparabola/efiboot/loader/loader.conf2
-rw-r--r--configs/talkingparabola/packages.both2
14 files changed, 45 insertions, 34 deletions
diff --git a/configs/talkingparabola/airootfs/etc/resolv.conf b/configs/talkingparabola/airootfs/etc/resolv.conf
new file mode 120000
index 0000000..3639662
--- /dev/null
+++ b/configs/talkingparabola/airootfs/etc/resolv.conf
@@ -0,0 +1 @@
+/run/systemd/resolve/stub-resolv.conf \ No newline at end of file
diff --git a/configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network b/configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network
new file mode 100644
index 0000000..5e9f0b7
--- /dev/null
+++ b/configs/talkingparabola/airootfs/etc/systemd/network/ethernet.network
@@ -0,0 +1,11 @@
+[Match]
+Name=en*
+Name=eth*
+
+[Network]
+DHCP=ipv4
+IPv6PrivacyExtensions=yes
+IPv6AcceptRA=false
+
+[DHCP]
+RouteMetric=512
diff --git a/configs/talkingparabola/airootfs/etc/systemd/network/wireless.network b/configs/talkingparabola/airootfs/etc/systemd/network/wireless.network
new file mode 100644
index 0000000..5a6da15
--- /dev/null
+++ b/configs/talkingparabola/airootfs/etc/systemd/network/wireless.network
@@ -0,0 +1,11 @@
+[Match]
+Name=wlp*
+Name=wlan*
+
+[Network]
+DHCP=ipv4
+IPv6PrivacyExtensions=yes
+IPv6AcceptRA=false
+
+[DHCP]
+RouteMetric=1024
diff --git a/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules b/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules
deleted file mode 100644
index 1c4053c..0000000
--- a/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service"
diff --git a/configs/talkingparabola/airootfs/root/.automated_script.sh b/configs/talkingparabola/airootfs/root/.automated_script.sh
index 81a98a1..aaf5583 100755
--- a/configs/talkingparabola/airootfs/root/.automated_script.sh
+++ b/configs/talkingparabola/airootfs/root/.automated_script.sh
@@ -15,7 +15,7 @@ automated_script ()
local script rt
script="$(script_cmdline)"
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
- if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
+ if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null
rt=$?
else
diff --git a/configs/talkingparabola/airootfs/root/customize_airootfs.sh b/configs/talkingparabola/airootfs/root/customize_airootfs.sh
index 64c48a9..66679b2 100755
--- a/configs/talkingparabola/airootfs/root/customize_airootfs.sh
+++ b/configs/talkingparabola/airootfs/root/customize_airootfs.sh
@@ -10,6 +10,8 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
usermod -s /usr/bin/zsh root
cp -aT /etc/skel/ /root/
chmod 700 /root
+# unset the root password
+passwd -d root
sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
@@ -19,7 +21,7 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf
-systemctl enable multi-user.target pacman-init.service choose-mirror.service livecd-alsa-unmuter.service brltty.service
+systemctl enable multi-user.target pacman-init.service choose-mirror.service systemd-networkd.service systemd-resolved.service livecd-alsa-unmuter.service brltty.service
systemctl set-default multi-user.target
sed -i "s/_DATE_/$(date +%Y.%m.%d)/" /etc/motd
diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in b/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in
index 851f829..3f9c7aa 100644
--- a/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in
+++ b/configs/talkingparabola/airootfs/usr/share/livecd-sound/asound.conf.in
@@ -1,12 +1,3 @@
-pcm.!default {
- type plug
- slave.pcm {
- type hw
- card %card%
- }
-}
-
-ctl.!default {
- type hw
- card %card%
-}
+Defaults node
+defaults.ctl.card %card%;
+defaults.pcm.card %card%;
diff --git a/configs/talkingparabola/build.sh b/configs/talkingparabola/build.sh
index 09a8550..540d841 100755
--- a/configs/talkingparabola/build.sh
+++ b/configs/talkingparabola/build.sh
@@ -169,20 +169,16 @@ make_efi() {
mkdir -p ${work_dir}/iso/loader/entries
cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/
- cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/
- cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/
+ cp ${script_path}/efiboot/loader/entries/uefi-shell-x86_64.conf ${work_dir}/iso/loader/entries/
+ cp ${script_path}/efiboot/loader/entries/uefi-shell-full-x86_64.conf ${work_dir}/iso/loader/entries/
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
${script_path}/efiboot/loader/entries/parabolaiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/parabolaiso-x86_64.conf
- # EFI Shell 2.0 for UEFI 2.3+
- curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/edk2-stable201811/ShellBinPkg/UefiShell/X64/Shell.efi
- # EFI Shell 1.0 for non UEFI 2.3+
- curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://raw.githubusercontent.com/tianocore/edk2/edk2-stable201811/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
-
- # Checksums for EFI Shell
- sed "s|shellx64|${work_dir}/iso/EFI/shellx64|" ${script_path}/SHA512SUMS | sha512sum --quiet -c -
+ # edk2-shell based UEFI shell
+ cp /usr/share/edk2-shell/x64/Shell.efi ${work_dir}/iso/EFI/Shell_x64.efi
+ cp /usr/share/edk2-shell/x64/Shell_Full.efi ${work_dir}/iso/EFI/Shell_Full_x64.efi
}
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
@@ -206,15 +202,15 @@ make_efiboot() {
mkdir -p ${work_dir}/efiboot/loader/entries
cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/
- cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/
- cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/
+ cp ${script_path}/efiboot/loader/entries/uefi-shell-x86_64.conf ${work_dir}/efiboot/loader/entries/
+ cp ${script_path}/efiboot/loader/entries/uefi-shell-full-x86_64.conf ${work_dir}/efiboot/loader/entries/
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
${script_path}/efiboot/loader/entries/parabolaiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/parabolaiso-x86_64.conf
- cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/
- cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/
+ cp ${work_dir}/iso/EFI/Shell_x64.efi ${work_dir}/efiboot/EFI/
+ cp ${work_dir}/iso/EFI/Shell_Full_x64.efi ${work_dir}/efiboot/EFI/
umount -d ${work_dir}/efiboot
}
diff --git a/configs/talkingparabola/efiboot/loader/entries/uefi-shell-full-x86_64.conf b/configs/talkingparabola/efiboot/loader/entries/uefi-shell-full-x86_64.conf
new file mode 100644
index 0000000..054fa52
--- /dev/null
+++ b/configs/talkingparabola/efiboot/loader/entries/uefi-shell-full-x86_64.conf
@@ -0,0 +1,2 @@
+title UEFI Shell (Full) x86_64
+efi /EFI/Shell_Full_x64.efi
diff --git a/configs/talkingparabola/efiboot/loader/entries/uefi-shell-v1-x86_64.conf b/configs/talkingparabola/efiboot/loader/entries/uefi-shell-v1-x86_64.conf
deleted file mode 100644
index 9597ff2..0000000
--- a/configs/talkingparabola/efiboot/loader/entries/uefi-shell-v1-x86_64.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-title UEFI Shell x86_64 v1
-efi /EFI/shellx64_v1.efi
diff --git a/configs/talkingparabola/efiboot/loader/entries/uefi-shell-v2-x86_64.conf b/configs/talkingparabola/efiboot/loader/entries/uefi-shell-v2-x86_64.conf
deleted file mode 100644
index 0dde77a..0000000
--- a/configs/talkingparabola/efiboot/loader/entries/uefi-shell-v2-x86_64.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-title UEFI Shell x86_64 v2
-efi /EFI/shellx64_v2.efi
diff --git a/configs/talkingparabola/efiboot/loader/entries/uefi-shell-x86_64.conf b/configs/talkingparabola/efiboot/loader/entries/uefi-shell-x86_64.conf
new file mode 100644
index 0000000..b5dfbf2
--- /dev/null
+++ b/configs/talkingparabola/efiboot/loader/entries/uefi-shell-x86_64.conf
@@ -0,0 +1,2 @@
+title UEFI Shell x86_64
+efi /EFI/Shell_x64.efi
diff --git a/configs/talkingparabola/efiboot/loader/loader.conf b/configs/talkingparabola/efiboot/loader/loader.conf
index ba02c50..ea91d51 100644
--- a/configs/talkingparabola/efiboot/loader/loader.conf
+++ b/configs/talkingparabola/efiboot/loader/loader.conf
@@ -1,2 +1,2 @@
timeout 3
-default parabolaiso-x86_64
+default parabolaiso-x86_64.conf
diff --git a/configs/talkingparabola/packages.both b/configs/talkingparabola/packages.both
index b0e3894..0dbe5a0 100644
--- a/configs/talkingparabola/packages.both
+++ b/configs/talkingparabola/packages.both
@@ -58,7 +58,7 @@ polkit
pptpclient
ppp
pptpclient
-refind-efi
+refind
reiserfsprogs
sdparm
sg3_utils