summaryrefslogtreecommitdiff
path: root/configs/profile/root-image
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2017-12-31 21:33:44 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2018-01-01 02:33:08 -0500
commitc1918d0d3f9d4ead3519168fb88568a6ab00f584 (patch)
tree5a224a00e181087d654cb4ce215219eb16e61a1f /configs/profile/root-image
parent02fcdcc56e2e53ca958a64a037e89e371acf5313 (diff)
stash
Diffstat (limited to 'configs/profile/root-image')
-rwxr-xr-xconfigs/profile/root-image/etc/skel/install-openrc-lxde.sh2
-rwxr-xr-xconfigs/profile/root-image/etc/skel/install-systemd-mate.sh2
-rw-r--r--configs/profile/root-image/etc/systemd/system/pacman-init.service4
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc13
-rwxr-xr-xconfigs/profile/root-image/root/install-openrc-lxde.sh5
-rwxr-xr-xconfigs/profile/root-image/root/install-systemd-mate.sh5
6 files changed, 10 insertions, 21 deletions
diff --git a/configs/profile/root-image/etc/skel/install-openrc-lxde.sh b/configs/profile/root-image/etc/skel/install-openrc-lxde.sh
index 4267391..d2600d4 100755
--- a/configs/profile/root-image/etc/skel/install-openrc-lxde.sh
+++ b/configs/profile/root-image/etc/skel/install-openrc-lxde.sh
@@ -1,4 +1,4 @@
#!/bin/sh
-sudo /root/install-openrc-lxde.sh
+sudo /root/.install-openrc-lxde/install.sh
diff --git a/configs/profile/root-image/etc/skel/install-systemd-mate.sh b/configs/profile/root-image/etc/skel/install-systemd-mate.sh
index d0ae159..dee2747 100755
--- a/configs/profile/root-image/etc/skel/install-systemd-mate.sh
+++ b/configs/profile/root-image/etc/skel/install-systemd-mate.sh
@@ -1,4 +1,4 @@
#!/bin/sh
-sudo /root/install-systemd-mate.sh
+/root/.install-systemd-mate/install.sh
diff --git a/configs/profile/root-image/etc/systemd/system/pacman-init.service b/configs/profile/root-image/etc/systemd/system/pacman-init.service
index 5d90af9..7ac2db6 100644
--- a/configs/profile/root-image/etc/systemd/system/pacman-init.service
+++ b/configs/profile/root-image/etc/systemd/system/pacman-init.service
@@ -9,9 +9,7 @@ After=etc-pacman.d-gnupg.mount
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/pacman-key --init
-ExecStart=/usr/bin/pacman-key --populate archlinux
-ExecStart=/usr/bin/pacman-key --populate archlinux32
-ExecStart=/usr/bin/pacman-key --populate parabola
+ExecStart=/usr/bin/pacman-key --populate archlinux archlinux32 archlinuxarm parabola
[Install]
WantedBy=multi-user.target
diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc
index 1e7fa20..e55744a 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -9,8 +9,7 @@ readonly LOCALES="en_US\.UTF-8 \
readonly SYSTEMD_DELETE_FILES="/etc/conf.d/agetty.tty1 \
/etc/conf.d/hostname \
/etc/init.d/pacman-init \
- /etc/X11/Xwrapper.config \
-/etc/systemd/system/pacman-init.service "
+ /etc/X11/Xwrapper.config"
readonly OPENRC_DELETE_FILES="/etc/hostname \
/etc/systemd/scripts/choose-mirror \
/etc/systemd/system/choose-mirror.service \
@@ -18,7 +17,8 @@ readonly OPENRC_DELETE_FILES="/etc/hostname
/etc/systemd/system/getty@tty1.service.d/autologin.conf \
/etc/systemd/system/pacman-init.service "
readonly SYSTEMD_SERVICES_ALL="choose-mirror.service \
- multi-user.target "
+ multi-user.target \
+ pacman-init.service "
readonly SYSTEMD_SERVICES_GUI="NetworkManager.service"
readonly OPENRC_SERVICES_ALL="dbus \
haveged \
@@ -39,9 +39,10 @@ readonly COMPLETE_MSG="This ISO is capable of installing a complete Parabola sys
# cp /etc/pacman-online.conf /etc/pacman.conf"
[ "${enable_offline_install}" == 'false' ] && readonly NETWORK_MOTD_MSG=${NETINSTALL_MSG} || \
readonly NETWORK_MOTD_MSG=${COMPLETE_MSG}
-readonly ROOT_SKEL_FILES="/etc/skel/.automated_script.sh \
- /etc/skel/.bash_logout \
- /etc/skel/.bash_profile "
+readonly ROOT_SKEL_FILES="/etc/skel/.bash_logout \
+ /etc/skel/.bash_profile \
+ /etc/skel/install-openrc-lxde.sh \
+ /etc/skel/install-systemd-mate.sh"
readonly LIVE_USER=parabola
readonly LIVE_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel"
readonly OPENRC_USER_GROUPS="disk,sys"
diff --git a/configs/profile/root-image/root/install-openrc-lxde.sh b/configs/profile/root-image/root/install-openrc-lxde.sh
deleted file mode 100755
index 12fd970..0000000
--- a/configs/profile/root-image/root/install-openrc-lxde.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-
-/root/.language.sh
-/root/.install-openrc-lxde/install.sh
diff --git a/configs/profile/root-image/root/install-systemd-mate.sh b/configs/profile/root-image/root/install-systemd-mate.sh
deleted file mode 100755
index 8b18903..0000000
--- a/configs/profile/root-image/root/install-systemd-mate.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-
-/root/.language.sh
-/root/.install-systemd-mate/install.sh