Menu
▾
▴
kiwi-ltsp-devel — KIWI-LTSP Developers mailinging list
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(3) |
Feb
(3) |
Mar
(22) |
Apr
(2) |
May
(6) |
Jun
(9) |
Jul
(2) |
Aug
(74) |
Sep
(112) |
Oct
(13) |
Nov
(67) |
Dec
(11) |
| 2011 |
Jan
|
Feb
|
Mar
(40) |
Apr
(7) |
May
|
Jun
(11) |
Jul
(12) |
Aug
(99) |
Sep
(46) |
Oct
(3) |
Nov
(5) |
Dec
(12) |
| 2012 |
Jan
(9) |
Feb
(4) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(179) |
Sep
(26) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2014 |
Jan
(1) |
Feb
(14) |
Mar
(8) |
Apr
|
May
(10) |
Jun
(1) |
Jul
|
Aug
(17) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(21) |
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(1) |
Feb
(14) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|
From: <cyb...@us...> - 2017-12-09 12:19:04
|
Revision: 884
http://sourceforge.net/p/kiwi-ltsp/code/884
Author: cyberorg
Date: 2017-12-09 12:19:02 +0000 (Sat, 09 Dec 2017)
Log Message:
-----------
specify serer as tumbleweed fails with no server specified error
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2017-12-09 12:02:03 UTC (rev 883)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2017-12-09 12:19:02 UTC (rev 884)
@@ -2150,7 +2150,7 @@
#======================================
# Change config if client should autodetect server ip
#--------------------------------------
- [[ x$NETBOOT_SERVER_AUTODETECTION = x"1" ]] && sed -i -e "s@kiwiserver=$SERVER_IP@@g" $pxeDefault_file
+ #[[ x$NETBOOT_SERVER_AUTODETECTION = x"1" ]] && sed -i -e "s@kiwiserver=$SERVER_IP@@g" $pxeDefault_file
#======================================
# Add other images to boot menu (if $SHOW_IMGS_IN_MENU)
#--------------------------------------
@@ -2274,7 +2274,7 @@
LABEL $prfName
kernel boot/linux-$prfName
- append initrd=boot/initrd-$prfName $root_adr $append_arg init=/sbin/init-ltsp
+ append initrd=boot/initrd-$prfName $root_adr $append_arg init=/sbin/init-ltsp kiwiserver=$SERVER_IP kiwiservertype=tftp
IPAPPEND 2
EOF
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2017-12-09 12:02:05
|
Revision: 883
http://sourceforge.net/p/kiwi-ltsp/code/883
Author: cyberorg
Date: 2017-12-09 12:02:03 +0000 (Sat, 09 Dec 2017)
Log Message:
-----------
minor fixes
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.xml
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/bin/ltsp-client.init
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-29 12:14:43 UTC (rev 882)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2017-12-09 12:02:03 UTC (rev 883)
@@ -1487,7 +1487,13 @@
$CHROOTCMD .
log "Exiting from chroot of $prfName"
sync
+ # gpg-agent needs to exit before bind mounts can be umounted
+ killall gpg-agent
umount * 2>/dev/null
+ # We don't want apparmor running in chroot due to undesirable side-effects
+ if [[ -f etc/systemd/system/multi-user.target.wants/apparmor.service ]]; then
+ rm etc/systemd/system/multi-user.target.wants/apparmor.service
+ fi
if [[ -f etc/resolv.conf.chrootbackup ]]; then
mv etc/resolv.conf.chrootbackup etc/resolv.conf
fi
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2016-02-29 12:14:43 UTC (rev 882)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2017-12-09 12:02:03 UTC (rev 883)
@@ -111,6 +111,7 @@
ln -snf /usr/bin/busybox /usr/bin/vi
ln -snf /usr/bin/busybox /usr/bin/less
ln -snf /etc/asound-pulse.conf /etc/asound.conf
+ln -snf /etc/X11/xdm/Xsession /etc/X11/
touch /etc/mtab
mv /sbin/poweroff /sbin/poweroff.real
mv /sbin/poweroff.custom /sbin/poweroff
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.xml
===================================================================
(Binary files differ)
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/bin/ltsp-client.init
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/bin/ltsp-client.init 2016-02-29 12:14:43 UTC (rev 882)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/bin/ltsp-client.init 2017-12-09 12:02:03 UTC (rev 883)
@@ -128,7 +128,6 @@
case "$1" in
start)
- epoptes-client -c || true
load_modules || true
configure_network || true
get_files_from_tftpd || true
@@ -146,6 +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 || true
#epoptes-client &
;;
stop)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-29 12:14:45
|
Revision: 882
http://sourceforge.net/p/kiwi-ltsp/code/882
Author: cyberorg
Date: 2016-02-29 12:14:43 +0000 (Mon, 29 Feb 2016)
Log Message:
-----------
check if the btrfs image exists before running -l2
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-28 11:06:14 UTC (rev 881)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-29 12:14:43 UTC (rev 882)
@@ -1503,6 +1503,13 @@
#--------------------------------------
run_kiwi_ltsp2() {
#======================================
+ # Check if btrfs image exists
+ #--------------------------------------
+ if [[ $(blkid -s TYPE -o value $LTSP_IMG_DIR/$LTSP_IMG_NAME.img) == btrfs ]];then
+ log "The image is already compressed btrfs, nothing to do, exiting"
+ exit 0
+ fi
+ #======================================
# Cleanup build dir
#--------------------------------------
if [[ ! -e $LTSNFSPATH/kiwistage2 ]] ; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-28 11:06:16
|
Revision: 881
http://sourceforge.net/p/kiwi-ltsp/code/881
Author: cyberorg
Date: 2016-02-28 11:06:14 +0000 (Sun, 28 Feb 2016)
Log Message:
-----------
copy contents in btrfs image
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-28 08:27:23 UTC (rev 880)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-28 11:06:14 UTC (rev 881)
@@ -1529,7 +1529,7 @@
mkfs.btrfs $LTSP_IMG_DIR/$LTSP_IMG_NAME.img
tmpmount=$(mktemp -d)
mount -o compress $LTSP_IMG_DIR/$LTSP_IMG_NAME.img $tmpmount
- nice ionice -c3 rsync -aHXA --one-file-system $LTSNFSPATH $tmpmount
+ nice ionice -c3 rsync -aHXA --one-file-system $LTSNFSPATH/* $tmpmount
sync
umount $tmpmount
rmdir $tmpmount
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-28 08:27:25
|
Revision: 880
http://sourceforge.net/p/kiwi-ltsp/code/880
Author: cyberorg
Date: 2016-02-28 08:27:23 +0000 (Sun, 28 Feb 2016)
Log Message:
-----------
switch default runlevel
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2016-02-28 08:10:34 UTC (rev 879)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2016-02-28 08:27:23 UTC (rev 880)
@@ -77,6 +77,8 @@
systemctl disable display-manager.service
rm /usr/lib/systemd/system/display-manager.service
systemctl enable ltsp-init.service
+cd /usr/lib/systemd/system/
+ln -snf multi-user.target default.target
#======================================
# Setup ltsp client
#--------------------------------------
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service 2016-02-28 08:10:34 UTC (rev 879)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service 2016-02-28 08:27:23 UTC (rev 880)
@@ -13,5 +13,4 @@
KillMode=process
[Install]
-WantedBy=graphical.target
-Alias=xdm.service
+WantedBy=multi-user.target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-28 08:10:36
|
Revision: 879
http://sourceforge.net/p/kiwi-ltsp/code/879
Author: cyberorg
Date: 2016-02-28 08:10:34 +0000 (Sun, 28 Feb 2016)
Log Message:
-----------
enable boot.local, set timezone from /etc/sysconfig/clock
Added Paths:
-----------
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/boot-local.service
Added: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/boot-local.service
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/boot-local.service (rev 0)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/boot-local.service 2016-02-28 08:10:34 UTC (rev 879)
@@ -0,0 +1,22 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+# This unit gets pulled automatically into multi-user.target by
+# systemd-rc-local-generator if /etc/init.d/boot.local is executable.
+[Unit]
+Description=boot.local Compatibility
+ConditionPathExists=/etc/init.d/boot.local
+After=basic.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh /etc/init.d/boot.local
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-28 08:10:05
|
Revision: 878
http://sourceforge.net/p/kiwi-ltsp/code/878
Author: cyberorg
Date: 2016-02-28 08:10:02 +0000 (Sun, 28 Feb 2016)
Log Message:
-----------
enable boot.local, set timezone from /etc/sysconfig/clock
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/templates/boot.local
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
Modified: trunk/kiwi-ltsp/ltsp/include/templates/boot.local
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/templates/boot.local 2016-02-26 09:38:47 UTC (rev 877)
+++ trunk/kiwi-ltsp/ltsp/include/templates/boot.local 2016-02-28 08:10:02 UTC (rev 878)
@@ -7,3 +7,5 @@
# Here you should add things, that should happen directly after booting
# before we're going to the first run level.
#
+. /etc/sysconfig/clock
+timedatectl set-timezone $TIMEZONE
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2016-02-26 09:38:47 UTC (rev 877)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2016-02-28 08:10:02 UTC (rev 878)
@@ -95,6 +95,8 @@
chkconfig alsasound on
#chkconfig ltsp-client.init on
systemctl enable sshd
+systemctl enable boot-local.service
+ln -snf /etc/init.d/boot.local /etc/rc.local
#groupadd -r pulse
#useradd -r -c 'PulseAudio daemon' \
# -s /sbin/nologin -d /var/run/pulse -g pulse -G audio pulse
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-26 09:38:50
|
Revision: 877
http://sourceforge.net/p/kiwi-ltsp/code/877
Author: cyberorg
Date: 2016-02-26 09:38:47 +0000 (Fri, 26 Feb 2016)
Log Message:
-----------
ltsp-init is oneshot service
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service 2016-02-23 10:55:26 UTC (rev 876)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/root/usr/lib/systemd/system/ltsp-init.service 2016-02-26 09:38:47 UTC (rev 877)
@@ -6,11 +6,10 @@
After=remote-fs.target dbus.socket systemd-user-sessions.service
[Service]
-Type=forking
-PIDFile=/var/run/ltsp-client.init.pid
+Type=oneshot
+RemainAfterExit=yes
ExecStart=/usr/bin/ltsp-client.init start
ExecStop=/usr/bin/ltsp-client.init stop
-ExecReload=/usr/bin/ltsp-client.init reload
KillMode=process
[Install]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-23 10:55:28
|
Revision: 876
http://sourceforge.net/p/kiwi-ltsp/code/876
Author: cyberorg
Date: 2016-02-23 10:55:26 +0000 (Tue, 23 Feb 2016)
Log Message:
-----------
fix for config change upon redetection of IP
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup
trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-20 10:07:07 UTC (rev 875)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-23 10:55:26 UTC (rev 876)
@@ -431,6 +431,9 @@
else
SERVER_IPS=$(echo $SERVER_IPS | tr ' ' '\n' | sed -e "${i}c${ip_new}" | tr '\n' ' ' )
fi
+ #re-export new detected IP
+ default_ips="$SERVER_IPS"
+ export SERVER_IP=$(echo $SERVER_IPS | cut -f1 -d' ')
fi
done
#======================================
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup 2016-02-20 10:07:07 UTC (rev 875)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup 2016-02-23 10:55:26 UTC (rev 876)
@@ -80,7 +80,6 @@
echo "it standart value: /usr/share/kiwi-ltsp/ , current value: $KIWI_INCLUDE"
exit 1
fi
-. $KIWI_INCLUDE/setupdnsmasq.sh
#======================================
# Check variables on script kiwi-ltsp-functions.sh load
#--------------------------------------
@@ -274,6 +273,7 @@
if [[ $USE_DNSMASQ == "no" ]] ; then
setup_dhcpd_conf
else
+ . $KIWI_INCLUDE/setupdnsmasq.sh
setup_dnsmasq
fi
fi
Modified: trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh 2016-02-20 10:07:07 UTC (rev 875)
+++ trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh 2016-02-23 10:55:26 UTC (rev 876)
@@ -51,23 +51,18 @@
continue
fi
- # workaround for systemd
- FORCE_RESTART_IF_SYSTEMD_BUG=0
- if mountpoint -q "/sys/fs/cgroup/systemd" ; then
- if [[ "$service" == "klaoe" ]] ; then
- # rcklaoe stop don't work with systemd'
- kiwi-ltsp-aoe-setup stop
- fi
- FORCE_RESTART_IF_SYSTEMD_BUG=1
- # TODO: check here is bug still exist
- fi
-
log "Activating $service"
if [[ `type -p chkconfig` ]] ; then
chkconfig $service on
else
log "Warning: Can't activate service $service, please activate it manually"
fi
- # reload / restart
- service $service reload 2>/dev/null || service $service restart >/dev/null
+
+ # workaround for systemd reload for klaoe
+ if [[ "$service" == "klaoe" ]] ; then
+ rcklaoe restart
+ else
+ # reload / restart
+ service $service reload 2>/dev/null || service $service restart >/dev/null
+ fi
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-20 10:07:09
|
Revision: 875
http://sourceforge.net/p/kiwi-ltsp/code/875
Author: cyberorg
Date: 2016-02-20 10:07:07 +0000 (Sat, 20 Feb 2016)
Log Message:
-----------
proxy dhcp config
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-20 08:09:35 UTC (rev 874)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-20 10:07:07 UTC (rev 875)
@@ -2126,6 +2126,9 @@
cat $KIWI_INCLUDE/templates/default >> $pxeDefault_file
fi
sed -i -e "s@kiwiserver.*@kiwiserver=$SERVER_IP kiwiservertype=tftp@g" $pxeDefault_file
+ #For nfs devices
+ sed -i -e "s@nfs:.*:@nfs:$SERVER_IP:@g" $pxeDefault_file
+ sed -i -e "s@nfsroot=.*:@nfsroot=$SERVER_IP:@g" $pxeDefault_file
# Add custom configs
cat $pxeDefault_file.local >> $pxeDefault_file 2>/dev/null
#======================================
Modified: trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh 2016-02-20 08:09:35 UTC (rev 874)
+++ trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh 2016-02-20 10:07:07 UTC (rev 875)
@@ -42,7 +42,8 @@
[[ -z $tftp_server ]] && tftp_server="`echo $TFTP_SERVERS | cut -f1 -d' ' `"
[[ -z $gateway ]] && gateway="`echo $GATEWAYS | cut -f1 -d' ' `"
cat <<EOF >$TESTDIR/etc/dnsmasq.d/kiwi-ltsp.conf
-#for proxy dhcp mode use dhcp-range=SERVER_IP,proxy
+#for proxy dhcp mode uncomment the line below and comment line below that
+#dhcp-range=$SERVER_IP,proxy
dhcp-range=$range_start,$range_end,1h
EOF
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-20 08:09:38
|
Revision: 874
http://sourceforge.net/p/kiwi-ltsp/code/874
Author: cyberorg
Date: 2016-02-20 08:09:35 +0000 (Sat, 20 Feb 2016)
Log Message:
-----------
config fixes and updates
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-19 08:31:50 UTC (rev 873)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-20 08:09:35 UTC (rev 874)
@@ -2042,9 +2042,11 @@
#======================================
# write entry for file
#--------------------------------------
- echo -n "/KIWI/$i;" >> $filename
- echo -n "${i/root\.$suffix}" >> $filename
- echo -n "$Server_IP_," >> $filename
+ echo -n "/KIWI/$i;" >> $filename
+ echo -n "${i/root\.$suffix}" >> $filename
+ echo -n "$Server_IP_;" >> $filename
+ echo -n "$(du $i|cut -f1);" >> $filename
+ echo -n "$(md5sum $i|cut -d " " -f1)," >> $filename
done
done
popd 1>/dev/null
@@ -2109,7 +2111,8 @@
#--------------------------------------
log "Setting up boot menu"
local pxeDefault_file="$TESTDIR/$TFTPBOOTPATH/pxelinux.cfg/default"
- cat <<EOF > $pxeDefault_file
+ if [[ ! -f "$pxeDefault_file" ]]; then
+ cat <<EOF > $pxeDefault_file
# Warning: never edit this file manually
# If you want add custom entry to this file:
# put it into $TFTPBOOTPATH/pxelinux.cfg/default.local and run
@@ -2120,7 +2123,8 @@
#======================================
# Set default configs and files
#--------------------------------------
- cat $KIWI_INCLUDE/templates/default >> $pxeDefault_file
+ cat $KIWI_INCLUDE/templates/default >> $pxeDefault_file
+ fi
sed -i -e "s@kiwiserver.*@kiwiserver=$SERVER_IP kiwiservertype=tftp@g" $pxeDefault_file
# Add custom configs
cat $pxeDefault_file.local >> $pxeDefault_file 2>/dev/null
@@ -2144,8 +2148,10 @@
# write all profiles entries into default menu
for prfName in $LTSP_PROFILES
do
- write_boot_menu_entry "$pxeDefault_file" $prfName
- done
+ if ! grep -q "LABEL $prfName" "$pxeDefault_file"; then
+ write_boot_menu_entry "$pxeDefault_file" $prfName
+ fi
+ done
fi
#======================================
# Create custom menu for each profile (default menu used as template)
@@ -3419,7 +3425,9 @@
NBD)
echo "NBDROOT=\"$Server_IP_;$imagePort\"" > $KIWI_LTSP_CONF/config.$mac ;;
AOE)
- echo "AOEROOT=/dev/etherd/e$vbshelf.$vbslot" > $KIWI_LTSP_CONF/config.$mac ;;
+ echo "AOEROOT=/dev/etherd/e$vbshelf.$vbslot" > $KIWI_LTSP_CONF/config.$mac
+ echo "UNIONFS_CONFIG=tmpfs,aoe,overlay" >> $KIWI_LTSP_CONF/config.$mac
+ ;;
NFS)
echo "NFSROOT=\"$Server_IP_;$RootPath\"" > $KIWI_LTSP_CONF/config.$mac
echo "UNIONFS_CONFIG=tmpfs,nfs,unionfs" >> $KIWI_LTSP_CONF/config.$mac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-19 08:31:52
|
Revision: 873
http://sourceforge.net/p/kiwi-ltsp/code/873
Author: cyberorg
Date: 2016-02-19 08:31:50 +0000 (Fri, 19 Feb 2016)
Log Message:
-----------
need qemu-tools
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-19 08:24:39 UTC (rev 872)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-19 08:31:50 UTC (rev 873)
@@ -1044,7 +1044,7 @@
pre_check_packages() {
## Check if needed packages are installed. If not, try install them.
log "Checking for mandatory packages."
- for i in dnsmasq kiwi kiwi-desc-netboot kiwi-pxeboot tftp nfs-kernel-server squashfs nbd ltsp-server pulseaudio aoetools vblade cec xinetd curl perl-XML-Twig fillup; do
+ for i in dnsmasq kiwi kiwi-desc-netboot kiwi-pxeboot tftp nfs-kernel-server squashfs nbd ltsp-server pulseaudio aoetools vblade cec xinetd curl perl-XML-Twig fillup qemu-tools; do
if ! rpm -q $i 1>/dev/null; then
log "Adding $i to list of packages that needs to be installed."
INST_PACK=$INST_PACK" $i"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-19 08:24:41
|
Revision: 872
http://sourceforge.net/p/kiwi-ltsp/code/872
Author: cyberorg
Date: 2016-02-19 08:24:39 +0000 (Fri, 19 Feb 2016)
Log Message:
-----------
support compressed btrfs image, update branding images to match tumbleweed
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
trunk/kiwi-ltsp/ltsp/include/templates/thin.png
trunk/ldm-suse-theme/bg.png
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp 2016-02-13 09:44:12 UTC (rev 871)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp 2016-02-19 08:24:39 UTC (rev 872)
@@ -73,6 +73,11 @@
# Example: IMAGETYPE="NBD AOE NFS"
IMAGETYPE="AOE"
+## Type: string
+## Default: btrfs
+# Create compressed btrfs or squashfs image.
+IMAGEFSTYPE="btrfs"
+
## Type: list(i686,x86_64)
## Default: i686
#Set the imaging product architecture, must be same as the installation source used
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-13 09:44:12 UTC (rev 871)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-19 08:24:39 UTC (rev 872)
@@ -857,12 +857,16 @@
log "Path $LTSNFSPATH-$1 already exist - nothing to do."
return 0
else
- log "unpacking $LTSP_IMG_DIR/$1.img to "$LTSNFSPATH-$1"-unsquash"
- mkdir -p "$LTSNFSPATH-$1"-unsquash
- cd "$LTSNFSPATH-$1"-unsquash
- unsquashfs $LTSP_IMG_DIR/$1.img
- mv squashfs-root "$LTSNFSPATH-$1"
- log "extracted image tree is at $LTSNFSPATH-$1"
+ if [[ $(blkid -s TYPE -o value $LTSP_IMG_DIR/$1.img) == squashfs ]];then
+ log "unpacking $LTSP_IMG_DIR/$1.img to "$LTSNFSPATH-$1"-unsquash"
+ mkdir -p "$LTSNFSPATH-$1"-unsquash
+ cd "$LTSNFSPATH-$1"-unsquash
+ unsquashfs $LTSP_IMG_DIR/$1.img
+ mv squashfs-root "$LTSNFSPATH-$1"
+ log "extracted image tree is at $LTSNFSPATH-$1"
+ elif [[ $(blkid -s TYPE -o value $LTSP_IMG_DIR/$1.img) == btrfs ]];then
+ log "the image is btrfs, no unpacking needed"
+ fi
fi
else
log "Please add image name to unpack, e.g. kiwi-ltsp --unpack-image i386"
@@ -1454,12 +1458,16 @@
enter_chroot() {
local prfName=$1
load_kiwi_profile $prfName
+ if [[ $(blkid -s TYPE -o value $LTSP_IMG_DIR/$1.img) == btrfs ]];then
+ [[ -d $LTSNFSPATH ]] || mkdir -p $LTSNFSPATH
+ log "mounting btrfs image"
+ mount -o compress $LTSP_IMG_DIR/$1.img $LTSNFSPATH
+ fi
pushd $LTSNFSPATH 1>/dev/null
if [[ -f etc/resolv.conf ]]; then
mv etc/resolv.conf etc/resolv.conf.chrootbackup
fi
cp /etc/resolv.conf etc/
- #cp -a $LTSNFSPATH-unneeded/* $LTSNFSPATH/
#======================================
# Prepare for chroot
@@ -1475,11 +1483,16 @@
log "Entering into chroot of $prfName"
$CHROOTCMD .
log "Exiting from chroot of $prfName"
+ sync
umount * 2>/dev/null
if [[ -f etc/resolv.conf.chrootbackup ]]; then
mv etc/resolv.conf.chrootbackup etc/resolv.conf
fi
popd 1>/dev/null
+ if [[ $(blkid -s TYPE -o value $LTSP_IMG_DIR/$1.img) == btrfs ]];then
+ log "unmounting btrfs image"
+ umount $LTSNFSPATH
+ fi
}
#======================================
@@ -1507,10 +1520,20 @@
# Build image
#--------------------------------------
mv_to_backup "$LTSP_IMG_DIR/$LTSP_IMG_NAME.img"
- log "Running command:"
- KIWIRUNCMD2="nice ionice -c3 mksquashfs $LTSNFSPATH $LTSP_IMG_DIR/$LTSP_IMG_NAME.img -comp xz -b 1M -Xbcj x86"
- log "$KIWIRUNCMD2"
- $KIWIRUNCMD2
+ if [[ x"$IMAGEFSTYPE" == x"btrfs" ]]; then
+ log "Creating compressed btrfs image, may take a while to complete"
+ qemu-img create -f raw -o size=10G $LTSP_IMG_DIR/$LTSP_IMG_NAME.img
+ mkfs.btrfs $LTSP_IMG_DIR/$LTSP_IMG_NAME.img
+ tmpmount=$(mktemp -d)
+ mount -o compress $LTSP_IMG_DIR/$LTSP_IMG_NAME.img $tmpmount
+ nice ionice -c3 rsync -aHXA --one-file-system $LTSNFSPATH $tmpmount
+ sync
+ umount $tmpmount
+ rmdir $tmpmount
+ else
+ log "Creating compressed squashfs image, may take a while to complete"
+ nice ionice -c3 mksquashfs $LTSNFSPATH $LTSP_IMG_DIR/$LTSP_IMG_NAME.img -comp xz -b 1M -Xbcj x86
+ fi
#======================================
# Check exit status and create md5sum file
#--------------------------------------
Modified: trunk/kiwi-ltsp/ltsp/include/templates/thin.png
===================================================================
(Binary files differ)
Modified: trunk/ldm-suse-theme/bg.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-13 09:44:14
|
Revision: 871
http://sourceforge.net/p/kiwi-ltsp/code/871
Author: cyberorg
Date: 2016-02-13 09:44:12 +0000 (Sat, 13 Feb 2016)
Log Message:
-----------
ENCRYPT_SWAP=false as it causes some clients stall during boot
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/templates/lts.conf
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.xml
Modified: trunk/kiwi-ltsp/ltsp/include/templates/lts.conf
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/templates/lts.conf 2016-02-12 06:04:35 UTC (rev 870)
+++ trunk/kiwi-ltsp/ltsp/include/templates/lts.conf 2016-02-13 09:44:12 UTC (rev 871)
@@ -10,4 +10,5 @@
LOCAL_APPS=true
LTSP_FATCLIENT=false
LDM_PASSWORD_HASH=true
+ ENCRYPT_SWAP=false
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.xml
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-12 06:04:38
|
Revision: 870
http://sourceforge.net/p/kiwi-ltsp/code/870
Author: cyberorg
Date: 2016-02-12 06:04:35 +0000 (Fri, 12 Feb 2016)
Log Message:
-----------
easy dnsmasq proxy dhcp
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh
Modified: trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh 2016-02-12 05:02:44 UTC (rev 869)
+++ trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh 2016-02-12 06:04:35 UTC (rev 870)
@@ -42,10 +42,12 @@
[[ -z $tftp_server ]] && tftp_server="`echo $TFTP_SERVERS | cut -f1 -d' ' `"
[[ -z $gateway ]] && gateway="`echo $GATEWAYS | cut -f1 -d' ' `"
cat <<EOF >$TESTDIR/etc/dnsmasq.d/kiwi-ltsp.conf
+#for proxy dhcp mode use dhcp-range=SERVER_IP,proxy
dhcp-range=$range_start,$range_end,1h
EOF
done
cat <<EOF >>$TESTDIR/etc/dnsmasq.d/kiwi-ltsp.conf
+pxe-service=X86PC, "Boot network OS",/pxelinux
dhcp-vendorclass=pxe,PXEClient
dhcp-boot=net:pxe,/pxelinux.0
enable-tftp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-02-12 05:02:45
|
Revision: 869
http://sourceforge.net/p/kiwi-ltsp/code/869
Author: cyberorg
Date: 2016-02-12 05:02:44 +0000 (Fri, 12 Feb 2016)
Log Message:
-----------
fix ip address detection on tumbleweed
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-01-23 06:48:14 UTC (rev 868)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2016-02-12 05:02:44 UTC (rev 869)
@@ -312,7 +312,7 @@
# EOF
# return 0
- ip address | awk '/inet6/{next} /inet.*brd/{print $2 " " $7 }' | egrep -v "^127\."
+ ip address | awk '/inet6/{next} /inet.*/{print $2 " " $NF }' | egrep -v "^127\."
}
@@ -1607,7 +1607,7 @@
# Create image dir
#--------------------------------------
log "Running command:"
- KIWICMDRUN="$KIWICMD --add-profile diskless --add-profile std --add-package unionfs-fuse --add-package e2fsprogs $kiwicache $setrepo $LOG --prepare $KIWINBPATH --root $TMPPATH"
+ KIWICMDRUN="$KIWICMD --add-profile diskless --add-profile std --add-package unionfs-fuse --add-package e2fsprogs --add-package btrfsprogs $kiwicache $setrepo $LOG --prepare $KIWINBPATH --root $TMPPATH"
log "$KIWICMDRUN"
$KIWICMDRUN
#======================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2016-01-23 06:48:15
|
Revision: 868
http://sourceforge.net/p/kiwi-ltsp/code/868
Author: cyberorg
Date: 2016-01-23 06:48:14 +0000 (Sat, 23 Jan 2016)
Log Message:
-----------
disable services not needed
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
Modified: trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2015-10-01 15:37:23 UTC (rev 867)
+++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2016-01-23 06:48:14 UTC (rev 868)
@@ -63,6 +63,12 @@
rm /usr/lib/systemd/system/systemd-hwdb-update.service
# these are disabled because kiwi enables them without being default
chkconfig raw off
+systemctl disable postfix.service
+systemctl disable apparmor.service
+systemctl disable ModemManager.service
+systemctl disable lvm2-activation.service
+systemctl disable lvm2-activation-early.service
+systemctl disable lvm2-activation-net.service
systemctl disable rsyslog.service
systemctl disable wicked.service
systemctl disable systemd-readahead-collect.service
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-10-01 15:37:26
|
Revision: 867
http://sourceforge.net/p/kiwi-ltsp/code/867
Author: cyberorg
Date: 2015-10-01 15:37:23 +0000 (Thu, 01 Oct 2015)
Log Message:
-----------
workaround for tumbleweed boo #948445
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Added Paths:
-----------
trunk/kiwi-ltsp/ltsp/include/templates/pxelinux.0
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-10-01 11:42:13 UTC (rev 866)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-10-01 15:37:23 UTC (rev 867)
@@ -2398,12 +2398,12 @@
cp_with_test $KIWI_INCLUDE/templates/message-ltsp $TESTDIR/$TFTPBOOTPATH/message-ltsp # updatable ?
cp_with_test /usr/share/syslinux/vesamenu.c32 $TESTDIR/$TFTPBOOTPATH/vesamenu.c32 updatable
cp_with_test $KIWI_INCLUDE/templates/thin.png $TESTDIR/$TFTPBOOTPATH/thin.png updatable
- #cp_with_test $KIWI_INCLUDE/templates/ifcfg-eth0 $KIWI_LTSP_CONF/root.default/etc/sysconfig/network/ifcfg-eth0 updatable
- cp_with_test /usr/share/syslinux/pxelinux.0 $TESTDIR/$TFTPBOOTPATH/pxelinux.0 updatable
cp_with_test /usr/share/syslinux/mboot.c32 $TESTDIR/$TFTPBOOTPATH/mboot.c32 updatable
cp_with_test /usr/share/syslinux/ldlinux.c32 $TESTDIR/$TFTPBOOTPATH/ldlinux.c32 updatable
cp_with_test /usr/share/syslinux/libcom32.c32 $TESTDIR/$TFTPBOOTPATH/libcom32.c32 updatable
cp_with_test /usr/share/syslinux/libutil.c32 $TESTDIR/$TFTPBOOTPATH/libutil.c32 updatable
+ #workaround for tumbleweed boo #948445
+ cp $KIWI_INCLUDE/templates/pxelinux.0 $TESTDIR/$TFTPBOOTPATH/pxelinux.0
#======================================
# show files which was not overwritten
#--------------------------------------
Added: trunk/kiwi-ltsp/ltsp/include/templates/pxelinux.0
===================================================================
(Binary files differ)
Index: trunk/kiwi-ltsp/ltsp/include/templates/pxelinux.0
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/templates/pxelinux.0 2015-10-01 11:42:13 UTC (rev 866)
+++ trunk/kiwi-ltsp/ltsp/include/templates/pxelinux.0 2015-10-01 15:37:23 UTC (rev 867)
Property changes on: trunk/kiwi-ltsp/ltsp/include/templates/pxelinux.0
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-10-01 11:42:15
|
Revision: 866
http://sourceforge.net/p/kiwi-ltsp/code/866
Author: cyberorg
Date: 2015-10-01 11:42:13 +0000 (Thu, 01 Oct 2015)
Log Message:
-----------
kiwi-ltsp-aoe-setup is #!/bin/bash script
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup 2015-09-30 05:29:57 UTC (rev 865)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup 2015-10-01 11:42:13 UTC (rev 866)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# /usr/sbin/kiwi-ltsp-aoe
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-09-30 05:29:59
|
Revision: 865
http://sourceforge.net/p/kiwi-ltsp/code/865
Author: cyberorg
Date: 2015-09-30 05:29:57 +0000 (Wed, 30 Sep 2015)
Log Message:
-----------
set LTSP_FATCLIENT=false in default template, enable ldminfod
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
trunk/kiwi-ltsp/ltsp/include/templates/lts.conf
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-30 05:11:40 UTC (rev 864)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-30 05:29:57 UTC (rev 865)
@@ -2477,6 +2477,10 @@
#======================================
# Setup services
#--------------------------------------
+ #Enable ldminfod
+ if [[ -f /etc/xinetd.d/ldminfod ]]; then
+ sed -i -e "s:disable.*:disable = no:" /etc/xinetd.d/ldminfod
+ fi
activate_service "sshd xinetd"
if [[ $USE_DNSMASQ == "no" ]] ; then
activate_service "dhcpd"
Modified: trunk/kiwi-ltsp/ltsp/include/templates/lts.conf
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/templates/lts.conf 2015-09-30 05:11:40 UTC (rev 864)
+++ trunk/kiwi-ltsp/ltsp/include/templates/lts.conf 2015-09-30 05:29:57 UTC (rev 865)
@@ -8,4 +8,6 @@
SERVER=REPLACE_SERVER_IP
SCREEN_07=ldm
LOCAL_APPS=true
+ LTSP_FATCLIENT=false
+ LDM_PASSWORD_HASH=true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-09-30 05:11:42
|
Revision: 864
http://sourceforge.net/p/kiwi-ltsp/code/864
Author: cyberorg
Date: 2015-09-30 05:11:40 +0000 (Wed, 30 Sep 2015)
Log Message:
-----------
copy required syslinux files
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 11:34:38 UTC (rev 863)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-30 05:11:40 UTC (rev 864)
@@ -2398,9 +2398,12 @@
cp_with_test $KIWI_INCLUDE/templates/message-ltsp $TESTDIR/$TFTPBOOTPATH/message-ltsp # updatable ?
cp_with_test /usr/share/syslinux/vesamenu.c32 $TESTDIR/$TFTPBOOTPATH/vesamenu.c32 updatable
cp_with_test $KIWI_INCLUDE/templates/thin.png $TESTDIR/$TFTPBOOTPATH/thin.png updatable
- cp_with_test $KIWI_INCLUDE/templates/ifcfg-eth0 $KIWI_LTSP_CONF/root.default/etc/sysconfig/network/ifcfg-eth0 updatable
+ #cp_with_test $KIWI_INCLUDE/templates/ifcfg-eth0 $KIWI_LTSP_CONF/root.default/etc/sysconfig/network/ifcfg-eth0 updatable
cp_with_test /usr/share/syslinux/pxelinux.0 $TESTDIR/$TFTPBOOTPATH/pxelinux.0 updatable
cp_with_test /usr/share/syslinux/mboot.c32 $TESTDIR/$TFTPBOOTPATH/mboot.c32 updatable
+ cp_with_test /usr/share/syslinux/ldlinux.c32 $TESTDIR/$TFTPBOOTPATH/ldlinux.c32 updatable
+ cp_with_test /usr/share/syslinux/libcom32.c32 $TESTDIR/$TFTPBOOTPATH/libcom32.c32 updatable
+ cp_with_test /usr/share/syslinux/libutil.c32 $TESTDIR/$TFTPBOOTPATH/libutil.c32 updatable
#======================================
# show files which was not overwritten
#--------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-09-29 11:34:40
|
Revision: 863
http://sourceforge.net/p/kiwi-ltsp/code/863
Author: cyberorg
Date: 2015-09-29 11:34:38 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
copy resolv.conf from host in chroot
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 10:31:42 UTC (rev 862)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 11:34:38 UTC (rev 863)
@@ -1455,7 +1455,11 @@
local prfName=$1
load_kiwi_profile $prfName
pushd $LTSNFSPATH 1>/dev/null
- cp -a $LTSNFSPATH-unneeded/* $LTSNFSPATH/
+ if [[ -f etc/resolv.conf ]]; then
+ mv etc/resolv.conf etc/resolv.conf.chrootbackup
+ fi
+ cp /etc/resolv.conf etc/
+ #cp -a $LTSNFSPATH-unneeded/* $LTSNFSPATH/
#======================================
# Prepare for chroot
@@ -1472,7 +1476,9 @@
$CHROOTCMD .
log "Exiting from chroot of $prfName"
umount * 2>/dev/null
-
+ if [[ -f etc/resolv.conf.chrootbackup ]]; then
+ mv etc/resolv.conf.chrootbackup etc/resolv.conf
+ fi
popd 1>/dev/null
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-09-29 10:31:45
|
Revision: 862
http://sourceforge.net/p/kiwi-ltsp/code/862
Author: cyberorg
Date: 2015-09-29 10:31:42 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
cleanup and distro specific checks
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 09:48:38 UTC (rev 861)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 10:31:42 UTC (rev 862)
@@ -495,7 +495,9 @@
# update config files
update_variable SERVER_IPS $TESTDIR/$KIWI_LTSP_CONF_FILE
update_variable DHCP_IFACES $TESTDIR/$KIWI_LTSP_CONF_FILE
- update_variable DHCPD_INTERFACE $TESTDIR/etc/sysconfig/dhcpd
+ if [ -f $TESTDIR/etc/sysconfig/dhcpd ]; then
+ update_variable DHCPD_INTERFACE $TESTDIR/etc/sysconfig/dhcpd
+ fi
#======================================
# check networking variables
#--------------------------------------
@@ -1814,7 +1816,7 @@
log "These services should be restarted(--test option used, not doing anything):"
log "$ACTIVATE_AND_RESTART_SERVICES"
else
- sudo $KIWI_INCLUDE/kl-activate_restart_services.sh
+ sudo $KIWI_INCLUDE/kl-activate_restart_services.sh $ACTIVATE_AND_RESTART_SERVICES
fi
}
@@ -2051,7 +2053,11 @@
;;
NFS)
setup_exports
- activate_service nfsserver
+ if [[ $DISTRO_HOST_NAME == "suse" ]] ; then
+ activate_service nfsserver
+ else
+ activate_service nfs-server
+ fi
;;
AOE)
log "Setting AOE support service - klaoe(kiwi-ltsp-aoe) to start automatically"
@@ -2550,6 +2556,11 @@
activate_service SuSEfirewall2
fi
else
+ if [ -f /usr/lib/systemd/system/firewalld.service ]; then
+ log "Disablling and stopping firewalld service"
+ systemctl disable firewalld
+ systemctl stop firewalld
+ fi
manual_step "Check if all the required ports(ssh, tftp, nbdrootd, nbdswapd, nfs etc) are open on interfaces: $DHCP_IFACES"
manual_step "Please setup networks masquerade manually"
if [[ -z `grep "net.ipv4.ip_forward = 1" $TESTDIR/etc/sysctl.conf ` ]] ; then
@@ -2558,19 +2569,8 @@
fi
# [[ $TESTRUN == 1 ]] || sudo echo "1" > /proc/sys/net/ipv4/ip_forward
fi
- activate_service epoptes-server
- # activate_service SuSEfirewall2_init # if firewall installed, it's activated by default, isn't it??
- # TODO: code below can be deleted now
- if [[ $TESTRUN != 1 ]]; then
- for service in xinetd klaoe sshd epoptes-server
- do
- systemctl enable $service &>/dev/null
- log "Restarting service $service"
- systemctl restart $service &>/dev/null
- done
- chkconfig SuSEfirewall2_init on &>/dev/null
- chkconfig SuSEfirewall2_setup on &>/dev/null
- rcSuSEfirewall2 restart &>/dev/null
+ if [ -f /usr/lib/systemd/system/epoptes-server.service ]; then
+ activate_service epoptes-server
fi
}
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf 2015-09-29 09:48:38 UTC (rev 861)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf 2015-09-29 10:31:42 UTC (rev 862)
@@ -56,4 +56,4 @@
#======================================
# Service which kiwi-ltsp can active and restart
#--------------------------------------
-KL_ALLOWED_SERVICES="klaoe xinetd nfsserver dhcpd sshd named SuSEfirewall2 SuSEfirewall2_setup sysctl rpcbind epoptes-server"
+KL_ALLOWED_SERVICES="klaoe xinetd nfsserver nfs-server dhcpd dnsmasq sshd named SuSEfirewall2 SuSEfirewall2_setup firewalld sysctl rpcbind epoptes-server"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-09-29 09:48:40
|
Revision: 861
http://sourceforge.net/p/kiwi-ltsp/code/861
Author: cyberorg
Date: 2015-09-29 09:48:38 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
rename kla to klaoe, use distro detection for some specific services
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup
trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf
trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh
trunk/kiwi-ltsp/ltsp/uninstall.sh
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup 2015-09-29 07:35:06 UTC (rev 860)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup 2015-09-29 09:48:38 UTC (rev 861)
@@ -136,7 +136,7 @@
# Stop checking vblade processes if config file changed
#--------------------------------------
if [[ $CONF_FILE_DATE != `stat --format=%Y /etc/sysconfig/$CONF_FILE` ]] ; then
- echo "/etc/sysconfig/$CONF_FILE is changed, probably you should restart kla service"
+ echo "/etc/sysconfig/$CONF_FILE is changed, probably you should restart klaoe service"
exit 0
fi
;;
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 07:35:06 UTC (rev 860)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 09:48:38 UTC (rev 861)
@@ -1785,7 +1785,11 @@
# Activate and restart service
#--------------------------------------
activate_service rpcbind
- activate_service nfsserver
+ if [[ $DISTRO_HOST_NAME == "suse" ]] ; then
+ activate_service nfsserver
+ else
+ activate_service nfs-server
+ fi
}
#======================================
@@ -2642,8 +2646,10 @@
#======================================
# Filling distro name and version if empty
#--------------------------------------
- if [[ -z $DISTRO_VERSION && -z $DISTRO_NAME ]] ; then
- detect_distro $KIWIPATH/config.xml
+ if [[ $DISTRO_HOST_NAME == "suse" ]] ; then
+ if [[ -z $DISTRO_VERSION && -z $DISTRO_NAME ]] ; then
+ detect_distro $KIWIPATH/config.xml
+ fi
fi
#======================================
# set EXTRA_PKGS_DIR
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup 2015-09-29 07:35:06 UTC (rev 860)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-setup 2015-09-29 09:48:38 UTC (rev 861)
@@ -321,10 +321,12 @@
#======================================
#fixup owner
#--------------------------------------
-if [[ $USE_DNSMASQ == "no" ]] ; then
- chown tftp:tftp $TFTPBOOTPATH -R &>/dev/null
-else
- chown dnsmasq $TFTPBOOTPATH -R
+if [[ $DISTRO_HOST_NAME == "suse" ]] ; then
+ if [[ $USE_DNSMASQ == "no" ]] ; then
+ chown tftp:tftp $TFTPBOOTPATH -R &>/dev/null
+ else
+ chown dnsmasq $TFTPBOOTPATH -R
+ fi
fi
#======================================
# Activate and restart all services which configs was changed
Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf 2015-09-29 07:35:06 UTC (rev 860)
+++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-static-conf 2015-09-29 09:48:38 UTC (rev 861)
@@ -56,4 +56,4 @@
#======================================
# Service which kiwi-ltsp can active and restart
#--------------------------------------
-KL_ALLOWED_SERVICES="kla xinetd nfsserver dhcpd sshd named SuSEfirewall2 SuSEfirewall2_setup sysctl rpcbind epoptes-server"
+KL_ALLOWED_SERVICES="klaoe xinetd nfsserver dhcpd sshd named SuSEfirewall2 SuSEfirewall2_setup sysctl rpcbind epoptes-server"
Modified: trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh 2015-09-29 07:35:06 UTC (rev 860)
+++ trunk/kiwi-ltsp/ltsp/include/kl-activate_restart_services.sh 2015-09-29 09:48:38 UTC (rev 861)
@@ -54,8 +54,8 @@
# workaround for systemd
FORCE_RESTART_IF_SYSTEMD_BUG=0
if mountpoint -q "/sys/fs/cgroup/systemd" ; then
- if [[ "$service" == "kla" ]] ; then
- # rckla stop don't work with systemd'
+ if [[ "$service" == "klaoe" ]] ; then
+ # rcklaoe stop don't work with systemd'
kiwi-ltsp-aoe-setup stop
fi
FORCE_RESTART_IF_SYSTEMD_BUG=1
Modified: trunk/kiwi-ltsp/ltsp/uninstall.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/uninstall.sh 2015-09-29 07:35:06 UTC (rev 860)
+++ trunk/kiwi-ltsp/ltsp/uninstall.sh 2015-09-29 09:48:38 UTC (rev 861)
@@ -18,8 +18,7 @@
LIST_INSTALLED_FILES="
/var/adm/fillup-templates/sysconfig.kiwi-ltsp
-/etc/init.d/kla
-/usr/sbin/rckla
+/usr/bin/rcklaoe
/usr/bin/kiwi-ltsp-setup
/usr/bin/kiwi-ltsp
/usr/bin/ltsp-config
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyb...@us...> - 2015-09-29 07:35:08
|
Revision: 860
http://sourceforge.net/p/kiwi-ltsp/code/860
Author: cyberorg
Date: 2015-09-29 07:35:06 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------
more systemd changes
Modified Paths:
--------------
trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh
Modified: trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh
===================================================================
--- trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh 2015-09-29 06:43:10 UTC (rev 859)
+++ trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh 2015-09-29 07:35:06 UTC (rev 860)
@@ -51,8 +51,8 @@
enable-tftp
tftp-root=$TFTPBOOTPATH
EOF
- sed -i -e "s:disable.*:disable = yes:" $TESTDIR/etc/xinetd.d/tftp && rcxinetd restart
+ sed -i -e "s:disable.*:disable = yes:" $TESTDIR/etc/xinetd.d/tftp && systemctl restart xinetd
sed -i -e "s:.*conf-dir=/etc/dnsmasq.d:conf-dir=/etc/dnsmasq.d:" $TESTDIR/etc/dnsmasq.conf
- chkconfig dnsmasq on
- rcdnsmasq restart
+ systemctl enable dnsmasq
+ systemctl restart dnsmasq
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|