diff options
| author | V3n3RiX <venerix@gmail.com> | 2014-12-20 19:17:44 +0200 |
|---|---|---|
| committer | V3n3RiX <venerix@gmail.com> | 2014-12-20 19:17:44 +0200 |
| commit | d28ec089f44788737adca93890d603d2bcb3c2eb (patch) | |
| tree | db6b1283035d1cda34f36eb73e490fe3f1934798 | |
| parent | dacc0bfae08c88125035f08cd136641eee95137f (diff) | |
drop any openrc reference
| -rw-r--r-- | kogaion-functions.sh | 17 | ||||
| -rw-r--r-- | kogaionlive.sh | 10 |
2 files changed, 2 insertions, 25 deletions
diff --git a/kogaion-functions.sh b/kogaion-functions.sh index 6229b6f..586c02d 100644 --- a/kogaion-functions.sh +++ b/kogaion-functions.sh @@ -128,11 +128,7 @@ kogaion_setup_motd() { } kogaion_setup_vt_autologin() { - if openrc_running; then - . /sbin/livecd-functions.sh - export CDBOOT=1 - livecd_fix_inittab - elif systemd_running; then + if systemd_running; then cp /usr/lib/systemd/system/getty@.service \ /etc/systemd/system/autologin@.service sed -i "/^ExecStart=/ s:/sbin/agetty:/sbin/agetty --autologin root:g" \ @@ -220,13 +216,6 @@ kogaion_fixup_gnome_autologin_session() { } kogaion_setup_text_installer() { - if openrc_running; then - # switch to verbose mode - splash_manager -c set -t default -m v &> /dev/null - reset - chvt 1 - clear - fi kogaion_setup_text_installer_motd } @@ -278,7 +267,3 @@ kogaion_is_normal_boot() { systemd_running() { test -d /run/systemd/system } - -openrc_running() { - test -e /run/openrc/softlevel -} diff --git a/kogaionlive.sh b/kogaionlive.sh index 38b3647..fd0d377 100644 --- a/kogaionlive.sh +++ b/kogaionlive.sh @@ -19,11 +19,7 @@ setup_x() { setup_settingsd() { if [ -e /usr/share/eselect/modules/settingsd.eselect ]; then - if systemd_running; then - eselect settingsd set systemd > /dev/null - elif openrc_running; then - eselect settingsd set openrc > /dev/null - fi + eselect settingsd set systemd > /dev/null fi } @@ -100,10 +96,6 @@ setup_keymap() { if [ -n "${keymap_toset}" ]; then aggregated_keymap="${keymap_toset}${keymap_toset_model}" /sbin/keyboard-setup-2 "${aggregated_keymap}" all &> /dev/null - if [ "${?}" = "0" ]; then - openrc_running && /etc/init.d/keymaps restart --nodeps - # systemd not needed here, this script runs before vconsole-setup - fi fi } |