summaryrefslogtreecommitdiff
path: root/configs/profile/root-image
diff options
context:
space:
mode:
authorEsteban Carnevale <alfplayer@mailoo.org>2013-09-02 20:03:39 -0300
committerEsteban Carnevale <alfplayer@mailoo.org>2013-09-02 20:03:39 -0300
commite2b054c74fd0c1852f94d9af80f44297125742f4 (patch)
treef7c978cdf3458758f838d60edbb6a54f20f34ea9 /configs/profile/root-image
parent04d8551cb78ff9a691fd4ead51e4f8f27c5b851e (diff)
parent17803d20925a72d31dbdbacf56cb0a7d2db6efcb (diff)
Merge branch 'rebrand/releng'
Conflicts: Makefile configs/profile/build.sh configs/profile/mkinitcpio.conf configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch configs/profile/root-image/root/customize_root_image.sh configs/profile/root-image/root/install.txt configs/profile/syslinux/splash.png
Diffstat (limited to 'configs/profile/root-image')
-rwxr-xr-xconfigs/profile/root-image/etc/systemd/scripts/choose-mirror26
-rw-r--r--configs/profile/root-image/etc/systemd/system/choose-mirror.service10
-rw-r--r--configs/profile/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf3
-rw-r--r--configs/profile/root-image/etc/udev/rules.d/81-dhcpcd.rules1
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh11
5 files changed, 43 insertions, 8 deletions
diff --git a/configs/profile/root-image/etc/systemd/scripts/choose-mirror b/configs/profile/root-image/etc/systemd/scripts/choose-mirror
new file mode 100755
index 0000000..13c9f69
--- /dev/null
+++ b/configs/profile/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/profile/root-image/etc/systemd/system/choose-mirror.service b/configs/profile/root-image/etc/systemd/system/choose-mirror.service
new file mode 100644
index 0000000..1e4d771
--- /dev/null
+++ b/configs/profile/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/profile/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/profile/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
new file mode 100644
index 0000000..d1d8474
--- /dev/null
+++ b/configs/profile/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/profile/root-image/etc/udev/rules.d/81-dhcpcd.rules b/configs/profile/root-image/etc/udev/rules.d/81-dhcpcd.rules
new file mode 100644
index 0000000..970da69
--- /dev/null
+++ b/configs/profile/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/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index e3bd179..9c980f1 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -7,21 +7,16 @@ 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
sed -i "s/_DATE_/${iso_version}/" /etc/motd