Skip to content

Commit

Permalink
~现在服务启动后会自动清理缓存目录的内核文件而不是压缩包文件
Browse files Browse the repository at this point in the history
~修复部分linux设备开机自启出错以及用户添加出错的bug
  • Loading branch information
juewuy committed Feb 9, 2024
1 parent c0adaf5 commit c54bd8f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
1 change: 0 additions & 1 deletion scripts/getdate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,6 @@ getcore(){ #下载内核文件
else
tar -zcf ${BINDIR}/CrashCore.tar.gz ${tar_para} -C ${TMPDIR} CrashCore
fi
rm -rf ${TMPDIR}/CrashCore.tar.gz #小闪存模式清理文件优化内存占用
setconfig crashcore $crashcore
setconfig core_v $core_v
setconfig custcorelink $custcorelink
Expand Down
4 changes: 3 additions & 1 deletion scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ else
[ -w /etc/systemd/system ] && sysdir=/etc/systemd/system
if [ -n "$sysdir" -a "$USER" = "root" -a "$(cat /proc/1/comm)" = "systemd" ];then
#创建shellcrash用户
ckcmd userdel && userdel shellcrash 2>/dev/null
sed -i '/0:7890/d' /etc/passwd
sed -i '/x:7890/d' /etc/group
if type useradd >/dev/null 2>&1; then
Expand All @@ -173,9 +174,10 @@ else
sed -i "s%/etc/ShellCrash%$CRASHDIR%g" $sysdir/shellcrash.service
rm -rf $sysdir/clash.service #旧版文件清理
systemctl daemon-reload
fi
else
#设为保守模式启动
setconfig start_old 已开启
fi
fi
#修饰文件及版本号
command -v bash >/dev/null 2>&1 && shtype=bash || shtype=sh
Expand Down
4 changes: 3 additions & 1 deletion scripts/menu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -990,11 +990,13 @@ setboot(){ #启动相关设置
2)
if [ "$start_old" = "未开启" ] > /dev/null 2>&1; then
echo -e "\033[33m改为使用保守模式启动服务!!\033[0m"
[ -d /etc/rc.d ] && cd /etc/rc.d && rm -rf *shellcrash > /dev/null 2>&1 && cd - >/dev/null
ckcmd systemctl && systemctl disable shellcrash.service > /dev/null 2>&1
start_old=已开启
setconfig start_old $start_old
${CRASHDIR}/start.sh stop
else
if [ -n "$(pidof procd)" -o -w /etc/systemd/system -o -w /usr/lib/systemd/system ];then
if [ "$(cat /proc/1/comm)" = "procd" -o "$(cat /proc/1/comm)" = "systemd" ];then
echo -e "\033[32m改为使用系统守护进程启动服务!!\033[0m"
${CRASHDIR}/start.sh cronset "ShellCrash初始化"
start_old=未开启
Expand Down
3 changes: 2 additions & 1 deletion scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,6 @@ core_check(){ #检查及下载内核文件
else
mv -f ${TMPDIR}/core_new ${TMPDIR}/CrashCore
mv -f ${TMPDIR}/CrashCore.tar.gz ${BINDIR}/CrashCore.tar.gz
rm -rf ${TMPDIR}/CrashCore.tar.gz #小闪存模式清理文件优化内存占用
setconfig COMMAND "$COMMAND" ${CRASHDIR}/configs/command.env && source ${CRASHDIR}/configs/command.env
setconfig crashcore $crashcore
setconfig core_v $core_v
Expand Down Expand Up @@ -1637,6 +1636,7 @@ bfstart(){ #启动前
#添加shellcrash用户
[ -n "$(echo $local_type | grep '增强模式')" -o "$(cat /proc/1/comm)" = "systemd" ] && \
[ -z "$(id shellcrash 2>/dev/null | grep 'root')" ] && {
ckcmd userdel && userdel shellcrash 2>/dev/null
sed -i '/0:7890/d' /etc/passwd
sed -i '/x:7890/d' /etc/group
if ckcmd useradd; then
Expand Down Expand Up @@ -1672,6 +1672,7 @@ afstart(){ #启动后
i=$((i+1))
done
if [ -n "$test" -o -n "$(pidof CrashCore)" ];then
rm -rf ${TMPDIR}/CrashCore #删除缓存目录内核文件
#设置DNS转发
start_dns(){
[ "$dns_mod" != "fake-ip" ] && [ "$cn_ip_route" = "已开启" ] && cn_ip_route
Expand Down

0 comments on commit c54bd8f

Please sign in to comment.