summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/profile/packages/packages-gui.all1
-rw-r--r--configs/profile/root-image/etc/skel/.bash_profile2
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh19
3 files changed, 12 insertions, 10 deletions
diff --git a/configs/profile/packages/packages-gui.all b/configs/profile/packages/packages-gui.all
index 7231c04..0c47945 100644
--- a/configs/profile/packages/packages-gui.all
+++ b/configs/profile/packages/packages-gui.all
@@ -67,3 +67,4 @@ xf86-video-sisusb
xorg-drivers
xorg-server
xorg-xinit
+xorg-xprop
diff --git a/configs/profile/root-image/etc/skel/.bash_profile b/configs/profile/root-image/etc/skel/.bash_profile
index 502a30a..4dfbab5 100644
--- a/configs/profile/root-image/etc/skel/.bash_profile
+++ b/configs/profile/root-image/etc/skel/.bash_profile
@@ -18,4 +18,4 @@ export $(cat /etc/locale.conf)
# launch X
-[ -n "$DESKTOP_SESSION" -a -z "$DISPLAY" -a "$(tty)" = /dev/tty1 ] && exec startx
+[ -n "$DESKTOP_SESSION" -a -z "$DISPLAY" -a "$(tty)" = /dev/tty1 ] && exec startx || cat /etc/motd
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 518436c..2a2886c 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -66,22 +66,23 @@ else # configure GUI login session and live user
else echo "invalid \$iso_init for --autologin '${iso_init}'"
fi
+ # configure welcome news alert
+ sed -i "s|_EDITION_TITLE_|${PRETTY_NAME}|" /usr/bin/autostart.sh
+ sed -i "s|,Don't show this again:0||" /usr/bin/autostart.sh
+ sed -i "s|620x460|620x520|" /usr/bin/autostart.sh
+
# configure desktop environment
- sed -i "s|/news-*|/news-* ~/welcome.txt|" /home/${LIVE_USER}/.config/autostart/autostart.sh
- sed -i "s|_EDITION_TITLE_|${PRETTY_NAME}|" /home/${LIVE_USER}/.config/autostart/autostart.sh
- sed -i "s|,Don't show this again:0||" /home/${LIVE_USER}/.config/autostart/autostart.sh
- sed -i "s|620x460|620x520|" /home/${LIVE_USER}/.config/autostart/autostart.sh
- sed -i "s|/issue-tracker/|/isos/|" /home/${LIVE_USER}/Desktop/bug-tracker.desktop
+ sed -i "s|/issue-tracker/|/isos/|" /home/${LIVE_USER}/Desktop/bug-tracker.desktop
if [[ "${iso_gui}" == 'lxde' ]]
then rm -f /etc/xdg/autostart/octopi-notifier.desktop 2> /dev/null
touch /home/${LIVE_USER}/Desktop/parabola-installer.desktop ; sleep 2 ; # sort
touch /home/${LIVE_USER}/Desktop/parabola-irc.desktop ; sleep 2 ; # sort
touch /home/${LIVE_USER}/Desktop/bug-tracker.desktop # sort
- sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.bash_profile
- sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.dmrc
+ sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.bash_profile
+ sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.dmrc
elif [[ "${iso_gui}" == 'mate' ]]
- then sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.bash_profile
- sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.dmrc
+ then sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.bash_profile
+ sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.dmrc
else echo "invalid \$iso_gui for _DESKTOP_SESSION_ '${iso_gui}'"
exit 1
fi