Menu
▾
▴
[Kiwi-ltsp-devel] SF.net SVN: kiwi-ltsp:[839] trunk/kiwi-ltsp/ltsp/suse-13.2
|
From: <cyb...@us...> - 2014-08-23 14:37:58
|
Revision: 839
http://sourceforge.net/p/kiwi-ltsp/code/839
Author: cyberorg
Date: 2014-08-23 14:37:39 +0000 (Sat, 23 Aug 2014)
Log Message:
-----------
many minor fixes
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/suse-13.2/config.sh
trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml
trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/poweroff.custom
trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot.custom
trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init
Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/config.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-13.2/config.sh 2014-08-23 13:55:32 UTC (rev 838)
+++ trunk/kiwi-ltsp/ltsp/suse-13.2/config.sh 2014-08-23 14:37:39 UTC (rev 839)
@@ -95,8 +95,8 @@
systemctl disable systemd-readahead-done.service
#mv /etc/init.d/ltsp-client.init /usr/lib/X11/display-manager
systemctl disable display-manager.service
+rm /usr/lib/systemd/system/display-manager.service
systemctl enable ltsp-init.service
-systemctl enable ltspfsd.service
#======================================
# Setup ltsp client
#--------------------------------------
Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml 2014-08-23 13:55:32 UTC (rev 838)
+++ trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml 2014-08-23 14:37:39 UTC (rev 839)
@@ -45,7 +45,7 @@
<package name="bind-utils"/>
<package name="binutils"/>
<package name="busybox"/>
- <package name="clicfs"/>
+ <package name="blueprint-cursor-theme"/>
<package name="dbus-1"/>
<package name="dbus-1-x11"/>
<package name="dejavu-fonts"/>
@@ -73,6 +73,7 @@
<package name="MozillaFirefox"/>
<package name="nbd"/>
<package name="netcfg"/>
+ <package name="net-tools"/>
<package name="newt"/>
<package name="nfs-client"/>
<package name="ntfs-3g"/>
@@ -81,9 +82,9 @@
<package name="openssh"/>
<package name="pciutils"/>
<package name="perl-NetAddr-IP"/>
- <!--package name="plymouth"/>
+ <package name="plymouth"/>
<package name="plymouth-branding-openSUSE"/>
- <package name="plymouth-scripts"/-->
+ <package name="plymouth-scripts"/>
<package name="procps"/>
<package name="pulseaudio"/>
<!--package name="pulseaudio-libs"/-->
@@ -109,7 +110,7 @@
<package name="usbutils"/>
<package name="x11-tools"/>
<package name="xf86-video-intel"/>
- <package name="xf86-video-modesetting"/>
+ <package name="vaapi-intel-driver"/>
<!--package name="x11-video-nvidiaG01"/-->
<package name="xkeyboard-config"/>
<package name="xorg-x11"/>
Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/poweroff.custom
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/poweroff.custom 2014-08-23 13:55:32 UTC (rev 838)
+++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/poweroff.custom 2014-08-23 14:37:39 UTC (rev 839)
@@ -1,6 +1,5 @@
#!/bin/bash
-/etc/init.d/ltsp-client.init stop || true
-/etc/init.d/sshd stop || true
+sync
fusermount -uzq /usr/lib/browser-plugins || true
/sbin/poweroff.real -fp
Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot.custom
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot.custom 2014-08-23 13:55:32 UTC (rev 838)
+++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot.custom 2014-08-23 14:37:39 UTC (rev 839)
@@ -1,6 +1,7 @@
#!/bin/bash
-/etc/init.d/ltsp-client.init stop || true
-/etc/init.d/sshd stop || true
+#/etc/init.d/ltsp-client.init stop || true
+#/etc/init.d/sshd stop || true
+sync
fusermount -uzq /usr/lib/browser-plugins || true
#drastic measures
echo 1 > /proc/sys/kernel/sysrq
Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init 2014-08-23 13:55:32 UTC (rev 838)
+++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init 2014-08-23 14:37:39 UTC (rev 839)
@@ -51,7 +51,7 @@
echo "127.0.0.1 localhost" > /etc/hosts
echo "127.0.0.2 $hostname" >> /etc/hosts
echo "$SERVER server" >> /etc/hosts
- hosts-update $IPADDR $NETWORK $NETMASK $SEARCH_DOMAIN
+# hosts-update $IPADDR $NETWORK $NETMASK $SEARCH_DOMAIN
hostname $hostname
if [ -n "$SEARCH_DOMAIN" ]; then
cat <<EOF >> /etc/resolv.conf
@@ -136,6 +136,7 @@
run_rcfiles || true
. /etc/sysconfig/language
export LANG="$RC_LANG"
+ export XCURSOR_THEME="blueprint-cursor-theme"
/usr/bin/plymouth quit --retain-splash || true
start_screen_sessions || true
start_sound || true
@@ -144,7 +145,7 @@
configure_scanner || true
#workaround: unionfs / disappears with this in when boot.udev starts so copy it later
mv /etc/udev/88-ltsp.rules /etc/udev/rules.d/ 2> /dev/null || true
- epoptes-client -c &
+ epoptes-client -c
epoptes-client &
;;
stop)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|