Installer
/
melawy-archiso-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

This commit is contained in:
Valeria Fadeeva 2023-10-20 00:46:48 +05:00
parent 5d48267621
commit fb1fc19122
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
airootfs/usr/local/bin/calamares-offline
View File

@ -16,17 +16,16 @@ EOF
sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
platform=$XDG_SESSION_TYPE platform="$XDG_SESSION_TYPE"
if [ -z $platform ]; then if [ -z $platform ]; then
platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2) platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
fi
if [ -z $platform ]; then if [ -n "$platform" ] && [ "$platform" == "wayland" ]; then
sudo -E dbus-launch calamares -D6 >> $log sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
else else
sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log sudo -E dbus-launch calamares -D6 >> $log
fi
fi fi
} }

13
airootfs/usr/local/bin/calamares-online
View File

@ -91,17 +91,16 @@ EOF
sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
platform=$XDG_SESSION_TYPE platform="$XDG_SESSION_TYPE"
if [ -z $platform ]; then if [ -z $platform ]; then
platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2) platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
fi
if [ -z $platform ]; then if [ -n "$platform" ] && [ "$platform" == "wayland" ]; then
sudo -E dbus-launch calamares -D6 >> $log sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
else else
sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log sudo -E dbus-launch calamares -D6 >> $log
fi
fi fi
# & # &

1
packages.x86_64
View File

@ -507,7 +507,6 @@ partimage
## Display manager ## Display manager
sddm sddm
plasma-framework
plasma-integration plasma-integration
plasma-workspace plasma-workspace
plasma-browser-integration plasma-browser-integration