equal
deleted
inserted
replaced
107 * Related svccfg(1M) "set" and "list" commands: |
107 * Related svccfg(1M) "set" and "list" commands: |
108 * |
108 * |
109 * svccfg -s svc:/application/x11/x11-server \ |
109 * svccfg -s svc:/application/x11/x11-server \ |
110 * setprop options/server=/usr/openwin/bin/Xsun |
110 * setprop options/server=/usr/openwin/bin/Xsun |
111 * svccfg -s svc:/application/x11/x11-server \ |
111 * svccfg -s svc:/application/x11/x11-server \ |
112 * setprop options/server=/usr/X11/bin/Xorg |
112 * setprop options/server=/usr/bin/Xorg |
113 * |
113 * |
114 * svccfg -s svc:/application/x11/x11-server listprop 'options/server' |
114 * svccfg -s svc:/application/x11/x11-server listprop 'options/server' |
115 */ |
115 */ |
116 |
116 |
117 #define XSRV_SERVICE_NAME "application/x11/x11-server" |
117 #define XSRV_SERVICE_NAME "application/x11/x11-server" |
142 #define GFX_DEV_XORG GFX_DEV_PFB | GFX_DEV_NFB | GFX_DEV_EFB | GFX_DEV_AST |
142 #define GFX_DEV_XORG GFX_DEV_PFB | GFX_DEV_NFB | GFX_DEV_EFB | GFX_DEV_AST |
143 #else |
143 #else |
144 #define GFX_DEV_XORG GFX_DEV_PFB | GFX_DEV_NFB | GFX_DEV_EFB | GFX_DEV_KFB | GFX_DEV_AST |
144 #define GFX_DEV_XORG GFX_DEV_PFB | GFX_DEV_NFB | GFX_DEV_EFB | GFX_DEV_KFB | GFX_DEV_AST |
145 #endif |
145 #endif |
146 |
146 |
147 char *xserver_str[] = {"Xsun", "Xorg"}; |
147 const char *xserver_str[] = {"Xsun", "Xorg"}; |
148 char *xserver_path[] = {"/usr/openwin/bin/Xsun", "/usr/X11/bin/Xorg"}; |
148 const char *xserver_path[] = {"/usr/openwin/bin/Xsun", "/usr/bin/Xorg"}; |
149 unsigned int xserver_device[] = { GFX_DEV_XSUN, GFX_DEV_XORG }; |
149 unsigned int xserver_device[] = { GFX_DEV_XSUN, GFX_DEV_XORG }; |
150 |
150 |
151 static |
151 static |
152 xserv_t |
152 xserv_t |
153 IdentifyXServer(void) |
153 IdentifyXServer(void) |
1462 xserver_path[xserver_arg]); |
1462 xserver_path[xserver_arg]); |
1463 return; |
1463 return; |
1464 } |
1464 } |
1465 } |
1465 } |
1466 |
1466 |
1467 system("svccfg -s svc:/application/x11/x11-server setprop options/server=/usr/X11/bin/Xorg"); |
1467 system("svccfg -s svc:/application/x11/x11-server setprop options/server=/usr/bin/Xorg"); |
1468 |
1468 |
1469 if (stat(efb_path, &stat_buf) == 0) { |
1469 if (stat(efb_path, &stat_buf) == 0) { |
1470 system("rem_drv nfb 2>/dev/null&"); |
1470 system("rem_drv nfb 2>/dev/null&"); |
1471 system("rem_drv pfb 2>/dev/null&"); |
1471 system("rem_drv pfb 2>/dev/null&"); |
1472 system("add_drv -n -m '* 0666 root sys' -i \"SUNW,XVR-50 SUNW,XVR-100 SUNW,XVR-300\" efb 2>/dev/null&"); |
1472 system("add_drv -n -m '* 0666 root sys' -i \"SUNW,XVR-50 SUNW,XVR-100 SUNW,XVR-300\" efb 2>/dev/null&"); |