mirror of
https://github.com/CCLeonOS/LeonOS.git
synced 2026-03-03 15:17:01 +00:00
refactor: 移除LeonOS的管理员登录功能并更新版本号
移除bios.lua中的管理员登录验证逻辑和installer.lua中的管理员账户创建功能 将系统版本号从Alpha 1.1更新至1.6.0
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
_G._HOST = _G._HOST .. " (LeonOS Alpha 1.1)"
|
_G._HOST = _G._HOST .. " (LeonOS 1.6.0)"
|
||||||
|
|
||||||
local fs = rawget(_G, "fs")
|
local fs = rawget(_G, "fs")
|
||||||
|
|
||||||
@@ -184,31 +184,6 @@ end
|
|||||||
|
|
||||||
expect = require("cc.expect").expect
|
expect = require("cc.expect").expect
|
||||||
|
|
||||||
-- Admin login verification
|
|
||||||
local tu = require("rom.apis.textutils")
|
|
||||||
local admin_username = settings.get("LeonOS.users.admin.username")
|
|
||||||
local admin_password = settings.get("LeonOS.users.admin.password")
|
|
||||||
|
|
||||||
if admin_username then
|
|
||||||
term.clear()
|
|
||||||
tu.coloredPrint(colors.yellow, "LeonOS Login\n=======================")
|
|
||||||
tu.coloredPrint("Username: ", colors.lightBlue, admin_username)
|
|
||||||
|
|
||||||
if admin_password then
|
|
||||||
tu.coloredPrint("Password: ")
|
|
||||||
local input_password = read(nil, {}, nil, true) -- Use password mode
|
|
||||||
|
|
||||||
while input_password ~= admin_password do
|
|
||||||
tu.coloredPrint(colors.red, "Incorrect password!\n")
|
|
||||||
tu.coloredPrint("Password: ")
|
|
||||||
input_password = read(nil, {}, nil, true)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
tu.coloredPrint(colors.green, "No password set. Press Enter to continue.")
|
|
||||||
read()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local thread = require("rc.thread")
|
local thread = require("rc.thread")
|
||||||
|
|
||||||
thread.start()
|
thread.start()
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ end
|
|||||||
print("[Installer] Loading done.")
|
print("[Installer] Loading done.")
|
||||||
term.at(1,1).clear()
|
term.at(1,1).clear()
|
||||||
tu.coloredPrint(colors.yellow,
|
tu.coloredPrint(colors.yellow,
|
||||||
"LeonOS Installer (Alpha 1.1)\n=======================")
|
"LeonOS Installer\n=======================")
|
||||||
print("You are going to install LeonOS to your computer.")
|
print("You are going to install LeonOS to your computer.")
|
||||||
print("This will overwrite any existing files in the installation directory.")
|
print("This will overwrite any existing files in the installation directory.")
|
||||||
tu.coloredPrint(colors.yellow, "Are you sure? (y/n)")
|
tu.coloredPrint(colors.yellow, "Are you sure? (y/n)")
|
||||||
@@ -86,30 +86,6 @@ if #ROM_DIR == 0 then ROM_DIR = DEFAULT_ROM_DIR end
|
|||||||
ROM_DIR = "/"..shell.resolve(ROM_DIR)
|
ROM_DIR = "/"..shell.resolve(ROM_DIR)
|
||||||
|
|
||||||
settings.set("LeonOS.rom_dir", ROM_DIR)
|
settings.set("LeonOS.rom_dir", ROM_DIR)
|
||||||
|
|
||||||
-- Create admin user
|
|
||||||
print("")
|
|
||||||
tu.coloredPrint(colors.yellow, "Create Administrator Account\n=======================")
|
|
||||||
tu.coloredPrint("Enter admin username: ")
|
|
||||||
local admin_username = read()
|
|
||||||
while #admin_username == 0 do
|
|
||||||
tu.coloredPrint(colors.red, "Username cannot be empty!\n")
|
|
||||||
tu.coloredPrint("Enter admin username: ")
|
|
||||||
admin_username = read()
|
|
||||||
end
|
|
||||||
|
|
||||||
tu.coloredPrint("Enter admin password (leave empty for no password): ")
|
|
||||||
-- Use password mask with "*" character
|
|
||||||
tu.coloredPrint(colors.yellow, "(Password will be hidden)")
|
|
||||||
local admin_password = read(nil, {}, nil, "*") -- Use password mode with "*" mask
|
|
||||||
|
|
||||||
-- Save user info
|
|
||||||
settings.set("LeonOS.users.admin.username", admin_username)
|
|
||||||
if #admin_password > 0 then
|
|
||||||
settings.set("LeonOS.users.admin.password", admin_password)
|
|
||||||
else
|
|
||||||
settings.set("LeonOS.users.admin.password", nil)
|
|
||||||
end
|
|
||||||
settings.save()
|
settings.save()
|
||||||
|
|
||||||
tu.coloredPrint(colors.white, "Installing LeonOS to ", colors.lightBlue,
|
tu.coloredPrint(colors.white, "Installing LeonOS to ", colors.lightBlue,
|
||||||
|
|||||||
Reference in New Issue
Block a user