SliTaz Repositories

1 --- slim-1.3.5/app.cpp

2 +++ slim-1.3.5/app.cpp

3

4 Link forgotten header.

5 @@ -25,6 +25,7 @@

6 #include "app.h"

7 #include "numlock.h"

8 #include "util.h"

9 +#include <X11/Xmu/WinUtil.h>

10

11 #ifdef HAVE_SHADOW

12 #include <shadow.h>

13

14 Option not to enter root's password if special command was given in the

15 login field (suspend, halt or reboot).

16 @@ -437,6 +438,11 @@

17 case Panel::Console:

18 logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;

19 return true; /* <--- This is simply fake! */

20 + case Panel::Suspend:

21 + case Panel::Halt:

22 + case Panel::Reboot:

23 + if (cfg->getOption("root_password") == "false")

24 + return true;

25 default:

26 break;

27 }

28

29

30 --- slim-1.3.5/cfg.cpp

31 +++ slim-1.3.5/cfg.cpp

32

33 Change default settings for SliTaz.

34 @@ -28,34 +28,35 @@

35 : currentSession(-1)

36 {

37 /* Configuration options */

38 - options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin"));

39 - options.insert(option("default_xserver","/usr/bin/X"));

40 + options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin"));

41 + options.insert(option("default_xserver","/usr/bin/Xorg"));

42 options.insert(option("xserver_arguments",""));

43 options.insert(option("numlock",""));

44 options.insert(option("daemon",""));

45 options.insert(option("xauth_path","/usr/bin/xauth"));

46 - options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session"));

47 - options.insert(option("halt_cmd","/sbin/shutdown -h now"));

48 - options.insert(option("reboot_cmd","/sbin/shutdown -r now"));

49 + options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session"));

50 + options.insert(option("halt_cmd","/sbin/poweroff"));

51 + options.insert(option("reboot_cmd","/sbin/reboot"));

52 + options.insert(option("root_password","true"));

53 options.insert(option("suspend_cmd",""));

54 options.insert(option("sessionstart_cmd",""));

55 options.insert(option("sessionstop_cmd",""));

56 - options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login"""));

57 - options.insert(option("screenshot_cmd","import -window root /slim.png"));

58 + options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -T ""Console login"" -e /bin/sh -l -c ""exec /bin/login"""));

59 + options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png"));

60 options.insert(option("welcome_msg","Welcome to %host"));

61 options.insert(option("session_msg","Session:"));

62 - options.insert(option("default_user",""));

63 + options.insert(option("default_user","tux"));

64 options.insert(option("focus_password","no"));

65 options.insert(option("auto_login","no"));

66 - options.insert(option("current_theme","default"));

67 - options.insert(option("lockfile","/var/run/slim.lock"));

68 + options.insert(option("current_theme","slitaz,base"));

69 + options.insert(option("lockfile","/var/lock/slim.lock"));

70 options.insert(option("logfile","/var/log/slim.log"));

71 options.insert(option("authfile","/var/run/slim.auth"));

72 - options.insert(option("shutdown_msg","The system is halting..."));

73 + options.insert(option("shutdown_msg","The system is going down..."));

74 options.insert(option("reboot_msg","The system is rebooting..."));

75 - options.insert(option("sessions","wmaker,blackbox,icewm"));

76 + options.insert(option("sessions","openbox,e17,jwm"));

77 options.insert(option("sessiondir",""));

78 - options.insert(option("hidecursor","false"));

79 + options.insert(option("hidecursor","true"));

80

81 /* Theme stuff */

82 options.insert(option("input_panel_x","50%"));

83

84

85 --- slim-1.3.5/slim.conf.original

86 +++ slim-1.3.5/slim.conf

87

88 Change default settings for SliTaz too.

89 @@ -1,13 +1,16 @@

90 +# /etc/slim.conf: Slim LogIn Manger configuration file

91 +#

92 +

93 # Path, X server and arguments (if needed)

94 # Note: -xauth $authfile is automatically appended

95 -default_path /bin:/usr/bin:/usr/local/bin

96 -default_xserver /usr/bin/X

97 +default_path ./:/bin:/usr/bin:/usr/local/bin

98 +default_xserver /usr/bin/Xorg

99 #xserver_arguments -dpi 75

100

101 # Commands for halt, login, etc.

102 -halt_cmd /sbin/shutdown -h now

103 -reboot_cmd /sbin/shutdown -r now

104 -console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"

105 +halt_cmd /sbin/poweroff

106 +reboot_cmd /sbin/reboot

107 +console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login"

108 #suspend_cmd /usr/sbin/suspend

109

110 # Full path to the xauth binary

111 @@ -22,7 +25,7 @@

112

113 # Hide the mouse cursor (note: does not work with some WMs).

114 # Valid values: true|false

115 -# hidecursor false

116 +hidecursor true

117

118 # This command is executed after a succesful login.

119 # you can place the %session and %theme variables

120 @@ -33,7 +36,7 @@

121 # to adjust the command according to your preferred shell,

122 # i.e. for freebsd use:

123 # login_cmd exec /bin/sh - ~/.xinitrc %session

124 -login_cmd exec /bin/bash -login ~/.xinitrc %session

125 +login_cmd exec /bin/sh -l ~/.xinitrc %session

126

127 # Commands executed when starting and exiting a session.

128 # They can be used for registering a X11 session with

129 @@ -51,10 +54,10 @@

130 # The current chosen session name is replaced in the login_cmd

131 # above, so your login command can handle different sessions.

132 # see the xinitrc.sample file shipped with slim sources

133 -sessions xfce4,icewm-session,wmaker,blackbox

134 +sessions openbox,e17,jwm

135

136 # Executed when pressing F11 (requires imagemagick)

137 -screenshot_cmd import -window root /slim.png

138 +#screenshot_cmd mtpaint -s /root/slim-shot.png

139

140 # welcome message. Available variables: %host, %domain

141 welcome_msg Welcome to %host

142 @@ -63,12 +66,12 @@

143 # session_msg Session:

144

145 # shutdown / reboot messages

146 -shutdown_msg The system is halting...

147 +shutdown_msg The system is going down...

148 reboot_msg The system is rebooting...

149

150 # default user, leave blank or remove this line

151 # for avoid pre-loading the username.

152 -#default_user simone

153 +default_user tux

154

155 # Focus the password field on start when default_user is set

156 # Set to "yes" to enable this feature

157 @@ -81,10 +84,10 @@

158

159 # current theme, use comma separated list to specify a set to

160 # randomly choose from

161 -current_theme default

162 +current_theme slitaz,base

163

164 # Lock file

165 -lockfile /var/run/slim.lock

166 +lockfile /var/lock/slim.lock

167

168 # Log file

169 logfile /var/log/slim.log