diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install index 5b96019..b697339 100644 --- a/modules/40-basesystem/install +++ b/modules/40-basesystem/install @@ -20,7 +20,7 @@ echo "LANG=en_US.UTF-8" > /etc/locale.conf echo "KEYMAP=${cfg[lang_console]}" > /etc/vconsole.conf echo "LANG=${cfg[lang]}.UTF-8" > /etc/locale-user.conf -cp -a /etc/profile.d/locale.sh "${dest}"/etc/profile.d/zz-locale-user.sh +cp -a /etc/profile.d/locale.sh /etc/profile.d/zz-locale-user.sh sed -i 's/locale.conf/locale-user.conf/' /etc/profile.d/zz-locale-user.sh sed -i '/^if/i [ "$(id -u)" -eq 0 ] && return' /etc/profile.d/zz-locale-user.sh @@ -49,22 +49,25 @@ echo 'ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED} echo 'ACTION=="add|change", KERNEL=="sd[a-z]|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline"' > /etc/udev/rules.d/60-ioschedulers.rules mkdir -p /etc/bash/bashrc.d/ -{ echo "[ \"\$(id -u)\" -eq 0 ] && return"; -echo 'alias xu="sudo voidupdate"'; -echo 'alias xr="sudo xbps-install -R"'; -echo 'alias xs="xbps-query -Rs"'; -echo 'alias xk="sudo vkpurge rm all"'; -echo 'echo "xu = sudo voidupdate zum updaten"'; -echo 'echo "xi = sudo xbps-install -S zum installieren"'; -echo 'echo "xr = sudo xbps-install -R zum deinstallieren"'; -echo 'echo "xs = xbps-query -Rs zum suchen"'; +cat <<'EOF' > /etc/bash/bashrc.d/xbps-aliase.sh +[ "$(id -u)" -eq 0 ] && return +alias xu="sudo void-update" +alias xr="sudo xbps-remove -R" +alias xs="xbps-query -Rs" +alias backup="sudo void-backup" +echo "xu = sudo void-update zum updaten" +echo "xi = sudo xbps-install -S zum installieren" +echo "xr = sudo xbps-remove -R zum deinstallieren" +echo "xs = xbps-query -Rs zum suchen" +echo "backup = sudo void-backup um ein backup zu machen" +EOF -echo "${cfg[hostname]}" > "${dest}/etc/hostname" -ln -sf "/usr/share/zoneinfo/${cfg[timezone]}" "${dest}/etc/localtime" -sed -i "s/#HOSTNAME=\"void-live\"/HOSTNAME=${cfg[hostname]}/g" "${dest}/etc/rc.conf" -sed -i "s/Europe\/Madrid/${cfg[timezone]//\//\\/}/" "${dest}/etc/rc.conf" -sed -i "/HARDWARECLOCK/s/^#//g" "${dest}/etc/rc.conf" -sed -i "/FONT=/s/^#//g" "${dest}/etc/rc.conf" +echo "${cfg[hostname]}" > /etc/hostname +ln -sf "/usr/share/zoneinfo/${cfg[timezone]}" /etc/localtime +sed -i "s/#HOSTNAME=\"void-live\"/HOSTNAME=${cfg[hostname]}/g" /etc/rc.conf +sed -i "s/Europe\/Madrid/${cfg[timezone]//\//\\/}/" /etc/rc.conf +sed -i "/HARDWARECLOCK/s/^#//g" /etc/rc.conf +sed -i "/FONT=/s/^#//g" /etc/rc.conf if [[ ! ${cfg[fde_key_store]} == "none" ]]; then echo "read -p \"Change PW for disk? y/n \" answer" > /etc/runit/core-services/99-changepwdisk.sh