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

Enable runit images

Browse Source
This commit is contained in:
Ypnose 2014-05-30 12:00:02 +02:00
parent 07ce345ba6
commit df8e66316f
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
installer.sh.in
View File

@ -262,7 +262,11 @@ ${RESET}\n" 18 80
} }
menu_keymap() { menu_keymap() {
if [ -x "/usr/bin/localectl" ]; then
local _keymaps="$(localectl --no-pager list-keymaps)" 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
@ -283,7 +287,11 @@ menu_keymap() {
set_keymap() { set_keymap() {
local KEYMAP=$(get_option KEYMAP) local KEYMAP=$(get_option KEYMAP)
if [ -f "/etc/vconsole.conf" ]; then
sed -i -e "s|KEYMAP=.*|KEYMAP=$KEYMAP|g" $TARGETDIR/etc/vconsole.conf sed -i -e "s|KEYMAP=.*|KEYMAP=$KEYMAP|g" $TARGETDIR/etc/vconsole.conf
else
sed -i -e "s|KEYMAP=.*|KEYMAP=$KEYMAP|g" $TARGETDIR/etc/rc.conf
fi
} }
menu_locale() { menu_locale() {
@ -315,7 +323,11 @@ set_locale() {
} }
menu_timezone() { menu_timezone() {
if [ -x "/usr/bin/timedatectl" ]; then
local _tzones="$(timedatectl --no-pager list-timezones)" local _tzones="$(timedatectl --no-pager list-timezones)"
else
local _tzones="$(find /usr/share/zoneinfo 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
@ -430,7 +442,7 @@ set_bootloader() {
test_network() { test_network() {
rm -f xtraeme.asc && \ rm -f xtraeme.asc && \
xbps-uhelper fetch http://xbps.nopcode.org/live/xtraeme.asc >$LOG 2>&1 xbps-uhelper fetch http://repo.voidlinux.eu/live/xtraeme.asc >$LOG 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
DIALOG --msgbox "Network is working properly!" ${MSGBOXSIZE} DIALOG --msgbox "Network is working properly!" ${MSGBOXSIZE}
NETWORK_DONE=1 NETWORK_DONE=1
@ -765,6 +777,14 @@ install_packages() {
fi fi
} }
enable_dhcpd() {
if [ -x "/usr/bin/systemctl" ]; then
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() {
# Don't continue if filesystems are not ready. # Don't continue if filesystems are not ready.
validate_filesystems || return 1 validate_filesystems || return 1
@ -849,9 +869,13 @@ ${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 [ -x "/usr/bin/systemctl" ]; then
chroot $TARGETDIR systemctl enable dhcpcd@${_dev}.service >$LOG 2>&1 chroot $TARGETDIR systemctl enable dhcpcd@${_dev}.service >$LOG 2>&1
else else
chroot $TARGETDIR systemctl enable dhcpcd.service >$LOG 2>&1 ln -s /etc/sv/dhcpcd-${_dev} $TARGETDIR/etc/runit/runsvdir/default/dhcpcd-${_dev}
fi
else
enable_dhcpd
fi fi
elif [ -n "$dev" -a -n "$type" = "static" ]; then elif [ -n "$dev" -a -n "$type" = "static" ]; then
# static IP through dhcpcd. # static IP through dhcpcd.
@ -862,7 +886,7 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
echo "static ip_address=$_ip" >>$TARGETDIR/etc/dhcpcd.conf echo "static ip_address=$_ip" >>$TARGETDIR/etc/dhcpcd.conf
echo "static routers=$_gw" >>$TARGETDIR/etc/dhcpcd.conf echo "static routers=$_gw" >>$TARGETDIR/etc/dhcpcd.conf
echo "static domain_name_servers=$_dns1 $_dns2" >>$TARGETDIR/etc/dhcpcd.conf echo "static domain_name_servers=$_dns1 $_dns2" >>$TARGETDIR/etc/dhcpcd.conf
chroot $TARGETDIR systemctl enable dhcpcd.service >$LOG 2>&1 enable_dhcpd
fi fi
fi fi