summaryrefslogtreecommitdiff
path: root/configs/releng/airootfs/root
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-08-01 16:14:19 -0400
committerDavid P <megver83@parabola.nu>2020-08-01 16:48:57 -0400
commit1de1ff1a297fc9cef517be263be4f873a1d01d65 (patch)
treecd21a4ec17e38f924563fb3142b810e4a3975b6c /configs/releng/airootfs/root
parentf013f2bc1b1b512c4a44a2046ccb1a2d76a489eb (diff)
sync releng with archiso v46
and fix baseline mkinitcpio.conf hooks Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/releng/airootfs/root')
-rwxr-xr-xconfigs/releng/airootfs/root/.automated_script.sh4
-rwxr-xr-xconfigs/releng/airootfs/root/customize_airootfs.sh15
-rw-r--r--configs/releng/airootfs/root/install.txt2
3 files changed, 7 insertions, 14 deletions
diff --git a/configs/releng/airootfs/root/.automated_script.sh b/configs/releng/airootfs/root/.automated_script.sh
index 0159a8f..ed3a924 100755
--- a/configs/releng/airootfs/root/.automated_script.sh
+++ b/configs/releng/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/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh
index dd8cefa..c72644a 100755
--- a/configs/releng/airootfs/root/customize_airootfs.sh
+++ b/configs/releng/airootfs/root/customize_airootfs.sh
@@ -1,17 +1,12 @@
-#!/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
locale-gen
-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
-
-sed -i "s/_DATE_/$(date +%Y.%m.%d)/" /etc/motd
diff --git a/configs/releng/airootfs/root/install.txt b/configs/releng/airootfs/root/install.txt
deleted file mode 100644
index a594b97..0000000
--- a/configs/releng/airootfs/root/install.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-View this installation guide online at
-https://wiki.parabola.nu/Installation_Guide