Update
This commit is contained in:
parent
5d48267621
commit
fb1fc19122
|
@ -16,17 +16,16 @@ EOF
|
|||
|
||||
sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
|
||||
|
||||
platform=$XDG_SESSION_TYPE
|
||||
platform="$XDG_SESSION_TYPE"
|
||||
|
||||
if [ -z $platform ]; then
|
||||
platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
|
||||
fi
|
||||
|
||||
if [ -z $platform ]; then
|
||||
sudo -E dbus-launch calamares -D6 >> $log
|
||||
else
|
||||
sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
|
||||
fi
|
||||
|
||||
if [ -n "$platform" ] && [ "$platform" == "wayland" ]; then
|
||||
sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
|
||||
else
|
||||
sudo -E dbus-launch calamares -D6 >> $log
|
||||
fi
|
||||
|
||||
}
|
||||
|
|
|
@ -91,17 +91,16 @@ EOF
|
|||
|
||||
sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
|
||||
|
||||
platform=$XDG_SESSION_TYPE
|
||||
platform="$XDG_SESSION_TYPE"
|
||||
|
||||
if [ -z $platform ]; then
|
||||
platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
|
||||
fi
|
||||
|
||||
if [ -z $platform ]; then
|
||||
sudo -E dbus-launch calamares -D6 >> $log
|
||||
else
|
||||
sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
|
||||
fi
|
||||
|
||||
if [ -n "$platform" ] && [ "$platform" == "wayland" ]; then
|
||||
sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
|
||||
else
|
||||
sudo -E dbus-launch calamares -D6 >> $log
|
||||
fi
|
||||
|
||||
# &
|
||||
|
|
|
@ -507,7 +507,6 @@ partimage
|
|||
|
||||
## Display manager
|
||||
sddm
|
||||
plasma-framework
|
||||
plasma-integration
|
||||
plasma-workspace
|
||||
plasma-browser-integration
|
||||
|
|
Loading…
Reference in New Issue