mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

installer: get rid of unused systemd checks.

Browse Source
This commit is contained in:
Juan RP 2015-10-17 10:55:32 +02:00
parent c0e16252c3
commit d3b527ec3d
1 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
installer.sh.in
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#- #-
# Copyright (c) 2012-2014 Juan Romero Pardines <xtraeme@gmail.com>. # Copyright (c) 2012-2015 Juan Romero Pardines <xtraeme@voidlinux.eu>.
# 2012 Dave Elusive <davehome@redthumb.info.tm>. # 2012 Dave Elusive <davehome@redthumb.info.tm>.
# All rights reserved. # All rights reserved.
# #
@ -36,7 +36,6 @@ BOOTLOADER_DONE=
PARTITIONS_DONE= PARTITIONS_DONE=
NETWORK_DONE= NETWORK_DONE=
FILESYSTEMS_DONE= FILESYSTEMS_DONE=
SYSTEMD_INIT=
TARGETDIR=/mnt/target TARGETDIR=/mnt/target
LOG=/dev/tty8 LOG=/dev/tty8
@ -59,11 +58,6 @@ if [ -e /sys/firmware/efi/systab ]; then
EFI_SYSTEM=1 EFI_SYSTEM=1
fi fi
# Detect if systemd is installed
if [ "$(cat /proc/1/comm)" = "systemd" ]; then
SYSTEMD_INIT=1
fi
# dialog colors # dialog colors
BLACK="\Z0" BLACK="\Z0"
RED="\Z1" RED="\Z1"
@ -290,11 +284,7 @@ ${RESET}\n" 18 80
} }
menu_keymap() { menu_keymap() {
if [ -n "$SYSTEMD_INIT" ]; then local _keymaps="$(find /usr/share/kbd/keymaps/ -type f -iname "*.map.gz" -printf "%f\n" | sed 's|.map.gz||g' | sort)"
local _keymaps="$(localectl --no-pager list-keymaps)"
else
local _keymaps="$(find /usr/share/kbd/keymaps/ -type f -iname "*.map.gz" -printf "%f\n" | sed 's|.map.gz||g' | sort)"
fi
local _KEYMAPS= local _KEYMAPS=
for f in ${_keymaps}; do for f in ${_keymaps}; do
@ -354,11 +344,7 @@ set_locale() {
} }
menu_timezone() { menu_timezone() {
if [ -n "$SYSTEMD_INIT" ]; then local _tzones="$(cd /usr/share/zoneinfo; find Africa/ America/ Antarctica/ Arctic/ Asia/ Atlantic/ Australia/ Europe/ Indian/ Pacific/ -type f | sort)"
local _tzones="$(timedatectl --no-pager list-timezones)"
else
local _tzones="$(cd /usr/share/zoneinfo; find Africa/ America/ Antarctica/ Arctic/ Asia/ Atlantic/ Australia/ Europe/ Indian/ Pacific/ -type f | sort)"
fi
local _TIMEZONES= local _TIMEZONES=
for f in ${_tzones}; do for f in ${_tzones}; do
@ -379,11 +365,7 @@ menu_timezone() {
set_timezone() { set_timezone() {
local TIMEZONE="$(get_option TIMEZONE)" local TIMEZONE="$(get_option TIMEZONE)"
if [ -z "$SYSTEMD_INIT" ]; then sed -i -e "s|#TIMEZONE=.*|TIMEZONE=$TIMEZONE|g" $TARGETDIR/etc/rc.conf
sed -i -e "s|#TIMEZONE=.*|TIMEZONE=$TIMEZONE|g" $TARGETDIR/etc/rc.conf
else
ln -sf /usr/share/zoneinfo/${TIMEZONE} $TARGETDIR/etc/localtime
fi
} }
menu_hostname() { menu_hostname() {
@ -830,11 +812,7 @@ install_packages() {
} }
enable_dhcpd() { enable_dhcpd() {
if [ -n "$SYSTEMD_INIT" ]; then ln -sf /etc/sv/dhcpcd $TARGETDIR/etc/runit/runsvdir/default/dhcpcd
chroot $TARGETDIR systemctl enable dhcpcd.service >$LOG 2>&1
else
ln -s /etc/sv/dhcpcd $TARGETDIR/etc/runit/runsvdir/default/dhcpcd
fi
} }
menu_install() { menu_install() {
@ -925,11 +903,7 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
elif [ "$_type" = "dhcp" ]; then elif [ "$_type" = "dhcp" ]; then
if [ -f /etc/wpa_supplicant/wpa_supplicant-${_dev}.conf ]; then if [ -f /etc/wpa_supplicant/wpa_supplicant-${_dev}.conf ]; then
cp /etc/wpa_supplicant/wpa_supplicant-${_dev}.conf $TARGETDIR/etc/wpa_supplicant cp /etc/wpa_supplicant/wpa_supplicant-${_dev}.conf $TARGETDIR/etc/wpa_supplicant
if [ -n "$SYSTEMD_INIT" ]; then ln -sf /etc/sv/dhcpcd-${_dev} $TARGETDIR/etc/runit/runsvdir/default/dhcpcd-${_dev}
chroot $TARGETDIR systemctl enable dhcpcd@${_dev}.service >$LOG 2>&1
else
ln -s /etc/sv/dhcpcd-${_dev} $TARGETDIR/etc/runit/runsvdir/default/dhcpcd-${_dev}
fi
else else
enable_dhcpd enable_dhcpd
fi fi