Skip to content

Commit 28ebd52

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents db6ab0a + 2eb6608 commit 28ebd52

9 files changed

Lines changed: 745 additions & 28 deletions

File tree

‎build.sh‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,22 @@ umount_trap() {
381381
}
382382

383383

384+
# 作業ディレクトリを削除
385+
remove_work() {
386+
remove "$(ls ${work_dir}/* | grep "build.make")"
387+
remove "${work_dir}"/pacman-*.conf
388+
remove "${work_dir}/efiboot"
389+
remove "${work_dir}/iso"
390+
remove "${work_dir}/${arch}"
391+
remove "${work_dir}/packages.list"
392+
remove "${work_dir}/packages-full.list"
393+
remove "${rebuildfile}"
394+
if [[ -z $(ls $(realpath "${work_dir}")/* 2>/dev/null) ]]; then
395+
remove ${work_dir}
396+
fi
397+
}
398+
399+
384400
# Preparation for build
385401
prepare_build() {
386402
# Check architecture for each channel
@@ -407,17 +423,7 @@ prepare_build() {
407423
local trap_remove_work
408424
trap_remove_work() {
409425
local status=${?}
410-
remove "$(ls ${work_dir}/* | grep "build.make")"
411-
remove "${work_dir}"/pacman-*.conf
412-
remove "${work_dir}/efiboot"
413-
remove "${work_dir}/iso"
414-
remove "${work_dir}/${arch}"
415-
remove "${work_dir}/packages.list"
416-
remove "${work_dir}/packages-full.list"
417-
remove "${rebuildfile}"
418-
if [[ -z $(ls $(realpath "${work_dir}")/* 2>/dev/null) ]]; then
419-
remove ${work_dir}
420-
fi
426+
remove_work
421427
exit ${status}
422428
}
423429
trap 'trap_remove_work' 1 2 3 15
@@ -1144,20 +1150,6 @@ make_prepare() {
11441150
# Build ISO
11451151
make_iso() {
11461152
${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_filename}"
1147-
1148-
if [[ ${cleaning} = true ]]; then
1149-
remove "$(ls ${work_dir}/* | grep "build.make")"
1150-
remove "${work_dir}"/pacman-*.conf
1151-
remove "${work_dir}/efiboot"
1152-
remove "${work_dir}/iso"
1153-
remove "${work_dir}/${arch}"
1154-
remove "${work_dir}/packages.list"
1155-
remove "${work_dir}/packages-full.list"
1156-
remove "${rebuildfile}"
1157-
if [[ -z $(ls $(realpath "${work_dir}")/* 2>/dev/null) ]]; then
1158-
remove ${work_dir}
1159-
fi
1160-
fi
11611153
_msg_info "The password for the live user and root is ${password}."
11621154
}
11631155

@@ -1401,3 +1393,7 @@ run_once make_efi
14011393
run_once make_efiboot
14021394
run_once make_prepare
14031395
run_once make_iso
1396+
1397+
if [[ ${cleaning} = true ]]; then
1398+
remove_work
1399+
fi

‎channels/lxde/airootfs.i686/etc/lightdm/lightdm.conf‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
#
2+
# General configuration
3+
#
4+
# start-default-seat = True to always start one seat if none are defined in the configuration
5+
# greeter-user = User to run greeter as
6+
# minimum-display-number = Minimum display number to use for X servers
7+
# minimum-vt = First VT to run displays on
8+
# lock-memory = True to prevent memory from being paged to disk
9+
# user-authority-in-system-dir = True if session authority should be in the system location
10+
# guest-account-script = Script to be run to setup guest account
11+
# logind-check-graphical = True to on start seats that are marked as graphical by logind
12+
# log-directory = Directory to log information to
13+
# run-directory = Directory to put running state in
14+
# cache-directory = Directory to cache to
15+
# sessions-directory = Directory to find sessions
16+
# remote-sessions-directory = Directory to find remote sessions
17+
# greeters-directory = Directory to find greeters
18+
# backup-logs = True to move add a .old suffix to old log files when opening new ones
19+
# dbus-service = True if LightDM provides a D-Bus service to control it
20+
#
21+
[LightDM]
22+
#start-default-seat=true
23+
#greeter-user=lightdm
24+
#minimum-display-number=0
25+
#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
26+
#lock-memory=true
27+
#user-authority-in-system-dir=false
28+
#guest-account-script=guest-account
29+
#logind-check-graphical=false
30+
#log-directory=/var/log/lightdm
31+
run-directory=/run/lightdm
32+
#cache-directory=/var/cache/lightdm
33+
#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
34+
#remote-sessions-directory=/usr/share/lightdm/remote-sessions
35+
#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
36+
#backup-logs=true
37+
#dbus-service=true
38+
39+
#
40+
# Seat configuration
41+
#
42+
# Seat configuration is matched against the seat name glob in the section, for example:
43+
# [Seat:*] matches all seats and is applied first.
44+
# [Seat:seat0] matches the seat named "seat0".
45+
# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
46+
#
47+
# type = Seat type (local, xremote)
48+
# pam-service = PAM service to use for login
49+
# pam-autologin-service = PAM service to use for autologin
50+
# pam-greeter-service = PAM service to use for greeters
51+
# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
52+
# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
53+
# xserver-config = Config file to pass to X server
54+
# xserver-layout = Layout to pass to X server
55+
# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
56+
# xserver-share = True if the X server is shared for both greeter and session
57+
# xserver-hostname = Hostname of X server (only for type=xremote)
58+
# xserver-display-number = Display number of X server (only for type=xremote)
59+
# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
60+
# xdmcp-port = XDMCP UDP/IP port to communicate on
61+
# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
62+
# greeter-session = Session to load for greeter
63+
# greeter-hide-users = True to hide the user list
64+
# greeter-allow-guest = True if the greeter should show a guest login option
65+
# greeter-show-manual-login = True if the greeter should offer a manual login option
66+
# greeter-show-remote-login = True if the greeter should offer a remote login option
67+
# user-session = Session to load for users
68+
# allow-user-switching = True if allowed to switch users
69+
# allow-guest = True if guest login is allowed
70+
# guest-session = Session to load for guests (overrides user-session)
71+
# session-wrapper = Wrapper script to run session with
72+
# greeter-wrapper = Wrapper script to run greeter with
73+
# guest-wrapper = Wrapper script to run guest sessions with
74+
# display-setup-script = Script to run when starting a greeter session (runs as root)
75+
# display-stopped-script = Script to run after stopping the display server (runs as root)
76+
# greeter-setup-script = Script to run when starting a greeter (runs as root)
77+
# session-setup-script = Script to run when starting a user session (runs as root)
78+
# session-cleanup-script = Script to run when quitting a user session (runs as root)
79+
# autologin-guest = True to log in as guest by default
80+
# autologin-user = User to log in with by default (overrides autologin-guest)
81+
# autologin-user-timeout = Number of seconds to wait before loading default user
82+
# autologin-session = Session to load for automatic login (overrides user-session)
83+
# autologin-in-background = True if autologin session should not be immediately activated
84+
# exit-on-failure = True if the daemon should exit if this seat fails
85+
#
86+
[Seat:*]
87+
#type=local
88+
#pam-service=lightdm
89+
#pam-autologin-service=lightdm-autologin
90+
#pam-greeter-service=lightdm-greeter
91+
#xserver-command=X
92+
#xmir-command=Xmir
93+
#xserver-config=
94+
#xserver-layout=
95+
#xserver-allow-tcp=false
96+
#xserver-share=true
97+
#xserver-hostname=
98+
#xserver-display-number=
99+
#xdmcp-manager=
100+
#xdmcp-port=177
101+
#xdmcp-key=
102+
greeter-session=lightdm-slick-greeter
103+
#greeter-hide-users=false
104+
#greeter-allow-guest=true
105+
#greeter-show-manual-login=false
106+
#greeter-show-remote-login=true
107+
#user-session=default
108+
#allow-user-switching=true
109+
#allow-guest=true
110+
#guest-session=
111+
session-wrapper=/etc/lightdm/Xsession
112+
#greeter-wrapper=
113+
#guest-wrapper=
114+
#display-setup-script=
115+
#display-stopped-script=
116+
#greeter-setup-script=
117+
#session-setup-script=
118+
#session-cleanup-script=
119+
#autologin-guest=false
120+
autologin-user=%USERNAME%
121+
autologin-user-timeout=0
122+
#autologin-in-background=false
123+
autologin-session=lxde
124+
#exit-on-failure=false
125+
126+
#
127+
# XDMCP Server configuration
128+
#
129+
# enabled = True if XDMCP connections should be allowed
130+
# port = UDP/IP port to listen for connections on
131+
# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
132+
# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
133+
# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
134+
#
135+
# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn. Alternatively
136+
# it can be a word and the first 7 characters are used as the key.
137+
#
138+
[XDMCPServer]
139+
#enabled=false
140+
#port=177
141+
#listen-address=
142+
#key=
143+
#hostname=
144+
145+
#
146+
# VNC Server configuration
147+
#
148+
# enabled = True if VNC connections should be allowed
149+
# command = Command to run Xvnc server with
150+
# port = TCP/IP port to listen for connections on
151+
# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
152+
# width = Width of display to use
153+
# height = Height of display to use
154+
# depth = Color depth of display to use
155+
#
156+
[VNCServer]
157+
#enabled=false
158+
#command=Xvnc
159+
#port=5900
160+
#listen-address=
161+
#width=1024
162+
#height=768
163+
#depth=8

‎channels/lxde/airootfs.i686/root/customize_airootfs_lxde.sh‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,21 @@ if [[ "${japanese}" = true ]]; then
9898
else
9999
remove /etc/skel/Desktop/welcome-to-alter-jp.desktop
100100
remove /home/${username}/Desktop/welcome-to-alter-jp.desktop
101-
fi
101+
fi
102+
103+
104+
# Added autologin group to auto login
105+
groupadd autologin
106+
usermod -aG autologin ${username}
107+
108+
109+
# Enable LightDM to auto login
110+
if [[ "${boot_splash}" = true ]]; then
111+
systemctl enable lightdm.service
112+
else
113+
systemctl enable lightdm-plymouth.service
114+
fi
115+
116+
117+
# Replace auto login user
118+
sed -i s/%USERNAME%/${username}/g /etc/lightdm/lightdm.conf

0 commit comments

Comments
 (0)