Skip to content

Commit 6360966

Browse files
committed
Merge branch 'kmscon' into dev
2 parents bf8cefc + caec52c commit 6360966

13 files changed

Lines changed: 113 additions & 5 deletions

File tree

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3+
<fontconfig>
4+
<match>
5+
<test name="family"><string>monospace</string></test>
6+
<edit name="family" mode="prepend" binding="strong">
7+
<string>SauceCodePro Nerd Font Mono</string>
8+
<string>DejaVu Sans Mono</string>
9+
<string>IPAGothic</string>
10+
</edit>
11+
</match>
12+
</fontconfig>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Yamada Hayao
4+
# Twitter: @Hayao0819
5+
# Email : hayao@fascode.net
6+
#
7+
# (c) 2019-2021 Fascode Network.
8+
#
9+
10+
# Copy config file for getty@.service to kmsconvt@.service
11+
if [[ -f "/etc/systemd/system/getty@.service.d/autologin.conf" ]]; then
12+
mkdir -p "/etc/systemd/system/kmsconvt@.service.d/"
13+
cp "/etc/systemd/system/getty@.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@.service.d/autologin.conf"
14+
fi
15+
16+
# Disable default tty
17+
_systemd_service disable "getty@tty1.service" "getty@.service"
18+
_systemd_service enable "kmsconvt@tty1.service"
19+
_systemd_service enable "kmsconvt@tty2.service"
20+
21+
22+
# Do not run setterm
23+
remove /etc/profile.d/disable-beep.sh
24+
25+
# Run KMSCON for all tty
26+
ln -s "/usr/lib/systemd/system/kmsconvt@.service" "/etc/systemd/system/autovt@.service"

modules/kmscon/alteriso

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
alteriso=3.1

modules/kmscon/architecture

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#
2+
# Yamada Hayao
3+
# Twitter: @Hayao0819
4+
# Email : hayao@fascode.net
5+
#
6+
# (c) 2019-2021 Fascode Network.
7+
#
8+
# Supported architecture list
9+
10+
x86_64
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# Alter Linux package list
3+
#
4+
# Yamada Hayao
5+
# Twitter: @Hayao0819
6+
# Email : hayao@fascode.net
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# kmscon packages
11+
12+
#-- kmscon --#
13+
kmscon
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# Alter Linux package list
3+
#
4+
# Yamada Hayao
5+
# Twitter: @Hayao0819
6+
# Email : hayao@fascode.net
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# kmscon packages
11+
12+
#-- kmscon --#
13+
kmscon
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# Alter Linux package list
3+
#
4+
# Yamada Hayao
5+
# Twitter: @Hayao0819
6+
# Email : hayao@fascode.net
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# kmscon packages
11+
12+
#-- Fonts --#
13+
nerd-fonts-source-code-pro
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# Alter Linux package list
3+
#
4+
# Yamada Hayao
5+
# Twitter: @Hayao0819
6+
# Email : hayao@fascode.net
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# kmscon packages
11+
12+
#-- Fonts --#
13+
nerd-fonts-source-code-pro

modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ _systemd_service enable ufw.service
2020

2121

2222
# Added autologin group to auto login
23-
groupadd autologin
23+
_groupadd autologin
2424
usermod -aG autologin ${username}
2525

2626

modules/share/airootfs.any/root/functions.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ function installedpkg () {
5252
fi
5353
}
5454

55+
# Add group if it does not exist
56+
_groupadd(){
57+
cut -d ":" -f 1 < "/etc/group" | grep -qx "${1}" && return 0 || groupadd "${1}"
58+
}
59+
5560
# Create a user.
5661
# create_user <username> <password>
5762
function create_user () {
@@ -74,7 +79,7 @@ function create_user () {
7479

7580
if ! user_check "${_username}"; then
7681
useradd -m -s ${usershell} ${_username}
77-
groupadd sudo
82+
_groupadd sudo
7883
usermod -U -g ${_username} ${_username}
7984
usermod -aG sudo ${_username}
8085
usermod -aG storage ${_username}

0 commit comments

Comments
 (0)