fix patches for SunOS based systems

Signed-off-by: Denis Kozadaev <denis@dilos.org>
pull/356/head^2
Denis Kozadaev 11 months ago
parent 90b19e21ce
commit ed1740b882

@ -208,9 +208,16 @@ void TDMSessionsWidget::load()
readSD(sdrcombo, "Root"); readSD(sdrcombo, "Root");
config->setGroup("Shutdown"); config->setGroup("Shutdown");
#if defined(Q_OS_SOLARIS)
restart_lined->setURL(config->readEntry("RebootCmd", "/usr/sbin/reboot"));
#else /* default */
restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot")); restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
#endif /* default */
#if defined(__OpenBSD__) #if defined(__OpenBSD__)
shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt -p")); shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt -p"));
#elif defined(Q_OS_SOLARIS)
shutdown_lined->setURL(config->readEntry("HaltCmd", "/usr/sbin/poweroff"));
#else #else
shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff")); shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff"));
#endif #endif
@ -222,8 +229,13 @@ void TDMSessionsWidget::load()
void TDMSessionsWidget::defaults() void TDMSessionsWidget::defaults()
{ {
#if defined(Q_OS_SOLARIS)
restart_lined->setURL("/usr/sbin/reboot");
shutdown_lined->setURL("/usr/sbin/poweroff");
#else /* default */
restart_lined->setURL("/sbin/reboot"); restart_lined->setURL("/sbin/reboot");
shutdown_lined->setURL("/sbin/poweroff"); shutdown_lined->setURL("/sbin/poweroff");
#endif /* default */
sdlcombo->setCurrentItem(SdAll); sdlcombo->setCurrentItem(SdAll);
sdrcombo->setCurrentItem(SdRoot); sdrcombo->setCurrentItem(SdRoot);

@ -39,7 +39,7 @@
#elif defined(BSD) #elif defined(BSD)
# define HALT_CMD "/sbin/shutdown -h now" # define HALT_CMD "/sbin/shutdown -h now"
# define REBOOT_CMD "/sbin/shutdown -r now" # define REBOOT_CMD "/sbin/shutdown -r now"
#elif defined(__SVR4) #elif defined(__SVR4) || defined(Q_OS_SOLARIS)
# define HALT_CMD "/usr/sbin/halt" # define HALT_CMD "/usr/sbin/halt"
# define REBOOT_CMD "/usr/sbin/reboot" # define REBOOT_CMD "/usr/sbin/reboot"
#else #else

Loading…
Cancel
Save