diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-11-18 13:18:43 -0500 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-11-18 13:18:43 -0500 |
| commit | 0e4b74bb811a9739e5146833264c5140ec0309f2 (patch) | |
| tree | 380a9977bcd7910e58bc72d3e43c377b674946da /liveinst | |
| parent | b0788b10df5b82604792d650767a0e168cdf6b4b (diff) | |
| download | anaconda-0e4b74bb811a9739e5146833264c5140ec0309f2.tar.gz anaconda-0e4b74bb811a9739e5146833264c5140ec0309f2.tar.xz anaconda-0e4b74bb811a9739e5146833264c5140ec0309f2.zip | |
Fix death on login of an OLPC on a live image
xinitrc *sources* the shell scripts, it doesn't run them. So we can't just
exit otherwise, we exit xinitrc
Diffstat (limited to 'liveinst')
| -rwxr-xr-x | liveinst/liveinst.xinit | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/liveinst/liveinst.xinit b/liveinst/liveinst.xinit index d41d3e61e..41f636d16 100755 --- a/liveinst/liveinst.xinit +++ b/liveinst/liveinst.xinit @@ -2,15 +2,13 @@ # Set up a launcher on the desktop for the live installer if we're on # a live CD -if [ `grep -c Geode /proc/cpuinfo` -ne 0 ]; then - exit 0 -fi - -if [ -b /dev/live-osimg ]; then +# don't run on geode (olpc) +if [ `grep -c Geode /proc/cpuinfo` -eq 0 ]; then + if [ -b /dev/live-osimg ]; then test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs cp /usr/share/applications/liveinst.desktop "${XDG_DESKTOP_DIR:-$HOME/Desktop}" -elif [ -f /.livecd-configured ]; then # FIXME: old way... this should go away + elif [ -f /.livecd-configured ]; then # FIXME: old way... this should go away test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs cp /usr/share/applications/liveinst.desktop "${XDG_DESKTOP_DIR:-$HOME/Desktop}" + fi fi - |