Skip to content

Commit 328abfa

Browse files
ericbsdericbsd
authored
Merge pull request #200 from vimanuelt/master
Update live_user in desktop scripts
2 parents 94b7718 + 1d77e92 commit 328abfa

File tree

6 files changed

+47
-40
lines changed

6 files changed

+47
-40
lines changed

‎build.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,14 @@ boot()
270270
cp LICENSE ${cd_root}/LICENSE
271271
cp -R boot/ ${cd_root}/boot/
272272
mkdir ${cd_root}/etc
273-
cd "${cwd}" && zpool export ghostbsd && while zpool status ghostbsd >/dev/null; do :; done 2>/dev/null
273+
274+
# Try to unmount dev and release if mounted
275+
umount ${release}/dev >/dev/null 2>/dev/null || true
276+
umount ${release} >/dev/null 2>/dev/null || true
277+
278+
# Export ZFS pool and ensure it's clean
279+
zpool export ghostbsd
280+
while zpool status ghostbsd >/dev/null; do :; done 2>/dev/null
274281
}
275282

276283
image()

‎common_config/autologin.sh

+15-15
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ set -e -u
55
ghostbsd_setup_autologin()
66
{
77
{
8-
echo "# ${liveuser} user autologin"
9-
echo "${liveuser}:\\"
10-
echo ":al=${liveuser}:ht:np:sp#115200:"
8+
echo "# ${live_user} user autologin"
9+
echo "${live_user}:\\"
10+
echo ":al=${live_user}:ht:np:sp#115200:"
1111
} >> "${release}/etc/gettytab"
12-
sed -i "" "/ttyv0/s/Pc/${liveuser}/g" "${release}/etc/ttys"
13-
mkdir -p "${release}/home/${liveuser}/.config/fish"
12+
sed -i "" "/ttyv0/s/Pc/${live_user}/g" "${release}/etc/ttys"
13+
mkdir -p "${release}/home/${live_user}/.config/fish"
1414
printf "set tty (tty)
1515
if test \$tty = \"/dev/ttyv0\"
1616
sudo xconfig auto
@@ -21,8 +21,8 @@ ghostbsd_setup_autologin()
2121
sleep 1
2222
startx
2323
end
24-
" > "${release}/home/${liveuser}/.config/fish/config.fish"
25-
chmod 765 "${release}/home/${liveuser}/.config/fish/config.fish"
24+
" > "${release}/home/${live_user}/.config/fish/config.fish"
25+
chmod 765 "${release}/home/${live_user}/.config/fish/config.fish"
2626

2727
# setup root
2828
mkdir -p "${release}/root/.config/fish"
@@ -37,12 +37,12 @@ ghostbsd_setup_autologin()
3737
community_setup_autologin()
3838
{
3939
{
40-
echo "# ${liveuser} user autologin"
41-
echo "${liveuser}:\\"
42-
echo ":al=${liveuser}:ht:np:sp#115200:"
40+
echo "# ${live_user} user autologin"
41+
echo "${live_user}:\\"
42+
echo ":al=${live_user}:ht:np:sp#115200:"
4343
} >> "${release}/etc/gettytab"
44-
sed -i "" "/ttyv0/s/Pc/${liveuser}/g" "${release}/etc/ttys"
45-
mkdir -p "${release}/home/${liveuser}/.config/fish"
44+
sed -i "" "/ttyv0/s/Pc/${live_user}/g" "${release}/etc/ttys"
45+
mkdir -p "${release}/home/${live_user}/.config/fish"
4646
if [ -f "${release}/usr/local/bin/xconfig" ] ; then
4747
printf "if not test -f /tmp/.xstarted
4848
touch /tmp/.xstarted
@@ -57,7 +57,7 @@ community_setup_autologin()
5757
startx
5858
end
5959
end
60-
" > "${release}/home/${liveuser}/.config/fish/config.fish"
61-
chmod 765 "${release}/home/${liveuser}/.config/fish/config.fish"
60+
" > "${release}/home/${live_user}/.config/fish/config.fish"
61+
chmod 765 "${release}/home/${live_user}/.config/fish/config.fish"
6262
fi
63-
}
63+
}

‎common_config/setuser.sh

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ set -e -u
55
set_user()
66
{
77
chroot "${release}" pw usermod -s /usr/local/bin/fish -n root
8-
chroot "${release}" pw useradd "${liveuser}" \
9-
-c "GhostBSD Live User" -d "/home/${liveuser}" \
8+
chroot "${release}" pw useradd "${live_user}" \
9+
-c "GhostBSD Live User" -d "/home/${live_user}" \
1010
-g wheel -G operator -m -s /usr/local/bin/fish -k /usr/share/skel -w none
1111
}
1212

1313
ghostbsd_setup_liveuser()
1414
{
1515
set_user
16-
chroot "${release}" su "${liveuser}" -c "mkdir -p /home/${liveuser}/.config/gtk-3.0"
17-
chroot "${release}" su "${liveuser}" -c "echo '[Settings]' >> /home/${liveuser}/.config/gtk-3.0/settings.ini"
18-
chroot "${release}" su "${liveuser}" -c "echo 'gtk-application-prefer-dark-theme = false' >> /home/${liveuser}/.config/gtk-3.0/settings.ini"
19-
chroot "${release}" su "${liveuser}" -c "echo 'gtk-theme-name = Vimix' >> /home/${liveuser}/.config/gtk-3.0/settings.ini"
20-
chroot "${release}" su "${liveuser}" -c "echo 'gtk-icon-theme-name = Vivacious-Colors-Dark' >> /home/${liveuser}/.config/gtk-3.0/settings.ini"
21-
chroot "${release}" su "${liveuser}" -c "echo 'gtk-font-name = Droid Sans Bold 12' >> /home/${liveuser}/.config/gtk-3.0/settings.ini"
16+
chroot "${release}" su "${live_user}" -c "mkdir -p /home/${live_user}/.config/gtk-3.0"
17+
chroot "${release}" su "${live_user}" -c "echo '[Settings]' >> /home/${live_user}/.config/gtk-3.0/settings.ini"
18+
chroot "${release}" su "${live_user}" -c "echo 'gtk-application-prefer-dark-theme = false' >> /home/${live_user}/.config/gtk-3.0/settings.ini"
19+
chroot "${release}" su "${live_user}" -c "echo 'gtk-theme-name = Vimix' >> /home/${live_user}/.config/gtk-3.0/settings.ini"
20+
chroot "${release}" su "${live_user}" -c "echo 'gtk-icon-theme-name = Vivacious-Colors-Dark' >> /home/${live_user}/.config/gtk-3.0/settings.ini"
21+
chroot "${release}" su "${live_user}" -c "echo 'gtk-font-name = Droid Sans Bold 12' >> /home/${live_user}/.config/gtk-3.0/settings.ini"
2222
mkdir -p "${release}/root/.config/gtk-3.0"
2323
{
2424
echo '[Settings]'
@@ -32,11 +32,11 @@ ghostbsd_setup_liveuser()
3232
community_setup_liveuser()
3333
{
3434
set_user
35-
chroot "${release}" su "${liveuser}" -c "mkdir -p /home/${liveuser}/Desktop"
35+
chroot "${release}" su "${live_user}" -c "mkdir -p /home/${live_user}/Desktop"
3636

3737
if [ -e "${release}/usr/local/share/applications/gbi.desktop" ] ; then
38-
chroot "${release}" su "${liveuser}" -c "cp -af /usr/local/share/applications/gbi.desktop /home/${liveuser}/Desktop"
39-
chroot "${release}" su "${liveuser}" -c "chmod +x /home/${liveuser}/Desktop/gbi.desktop"
40-
sed -i '' -e 's/NoDisplay=true/NoDisplay=false/g' "${release}/home/${liveuser}/Desktop/gbi.desktop"
38+
chroot "${release}" su "${live_user}" -c "cp -af /usr/local/share/applications/gbi.desktop /home/${live_user}/Desktop"
39+
chroot "${release}" su "${live_user}" -c "chmod +x /home/${live_user}/Desktop/gbi.desktop"
40+
sed -i '' -e 's/NoDisplay=true/NoDisplay=false/g' "${release}/home/${live_user}/Desktop/gbi.desktop"
4141
fi
42-
}
42+
}

‎desktop_config/mate.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ lightdm_setup()
1515

1616
setup_xinit()
1717
{
18-
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.SettingsDaemon.plugins.housekeeping active true &' > /home/${liveuser}/.xinitrc"
19-
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.screensaver lock-enabled false &' >> /home/${liveuser}/.xinitrc"
20-
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.lockdown disable-lock-screen true &' >> /home/${liveuser}/.xinitrc"
21-
chroot "${release}" su "${liveuser}" -c "echo 'gsettings set org.mate.lockdown disable-user-switching true &' >> /home/${liveuser}/.xinitrc"
22-
chroot "${release}" su "${liveuser}" -c "echo 'exec ck-launch-session mate-session' >> /home/${liveuser}/.xinitrc"
18+
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.SettingsDaemon.plugins.housekeeping active true &' > /home/${live_user}/.xinitrc"
19+
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.screensaver lock-enabled false &' >> /home/${live_user}/.xinitrc"
20+
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.lockdown disable-lock-screen true &' >> /home/${live_user}/.xinitrc"
21+
chroot "${release}" su "${live_user}" -c "echo 'gsettings set org.mate.lockdown disable-user-switching true &' >> /home/${live_user}/.xinitrc"
22+
chroot "${release}" su "${live_user}" -c "echo 'exec ck-launch-session mate-session' >> /home/${live_user}/.xinitrc"
2323
echo "exec ck-launch-session mate-session" > "${release}/root/.xinitrc"
2424
echo "exec ck-launch-session mate-session" > "${release}/usr/share/skel/dot.xinitrc"
2525
}
@@ -29,4 +29,4 @@ community_setup_liveuser
2929
community_setup_autologin
3030
lightdm_setup
3131
setup_xinit
32-
final_setup
32+
final_setup

‎desktop_config/mate_oem.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ lightdm_setup()
1616

1717
setup_xinit()
1818
{
19-
echo "exec marco &" > "${release}/home/${liveuser}/.xinitrc"
20-
echo "exec feh --bg-fill /usr/local/share/backgrounds/ghostbsd/Lake_View.jpg &" >> "${release}/home/${liveuser}/.xinitrc"
21-
echo "exec sudo install-station" >> "${release}/home/${liveuser}/.xinitrc"
22-
chmod 765 "${release}/home/${liveuser}/.xinitrc"
19+
echo "exec marco &" > "${release}/home/${live_user}/.xinitrc"
20+
echo "exec feh --bg-fill /usr/local/share/backgrounds/ghostbsd/Lake_View.jpg &" >> "${release}/home/${live_user}/.xinitrc"
21+
echo "exec sudo install-station" >> "${release}/home/${live_user}/.xinitrc"
22+
chmod 765 "${release}/home/${live_user}/.xinitrc"
2323
# root
2424
echo "exec marco &" > "${release}/root/.xinitrc"
2525
echo "exec feh --bg-fill /usr/local/share/backgrounds/ghostbsd/Lake_View.jpg &" >> "${release}/root/.xinitrc"

‎desktop_config/xfce.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ lightdm_setup()
1515

1616
setup_xinit()
1717
{
18-
chroot "${release}" su "${liveuser}" -c "echo 'exec ck-launch-session startxfce4' > /home/${liveuser}/.xinitrc"
18+
chroot "${release}" su "${live_user}" -c "echo 'exec ck-launch-session startxfce4' > /home/${live_user}/.xinitrc"
1919
echo "exec ck-launch-session startxfce4" > "${release}/root/.xinitrc"
2020
echo "exec ck-launch-session startxfce4" > "${release}/root/.xinitrc"
2121
echo "exec ck-launch-session startxfce4" > "${release}/usr/share/skel/dot.xinitrc"

0 commit comments

Comments
 (0)