Skip to content

Update live_user in desktop scripts #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from Sep 9, 2024
Merged

Update live_user in desktop scripts #200

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1144a86
Update mate.sh
Sep 9, 2024
3190908
Update live_user in mate_oem.sh
Sep 9, 2024
0238c3e
Update live_user in xfce.sh
Sep 9, 2024
862ad67
Update live_user in autologin.sh
Sep 9, 2024
34b0a1a
Update live_user in setuser.sh
Sep 9, 2024
1d77e92
Ensure unmount of dev and release before exporting ZFS pool in boot()
Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions desktop_config/mate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ lightdm_setup()

setup_xinit()
{
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.SettingsDaemon.plugins.housekeeping active true &' > /home/${liveuser}/.xinitrc"
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.screensaver lock-enabled false &' >> /home/${liveuser}/.xinitrc"
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.lockdown disable-lock-screen true &' >> /home/${liveuser}/.xinitrc"
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.lockdown disable-user-switching true &' >> /home/${liveuser}/.xinitrc"
chroot "${release}" su "${liveuser}" -c "echo 'exec ck-launch-session mate-session' >> /home/${liveuser}/.xinitrc"
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.SettingsDaemon.plugins.housekeeping active true &' > /home/${live_user}/.xinitrc"
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.screensaver lock-enabled false &' >> /home/${live_user}/.xinitrc"
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.lockdown disable-lock-screen true &' >> /home/${live_user}/.xinitrc"
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.lockdown disable-user-switching true &' >> /home/${live_user}/.xinitrc"
chroot "${release}" su "${live_user}" -c "echo 'exec ck-launch-session mate-session' >> /home/${live_user}/.xinitrc"
echo "exec ck-launch-session mate-session" > "${release}/root/.xinitrc"
echo "exec ck-launch-session mate-session" > "${release}/usr/share/skel/dot.xinitrc"
}
Expand All @@ -29,4 +29,4 @@ community_setup_liveuser
community_setup_autologin
lightdm_setup
setup_xinit
final_setup
final_setup
8 changes: 4 additions & 4 deletions desktop_config/mate_oem.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ lightdm_setup()

setup_xinit()
{
echo "exec marco &" > "${release}/home/${liveuser}/.xinitrc"
echo "exec feh --bg-fill /usr/local/share/backgrounds/ghostbsd/Lake_View.jpg &" >> "${release}/home/${liveuser}/.xinitrc"
echo "exec sudo install-station" >> "${release}/home/${liveuser}/.xinitrc"
chmod 765 "${release}/home/${liveuser}/.xinitrc"
echo "exec marco &" > "${release}/home/${live_user}/.xinitrc"
echo "exec feh --bg-fill /usr/local/share/backgrounds/ghostbsd/Lake_View.jpg &" >> "${release}/home/${live_user}/.xinitrc"
echo "exec sudo install-station" >> "${release}/home/${live_user}/.xinitrc"
chmod 765 "${release}/home/${live_user}/.xinitrc"
# root
echo "exec marco &" > "${release}/root/.xinitrc"
echo "exec feh --bg-fill /usr/local/share/backgrounds/ghostbsd/Lake_View.jpg &" >> "${release}/root/.xinitrc"
Expand Down
2 changes: 1 addition & 1 deletion desktop_config/xfce.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ lightdm_setup()

setup_xinit()
{
chroot "${release}" su "${liveuser}" -c "echo 'exec ck-launch-session startxfce4' > /home/${liveuser}/.xinitrc"
chroot "${release}" su "${live_user}" -c "echo 'exec ck-launch-session startxfce4' > /home/${live_user}/.xinitrc"
echo "exec ck-launch-session startxfce4" > "${release}/root/.xinitrc"
echo "exec ck-launch-session startxfce4" > "${release}/root/.xinitrc"
echo "exec ck-launch-session startxfce4" > "${release}/usr/share/skel/dot.xinitrc"
Expand Down