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...> - 2015-09-29 06:43:12
|
Revision: 859 http://sourceforge.net/p/kiwi-ltsp/code/859 Author: cyberorg Date: 2015-09-29 06:43:10 +0000 (Tue, 29 Sep 2015) Log Message: ----------- rename kla to klaoe Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/install.sh Modified: trunk/kiwi-ltsp/ltsp/install.sh =================================================================== --- trunk/kiwi-ltsp/ltsp/install.sh 2015-09-29 06:24:22 UTC (rev 858) +++ trunk/kiwi-ltsp/ltsp/install.sh 2015-09-29 06:43:10 UTC (rev 859) @@ -41,8 +41,7 @@ echo 'LIST_INSTALLED_FILES="' >$DATADIR/kiwi-ltsp/LIST_INSTALLED_FILES echo "/var/adm/fillup-templates/sysconfig.kiwi-ltsp /etc/sysconfig/kiwi-ltsp - /etc/init.d/kla - $BINDIR/rckla + $BINDIR/rcklaoe $BINDIR/kiwi-ltsp-setup $BINDIR/kiwi-ltsp-aoe-setup $DATADIR/kiwi-ltsp/ @@ -67,7 +66,7 @@ cp include/klaoe.service $BUILDROOT/usr/lib/systemd/system/ pushd $BINDIR chmod +x ltsp-chroot ltsp-update-kernels ltsp-config -ln -snf kiwi-ltsp-aoe-setup rckla +ln -snf kiwi-ltsp-aoe-setup rcklaoe popd chmod +x $BINDIR/kiwi-ltsp-aoe-setup $DATADIR/kiwi-ltsp/kiwi-ltsp-setup cp include/kiwi-ltsp-static-conf $DATADIR/kiwi-ltsp/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-29 06:24:24
|
Revision: 858 http://sourceforge.net/p/kiwi-ltsp/code/858 Author: cyberorg Date: 2015-09-29 06:24:22 +0000 (Tue, 29 Sep 2015) Log Message: ----------- install .service in /usr Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/install.sh Modified: trunk/kiwi-ltsp/ltsp/install.sh =================================================================== --- trunk/kiwi-ltsp/ltsp/install.sh 2015-09-29 06:20:29 UTC (rev 857) +++ trunk/kiwi-ltsp/ltsp/install.sh 2015-09-29 06:24:22 UTC (rev 858) @@ -31,7 +31,7 @@ $DATADIR/kiwi/image/netboot \ $DATADIR/kiwi/image/ltsp/ \ $DATADIR/kiwi-ltsp/ \ - $BUILDROOT/lib/systemd/system \ + $BUILDROOT/usr/lib/systemd/system \ $DATADIR/kiwi-ltsp/templates #====================================== @@ -64,7 +64,7 @@ cp include/ltsp-chroot $BINDIR/ cp include/ltsp-update-kernels $BINDIR/ cp include/ltsp-config $BINDIR/ -cp include/klaoe.service $BUILDROOT/lib/systemd/system/ +cp include/klaoe.service $BUILDROOT/usr/lib/systemd/system/ pushd $BINDIR chmod +x ltsp-chroot ltsp-update-kernels ltsp-config ln -snf kiwi-ltsp-aoe-setup rckla This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-29 06:20:31
|
Revision: 857 http://sourceforge.net/p/kiwi-ltsp/code/857 Author: cyberorg Date: 2015-09-29 06:20:29 +0000 (Tue, 29 Sep 2015) Log Message: ----------- use systemd service to start vbladed for aoeroot Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/include/klaoe.service Modified: trunk/kiwi-ltsp/ltsp/include/klaoe.service =================================================================== --- trunk/kiwi-ltsp/ltsp/include/klaoe.service 2015-09-29 06:18:53 UTC (rev 856) +++ trunk/kiwi-ltsp/ltsp/include/klaoe.service 2015-09-29 06:20:29 UTC (rev 857) @@ -7,7 +7,7 @@ RemainAfterExit=yes ExecStart=/usr/bin/kiwi-ltsp-aoe-setup start ExecStop=/usr/bin/kiwi-ltsp-aoe-setup stop -ExecReload=/usr/share/kiwi-ltsp/kiwi-ltsp-aoe-setup restart +ExecReload=/usr/bin/kiwi-ltsp-aoe-setup restart [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...> - 2015-09-29 06:18:55
|
Revision: 856 http://sourceforge.net/p/kiwi-ltsp/code/856 Author: cyberorg Date: 2015-09-29 06:18:53 +0000 (Tue, 29 Sep 2015) Log Message: ----------- use systemd service to start vbladed for aoeroot Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/include/klaoe.service Modified: trunk/kiwi-ltsp/ltsp/include/klaoe.service =================================================================== --- trunk/kiwi-ltsp/ltsp/include/klaoe.service 2015-09-29 06:09:40 UTC (rev 855) +++ trunk/kiwi-ltsp/ltsp/include/klaoe.service 2015-09-29 06:18:53 UTC (rev 856) @@ -5,8 +5,8 @@ [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/share/kiwi-ltsp/kiwi-ltsp-aoe-setup start -ExecStop=/usr/share/kiwi-ltsp/kiwi-ltsp-aoe-setup stop +ExecStart=/usr/bin/kiwi-ltsp-aoe-setup start +ExecStop=/usr/bin/kiwi-ltsp-aoe-setup stop ExecReload=/usr/share/kiwi-ltsp/kiwi-ltsp-aoe-setup restart [Install] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-29 06:09:43
|
Revision: 855 http://sourceforge.net/p/kiwi-ltsp/code/855 Author: cyberorg Date: 2015-09-29 06:09:40 +0000 (Tue, 29 Sep 2015) Log Message: ----------- use systemd service to start vbladed for aoeroot 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 06:08:03 UTC (rev 854) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-29 06:09:40 UTC (rev 855) @@ -1516,7 +1516,7 @@ popd # TODO: check should we restart NBD and NFS services too? - [[ -n `echo $IMAGETYPE | grep AOE` ]] && activate_service kla + [[ -n `echo $IMAGETYPE | grep AOE` ]] && activate_service klaoe [[ -n `echo $IMAGETYPE | grep NBD` ]] && activate_service nbd-server touch $LTSNFSPATH/kiwistage2 log "KIWI LTSP creation stage2 for $LTSP_IMG_NAME successful! " @@ -2050,8 +2050,8 @@ activate_service nfsserver ;; AOE) - log "Setting AOE support service - kla(kiwi-ltsp-aoe) to start automatically" - activate_service kla + log "Setting AOE support service - klaoe(kiwi-ltsp-aoe) to start automatically" + activate_service klaoe ;; *) log "Error: Unknown Image type specified!" @@ -2558,7 +2558,7 @@ # 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 kla sshd epoptes-server + for service in xinetd klaoe sshd epoptes-server do systemctl enable $service &>/dev/null log "Restarting service $service" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-29 06:08:06
|
Revision: 854 http://sourceforge.net/p/kiwi-ltsp/code/854 Author: cyberorg Date: 2015-09-29 06:08:03 +0000 (Tue, 29 Sep 2015) Log Message: ----------- use systemd service to start vbladed for aoeroot Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup trunk/kiwi-ltsp/ltsp/install.sh Added Paths: ----------- trunk/kiwi-ltsp/ltsp/include/klaoe.service Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup =================================================================== --- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup 2015-09-28 15:00:06 UTC (rev 853) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-aoe-setup 2015-09-29 06:08:03 UTC (rev 854) @@ -98,51 +98,47 @@ case "$1" in start) # to keep this process alive as required by startproc; does not seem to be an overkill, there may be a better way - coma=1 - while [ x"$coma" = x"1" ]; do - vbshelf=0 - vbslot=1 - for prfName in $LTSP_PROFILES - do - # check to prevent duplicate mounting of same image - #lodev=`losetup -j $LTSP_IMG_DIR/$prfName | cut -d ":" -f 1` - #if [ -z "$lodev" ]; then - # # determine the next free loop device - # lodev=`losetup -f` - # Images mounted in default sorted order as returned by ls - # losetup $lodev $LTSP_IMG_DIR/$prfName - #fi - suffix=".img" - [[ ! -f "$LTSP_IMG_DIR/$prfName.img" && -f "$LTSP_IMG_DIR/$prfName" ]] && \ - suffix="" - if [[ -f $LTSP_IMG_DIR/$prfName$suffix ]] ; then - if [[ -z $2 || $prfName == $2 ]] ; then - if [[ -n $DHCP_IFACES ]] ; then - for eth in $DHCP_IFACES - do - if [[ -z `ps --format args a -u root | grep -v ^grep | grep "vblade $vbshelf $vbslot $eth $LTSP_IMG_DIR/$prfName$suffix"` ]] ; then - vblade $vbshelf $vbslot $eth $LTSP_IMG_DIR/$prfName$suffix < /dev/null 2>&1 | logger -t vbladed & - fi - done - else - echo "Networks not found - Aborting!" - exit 1 - fi + vbshelf=0 + vbslot=1 + for prfName in $LTSP_PROFILES + do + # check to prevent duplicate mounting of same image + #lodev=`losetup -j $LTSP_IMG_DIR/$prfName | cut -d ":" -f 1` + #if [ -z "$lodev" ]; then + # # determine the next free loop device + # lodev=`losetup -f` + # Images mounted in default sorted order as returned by ls + # losetup $lodev $LTSP_IMG_DIR/$prfName + #fi + suffix=".img" + [[ ! -f "$LTSP_IMG_DIR/$prfName.img" && -f "$LTSP_IMG_DIR/$prfName" ]] && \ + suffix="" + if [[ -f $LTSP_IMG_DIR/$prfName$suffix ]] ; then + if [[ -z $2 || $prfName == $2 ]] ; then + if [[ -n $DHCP_IFACES ]] ; then + for eth in $DHCP_IFACES + do + if [[ -z `ps --format args a -u root | grep -v ^grep | grep "vblade $vbshelf $vbslot $eth $LTSP_IMG_DIR/$prfName$suffix"` ]] ; then + vblade $vbshelf $vbslot $eth $LTSP_IMG_DIR/$prfName$suffix < /dev/null 2>&1 | logger -t vbladed & + fi + done + else + echo "Networks not found - Aborting!" + exit 1 fi - else - echo "Warning: Image $LTSP_IMG_DIR/$prfName$suffix - not found" fi - ((vbshelf++)) - done - #====================================== - # 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" - exit 0 + else + echo "Warning: Image $LTSP_IMG_DIR/$prfName$suffix - not found" fi - sleep 300 + ((vbshelf++)) done + #====================================== + # 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" + exit 0 + fi ;; stop) if [[ -z $2 ]] ; then Added: trunk/kiwi-ltsp/ltsp/include/klaoe.service =================================================================== --- trunk/kiwi-ltsp/ltsp/include/klaoe.service (rev 0) +++ trunk/kiwi-ltsp/ltsp/include/klaoe.service 2015-09-29 06:08:03 UTC (rev 854) @@ -0,0 +1,13 @@ +[Unit] +Description=Start vbladed service KIWI-LTSP AOEROOT +After=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/share/kiwi-ltsp/kiwi-ltsp-aoe-setup start +ExecStop=/usr/share/kiwi-ltsp/kiwi-ltsp-aoe-setup stop +ExecReload=/usr/share/kiwi-ltsp/kiwi-ltsp-aoe-setup restart + +[Install] +WantedBy=multi-user.target Modified: trunk/kiwi-ltsp/ltsp/install.sh =================================================================== --- trunk/kiwi-ltsp/ltsp/install.sh 2015-09-28 15:00:06 UTC (rev 853) +++ trunk/kiwi-ltsp/ltsp/install.sh 2015-09-29 06:08:03 UTC (rev 854) @@ -22,17 +22,16 @@ #-------------------------------------- [[ $BUILDROOT == "/" ]] && $BUILDROOT= : ${BINDIR:=$BUILDROOT/usr/bin} -: ${SBINDIR:=$BUILDROOT/usr/sbin} : ${DATADIR:=$BUILDROOT/usr/share} # create dirs mkdir -p $BUILDROOT/etc/sysconfig/ \ $BUILDROOT/var/adm/fillup-templates \ $BINDIR \ - $SBINDIR \ $BUILDROOT/etc/init.d \ $DATADIR/kiwi/image/netboot \ $DATADIR/kiwi/image/ltsp/ \ $DATADIR/kiwi-ltsp/ \ + $BUILDROOT/lib/systemd/system \ $DATADIR/kiwi-ltsp/templates #====================================== @@ -43,9 +42,9 @@ echo "/var/adm/fillup-templates/sysconfig.kiwi-ltsp /etc/sysconfig/kiwi-ltsp /etc/init.d/kla - $SBINDIR/rckla + $BINDIR/rckla $BINDIR/kiwi-ltsp-setup - $SBINDIR/kiwi-ltsp-aoe-setup + $BINDIR/kiwi-ltsp-aoe-setup $DATADIR/kiwi-ltsp/ $DATADIR/kiwi/image/netboot/ $DATADIR/kiwi/image/ltsp/" >>$DATADIR/kiwi-ltsp/LIST_INSTALLED_FILES @@ -61,16 +60,16 @@ ln -snf ${DATADIR##$BUILDROOT}/kiwi-ltsp/kiwi-ltsp-setup $BINDIR/ ln -snf ${DATADIR##$BUILDROOT}/kiwi-ltsp/kiwi-ltsp-setup $BINDIR/kiwi-ltsp # TODO: add /bin/kiwi-ltsp as link to kiwi-ltsp-setup ? -cp include/kla $BUILDROOT/etc/init.d/ -cp include/kiwi-ltsp-aoe-setup $SBINDIR/ +cp include/kiwi-ltsp-aoe-setup $BINDIR/ cp include/ltsp-chroot $BINDIR/ cp include/ltsp-update-kernels $BINDIR/ cp include/ltsp-config $BINDIR/ +cp include/klaoe.service $BUILDROOT/lib/systemd/system/ pushd $BINDIR chmod +x ltsp-chroot ltsp-update-kernels ltsp-config +ln -snf kiwi-ltsp-aoe-setup rckla popd -ln -snf /etc/init.d/kla $BINDIR/rckla -chmod +x $SBINDIR/kiwi-ltsp-aoe-setup $BUILDROOT/etc/init.d/kla $DATADIR/kiwi-ltsp/kiwi-ltsp-setup +chmod +x $BINDIR/kiwi-ltsp-aoe-setup $DATADIR/kiwi-ltsp/kiwi-ltsp-setup cp include/kiwi-ltsp-static-conf $DATADIR/kiwi-ltsp/ cp include/mv_unneeded.sh $DATADIR/kiwi-ltsp/ #====================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-28 15:00:07
|
Revision: 853 http://sourceforge.net/p/kiwi-ltsp/code/853 Author: cyberorg Date: 2015-09-28 15:00:06 +0000 (Mon, 28 Sep 2015) Log Message: ----------- fix unsquashfs path and use systemd 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-25 06:57:09 UTC (rev 852) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-28 15:00:06 UTC (rev 853) @@ -855,10 +855,11 @@ log "Path $LTSNFSPATH-$1 already exist - nothing to do." return 0 else - log "unpacking $LTSP_IMG_DIR/$1.img to $LTSNFSPATH-$1" - mkdir -p $LTSNFSPATH-$1 - cd $LTSNFSPATH-$1 + 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" fi else @@ -2559,9 +2560,9 @@ if [[ $TESTRUN != 1 ]]; then for service in xinetd kla sshd epoptes-server do - chkconfig $service on &>/dev/null + systemctl enable $service &>/dev/null log "Restarting service $service" - rc$service restart &>/dev/null + systemctl restart $service &>/dev/null done chkconfig SuSEfirewall2_init on &>/dev/null chkconfig SuSEfirewall2_setup on &>/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-25 06:57:12
|
Revision: 852 http://sourceforge.net/p/kiwi-ltsp/code/852 Author: cyberorg Date: 2015-09-25 06:57:09 +0000 (Fri, 25 Sep 2015) Log Message: ----------- 90-keytable.conf is known as 00-keyboard.conf now 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-23 08:16:12 UTC (rev 851) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2015-09-25 06:57:09 UTC (rev 852) @@ -2374,7 +2374,7 @@ # because all XKB* vars in lts.conf broken, since Xorg used xorg.conf.d #-------------------------------------- mkdir -p $KIWI_LTSP_CONF/root.default/etc/X11/xorg.conf.d 2>/dev/null - cp_with_test /etc/X11/xorg.conf.d/90-keytable.conf $KIWI_LTSP_CONF/root.default/etc/X11/xorg.conf.d/ + cp_with_test /etc/X11/xorg.conf.d/00-keyboard.conf $KIWI_LTSP_CONF/root.default/etc/X11/xorg.conf.d/ #====================================== # Add required files for boot menu #-------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-23 08:16:14
|
Revision: 851 http://sourceforge.net/p/kiwi-ltsp/code/851 Author: cyberorg Date: 2015-09-23 08:16:12 +0000 (Wed, 23 Sep 2015) Log Message: ----------- add atftp instead of tftp package Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.xml 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...> - 2015-09-23 08:10:02
|
Revision: 850 http://sourceforge.net/p/kiwi-ltsp/code/850 Author: cyberorg Date: 2015-09-23 08:10:00 +0000 (Wed, 23 Sep 2015) Log Message: ----------- add tftp package Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.xml 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...> - 2015-09-23 05:13:12
|
Revision: 849 http://sourceforge.net/p/kiwi-ltsp/code/849 Author: cyberorg Date: 2015-09-23 05:13:10 +0000 (Wed, 23 Sep 2015) Log Message: ----------- tumbleweed as default Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp =================================================================== --- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp 2015-09-23 05:05:08 UTC (rev 848) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp 2015-09-23 05:13:10 UTC (rev 849) @@ -81,7 +81,7 @@ ## Type: list(11.2,11.3,11.4) ## Default: 12.2 #Set the openSUSE version to use for creating image -SUSE_VERSION="13.2" +SUSE_VERSION="tumbleweed" ## Type: string ## Default: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-23 05:05:11
|
Revision: 848 http://sourceforge.net/p/kiwi-ltsp/code/848 Author: cyberorg Date: 2015-09-23 05:05:08 +0000 (Wed, 23 Sep 2015) Log Message: ----------- disable systemd-hwdb-update.service 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-09-22 15:13:23 UTC (rev 847) +++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2015-09-23 05:05:08 UTC (rev 848) @@ -60,8 +60,10 @@ rm /usr/lib/systemd/system/ldconfig.service chkconfig purge-kernels off chkconfig systemd-hwdb-update off +rm /usr/lib/systemd/system/systemd-hwdb-update.service # these are disabled because kiwi enables them without being default chkconfig raw off +systemctl disable rsyslog.service systemctl disable wicked.service systemctl disable systemd-readahead-collect.service systemctl disable systemd-readahead-done.service This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-22 15:13:25
|
Revision: 847 http://sourceforge.net/p/kiwi-ltsp/code/847 Author: cyberorg Date: 2015-09-22 15:13:23 +0000 (Tue, 22 Sep 2015) Log Message: ----------- generate ssh keys 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-09-22 15:05:29 UTC (rev 846) +++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2015-09-22 15:13:23 UTC (rev 847) @@ -75,6 +75,7 @@ mkdir -p /root/.ssh chmod 700 /root/.ssh #Setup ssh host keys +/usr/sbin/sshd-gen-keys-start #service sshd start #service sshd stop #Fix for ldm hang on wrong password This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-22 15:05:31
|
Revision: 846 http://sourceforge.net/p/kiwi-ltsp/code/846 Author: cyberorg Date: 2015-09-22 15:05:29 +0000 (Tue, 22 Sep 2015) Log Message: ----------- cleanup 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-09-22 14:56:37 UTC (rev 845) +++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2015-09-22 15:05:29 UTC (rev 846) @@ -57,6 +57,7 @@ suseRemoveService boot.scsidev suseRemoveService boot.md chkconfig ldconfig off +rm /usr/lib/systemd/system/ldconfig.service chkconfig purge-kernels off chkconfig systemd-hwdb-update off # these are disabled because kiwi enables them without being default This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2015-09-22 14:56:39
|
Revision: 845 http://sourceforge.net/p/kiwi-ltsp/code/845 Author: cyberorg Date: 2015-09-22 14:56:37 +0000 (Tue, 22 Sep 2015) Log Message: ----------- cleanup 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-09-22 14:45:47 UTC (rev 844) +++ trunk/kiwi-ltsp/ltsp/suse-tumbleweed/config.sh 2015-09-22 14:56:37 UTC (rev 845) @@ -56,8 +56,6 @@ suseRemoveService rpasswdd suseRemoveService boot.scsidev suseRemoveService boot.md -echo "ldconfig" -ldconfig chkconfig ldconfig off chkconfig purge-kernels off chkconfig systemd-hwdb-update off This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-27 07:06:57
|
Revision: 843 http://sourceforge.net/p/kiwi-ltsp/code/843 Author: cyberorg Date: 2014-08-27 07:06:50 +0000 (Wed, 27 Aug 2014) Log Message: ----------- firefix not installed in default image, can be added by users Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml 2014-08-27 05:52:15 UTC (rev 842) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml 2014-08-27 07:06:50 UTC (rev 843) @@ -70,7 +70,7 @@ <package name="ltspfs"/> <package name="ltspfsd"/> <package name="Mesa"/> - <package name="MozillaFirefox"/> + <!--package name="MozillaFirefox"/--> <package name="nbd"/> <package name="netcfg"/> <package name="net-tools"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-27 05:52:25
|
Revision: 842 http://sourceforge.net/p/kiwi-ltsp/code/842 Author: cyberorg Date: 2014-08-27 05:52:15 +0000 (Wed, 27 Aug 2014) Log Message: ----------- do not start epoptes, ldm handles that Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init 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-24 15:00:08 UTC (rev 841) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init 2014-08-27 05:52:15 UTC (rev 842) @@ -128,6 +128,7 @@ case "$1" in start) + epoptes-client -c || true load_modules || true configure_network || true get_files_from_tftpd || true @@ -145,8 +146,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 & + #epoptes-client & ;; stop) killall ltspfsd 2> /dev/null || true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-24 15:00:13
|
Revision: 841 http://sourceforge.net/p/kiwi-ltsp/code/841 Author: cyberorg Date: 2014-08-24 15:00:08 +0000 (Sun, 24 Aug 2014) Log Message: ----------- remove KIWI_KERNEL_ARGS_ for now as it messes up cmdline if - or . is in prfname 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 2014-08-24 14:42:57 UTC (rev 840) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2014-08-24 15:00:08 UTC (rev 841) @@ -2159,7 +2159,7 @@ local file=$1 local prfName=$2 local root_adr="" - eval append_arg="\" \$KIWI_KERNEL_ARGS \$KIWI_KERNEL_ARGS_$prfName\" " + eval append_arg="\" \$KIWI_KERNEL_ARGS \" " local Server_IP_=$SERVER_IP # Change Server_IP_ if client should autodetect server ip [[ x$NETBOOT_SERVER_AUTODETECTION = x"1" ]] && Server_IP_="" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-24 14:43:01
|
Revision: 840 http://sourceforge.net/p/kiwi-ltsp/code/840 Author: cyberorg Date: 2014-08-24 14:42:57 +0000 (Sun, 24 Aug 2014) Log Message: ----------- allow . and - in image name 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 2014-08-23 14:37:39 UTC (rev 839) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2014-08-24 14:42:57 UTC (rev 840) @@ -569,7 +569,7 @@ # TODO: rework it: if no profiles found run import profile #update_variable LTSP_IMG_DIR $TESTDIR/$KIWI_LTSP_CONF_FILE fi - if [[ -z `echo $LTSP_PROFILES | egrep "^[ _[:alnum:]]+$"` ]] ; then + if [[ -z `echo $LTSP_PROFILES | egrep "^[ ._[:alnum:]-]+$"` ]] ; then log "Error: LTSP_PROFILES is incorrect, please edit it in /etc/sysconfig/kiwi-ltsp" log "(it should contain only: _ , letters or digits)" log "Exiting" @@ -2916,7 +2916,7 @@ #====================================== # Is profile name correct? #-------------------------------------- - if [[ -z `echo $newprf | egrep "^[_[:alnum:]]+$"` ]] ; then + if [[ -z `echo $newprf | egrep "^[._[:alnum:]-]+$"` ]] ; then log "Profile name incorrect (it should contain only: _ , letters or digits)" exit 1 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <cyb...@us...> - 2014-08-23 13:55:54
|
Revision: 838 http://sourceforge.net/p/kiwi-ltsp/code/838 Author: cyberorg Date: 2014-08-23 13:55:32 +0000 (Sat, 23 Aug 2014) Log Message: ----------- copy rtl_nic firmware to boot 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 2014-08-23 11:13:54 UTC (rev 837) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2014-08-23 13:55:32 UTC (rev 838) @@ -1624,6 +1624,8 @@ if [ x"$LTSP_DEBUG" = x"" -o x"$LTSP_DEBUG" = x"0" ]; then mv_log "$TMPPATH.log" kiwi-netboot-phase1 fi + log "cp -r /lib/firmware/rtl_nic $TMPPATH/lib/firmware/" + cp -r /lib/firmware/rtl_nic $TMPPATH/lib/firmware/ log "KIWI netboot preparation for $LTSP_IMG_NAME successful! " } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-23 11:13:57
|
Revision: 837 http://sourceforge.net/p/kiwi-ltsp/code/837 Author: cyberorg Date: 2014-08-23 11:13:54 +0000 (Sat, 23 Aug 2014) Log Message: ----------- add suse-13.2 Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp Modified: trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp =================================================================== --- trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp 2014-08-23 10:58:23 UTC (rev 836) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp 2014-08-23 11:13:54 UTC (rev 837) @@ -81,7 +81,7 @@ ## Type: list(11.2,11.3,11.4) ## Default: 12.2 #Set the openSUSE version to use for creating image -SUSE_VERSION="13.1" +SUSE_VERSION="13.2" ## Type: string ## Default: @@ -290,14 +290,14 @@ # http://en.opensuse.org/Build_Service/cross_distribution_package_how_to#Detect_a_distribution_flavor_for_special_code # # Path to iso image file or local dir where iso is mounted can also be used -suse_1310_INSTALL_SOURCE= +suse_1320_INSTALL_SOURCE=http://download.opensuse.org/factory/repo/oss/ ## Type: list(yast2,rpm-dir,rpm-md) ## Default: # Format of redefined repository # Related to to ${DISTRO_NAME}_${DISTRO_VERSION}_INSTALL_SOURCE # Use format: ${DISTRO_NAME}_${DISTRO_VERSION}_INSTALL_SOURCE_TYPE -suse_1310_INSTALL_SOURCE_TYPE= +suse_1320_INSTALL_SOURCE_TYPE=yast2 ## Type: list(yes,no,auto) ## Default: auto This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-23 10:58:41
|
Revision: 836 http://sourceforge.net/p/kiwi-ltsp/code/836 Author: cyberorg Date: 2014-08-23 10:58:23 +0000 (Sat, 23 Aug 2014) Log Message: ----------- add suse-13.2 Modified Paths: -------------- trunk/kiwi-ltsp/ltsp/suse-13.1/root/usr/bin/boot.discover 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/usr/bin/boot.discover Added Paths: ----------- trunk/kiwi-ltsp/ltsp/suse-13.2/ trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/lib/ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/lib/systemd/ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/lib/systemd/system/ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/lib/systemd/system/ltsp-init.service Removed Paths: ------------- trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/epoptes-client-0.5.7-12.1.noarch.rpm trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ldm2-2.2.12-3.1.i586.rpm trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ltsp-client-5.5.0-8.1.i586.rpm trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ltspfs-1.3-1.1.i586.rpm trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ltspfsd-1.3-1.1.i586.rpm trunk/kiwi-ltsp/ltsp/suse-13.2/root/etc/init.d/ltsp-client.init Modified: trunk/kiwi-ltsp/ltsp/suse-13.1/root/usr/bin/boot.discover =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.1/root/usr/bin/boot.discover 2014-08-23 10:45:28 UTC (rev 835) +++ trunk/kiwi-ltsp/ltsp/suse-13.1/root/usr/bin/boot.discover 2014-08-23 10:58:23 UTC (rev 836) @@ -230,8 +230,7 @@ local i=0 for mod in $sndmods;do echo alias snd-card-$i $mod >> /etc/modprobe.d/sound.conf - modprobe -r $mod - modprobe $mod + lsmod |grep $mod || modprobe $mod i=`expr $i + 1` done Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/config.sh =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.1/config.sh 2014-06-17 05:54:03 UTC (rev 826) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/config.sh 2014-08-23 10:58:23 UTC (rev 836) @@ -90,7 +90,13 @@ chkconfig xdm off chkconfig avahi-dnsconfd off chkconfig avahi-daemon off - +systemctl disable wicked.service +systemctl disable systemd-readahead-collect.service +systemctl disable systemd-readahead-done.service +#mv /etc/init.d/ltsp-client.init /usr/lib/X11/display-manager +systemctl disable display-manager.service +systemctl enable ltsp-init.service +systemctl enable ltspfsd.service #====================================== # Setup ltsp client #-------------------------------------- @@ -109,7 +115,7 @@ #chkconfig boot.compcache on chkconfig boot.langset on chkconfig alsasound on -chkconfig ltsp-client.init on +#chkconfig ltsp-client.init on chkconfig sshd on #groupadd -r pulse #useradd -r -c 'PulseAudio daemon' \ Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.1/config.xml 2014-06-17 05:54:03 UTC (rev 826) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/config.xml 2014-08-23 10:58:23 UTC (rev 836) @@ -6,13 +6,14 @@ <specification>LTSP System</specification> </description> <preferences> - <type image="clicfs" primary="true" boot="netboot/suse-13.1" bootprofile="diskless" bootkernel="std" flags="clic"/> - <version>13.1.1</version> + <type image="clicfs" primary="true" boot="netboot/suse-13.2" bootprofile="diskless" bootkernel="std" flags="clic"/> + <version>13.2.1</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> <locale>en_US</locale> <keytable>us.map.gz</keytable> - <boot-theme>openSUSE</boot-theme> + <bootloader-theme>openSUSE</bootloader-theme> + <bootsplash-theme>openSUSE</bootsplash-theme> </preferences> <users group="users"> <user name="linux" pwd="$2a$10$90AjhfXU2YIwTRrIftBauecvWXVuaNZ6JLM2IpWi0svu2kO16le9e" home="/home/linux"/> @@ -20,17 +21,17 @@ <!-- Note: first repository obligatory should be main all other repository should be below --> <repository type="yast2" status="replaceable" priority="150"> - <source path="http://download.opensuse.org/distribution/13.1/repo/oss/"/> + <source path="http://download.opensuse.org/factory/repo/oss/"/> </repository> - <repository type="rpm-md"> + <!--repository type="rpm-md"> <source path="http://download.opensuse.org/update/13.1/"/> - </repository> + </repository--> <repository type="rpm-dir"> - <source path="/usr/share/kiwi/image/ltsp/suse-13.1/extra-packages"/> + <source path="/usr/share/kiwi/image/ltsp/suse-13.2/extra-packages"/> </repository> - <!--repository type="rpm-md"> - <source path="http://download.opensuse.org/repositories/server:/ltsp/openSUSE_13.1/"/> - </repository--> + <repository type="rpm-md"> + <source path="http://download.opensuse.org/repositories/server:/ltsp/openSUSE_Factory/"/> + </repository> <!--repository type="rpm-md"> <source path="http://download.nvidia.com/opensuse/13.1/"/> </repository--> @@ -48,7 +49,6 @@ <package name="dbus-1"/> <package name="dbus-1-x11"/> <package name="dejavu-fonts"/> - <package name="dhcpcd"/> <package name="epoptes-client"/> <package name="fuse"/> <package name="gawk"/> @@ -60,6 +60,7 @@ <package name="ifplugd"/> <package name="insserv"/> <package name="iputils"/> + <package name="iproute2"/> <package name="kbd"/> <package name="kernel-default"/> <package name="kernel-firmware"/> @@ -73,15 +74,16 @@ <package name="nbd"/> <package name="netcfg"/> <package name="newt"/> + <package name="nfs-client"/> <package name="ntfs-3g"/> <package name="ntfsprogs"/> <package name="numlockx"/> <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"/--> @@ -103,8 +105,11 @@ <package name="sysconfig"/> <package name="systemd"/> <package name="unionfs-fuse" bootinclude="true"/> + <package name="e2fsprogs" bootinclude="true"/> <package name="usbutils"/> <package name="x11-tools"/> + <package name="xf86-video-intel"/> + <package name="xf86-video-modesetting"/> <!--package name="x11-video-nvidiaG01"/--> <package name="xkeyboard-config"/> <package name="xorg-x11"/> @@ -124,6 +129,8 @@ <package name="xrandr"/> <package name="xsane"/> <package name="xterm"/> + <package name="bundle-lang-common-en"/> + <package name="bundle-lang-gnome-en"/> <ignore name="smtp_daemon"/> </packages> <packages type="bootstrap"> @@ -132,70 +139,13 @@ </packages> <packages type="delete"> <!-- DELETE PACKAGES START --> - <package name="audit-libs"/> - <package name="blocxx"/> - <package name="bundle-lang-common-zh"/> - <package name="cpio"/> - <package name="cpp"/> - <package name="cpp47"/> - <!--package name="cyrus-sasl"/--> - <package name="db"/> - <package name="diffutils"/> - <package name="expat"/> - <package name="fillup"/> - <package name="fribidi"/> - <!--package name="gawk"/--> - <package name="gdbm"/> - <package name="gimp"/> - <package name="gimp-branding-openSUSE"/> - <package name="gimp-branding-upstream"/> - <package name="gimp-plugins-python"/> - <!--package name="glib2-tools"/--> - <package name="gnome-keyring"/> - <package name="gpg"/> - <package name="gtk2-engine-crux"/> - <package name="gtk2-engine-glide"/> - <package name="gtk2-engine-hcengine"/> - <package name="gtk2-engine-redmond95"/> - <package name="gtk2-engine-thinice"/> - <!--package name="gtk2-theme-clearlooks"/--> - <package name="gtk2-theme-crux"/> - <package name="gtk2-theme-industrial"/> - <package name="gtk2-theme-redmond95"/> - <package name="gtk2-theme-thinice"/> - <!--package name="hicolor-icon-theme"/--> <package name="info"/> - <package name="libgimpprint"/> - <!--package name="libjpeg"/--> - <package name="liblcms"/> - <package name="libmng"/> - <package name="libtiff3"/> - <package name="libxml2"/> - <package name="libzio"/> - <package name="limal"/> - <package name="limal-bootloader"/> - <package name="limal-perl"/> <package name="logrotate"/> - <package name="luit"/> <package name="make"/> <package name="man-pages"/> <package name="mdadm"/> <package name="mkinitrd"/> - <package name="openldap2-client"/> - <package name="openslp"/> - <package name="openSUSE-release"/> - <package name="pam-config"/> - <package name="pcre"/> - <package name="perl"/> - <package name="perl-Bootloader"/> - <package name="perl-gettext"/> - <package name="perl-HTML-Tagset"/> - <package name="plymouth-branding-openSUSE"/> - <package name="pmtools"/> - <package name="pm-utils"/> - <package name="PolicyKit"/> <package name="postfix"/> - <package name="resmgr"/> <package name="wallpaper-branding-openSUSE"/> <!-- DELETE PACKAGES END DISKLESS --> </packages> Deleted: trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/epoptes-client-0.5.7-12.1.noarch.rpm =================================================================== (Binary files differ) Deleted: trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ldm2-2.2.12-3.1.i586.rpm =================================================================== (Binary files differ) Deleted: trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ltsp-client-5.5.0-8.1.i586.rpm =================================================================== (Binary files differ) Deleted: trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ltspfs-1.3-1.1.i586.rpm =================================================================== (Binary files differ) Deleted: trunk/kiwi-ltsp/ltsp/suse-13.2/extra-packages/ltspfsd-1.3-1.1.i586.rpm =================================================================== (Binary files differ) Deleted: trunk/kiwi-ltsp/ltsp/suse-13.2/root/etc/init.d/ltsp-client.init =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.1/root/etc/init.d/ltsp-client.init 2014-06-17 05:54:03 UTC (rev 826) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/etc/init.d/ltsp-client.init 2014-08-23 10:58:23 UTC (rev 836) @@ -1,170 +0,0 @@ -#! /bin/sh -# -# Author: Matt Zimmerman <md...@ub...> -# Cyberorg Cyberorg <cyb...@cy...> -# Shrenik Bhura <shr...@in...> -# -### BEGIN INIT INFO -# Provides: ltsp-client -# Required-Start: alsasound -# Required-Stop: $network $syslog -# Default-Start: 3 5 -# Default-Stop: S 0 1 6 -# Short-Description: Script for LTSP client initialization -# Description: -### END INIT INFO - -set -e - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="LTSP client" -NAME=ltsp-client -SCRIPTNAME=/etc/init.d/$NAME - -# Gracefully exit if the package has been removed. -test -f /usr/share/ltsp/ltsp_config || exit 0 -# Gracefully exit if ltsp_chroot file is not present -test -f /etc/ltsp_chroot || exit 0 - -. /usr/share/ltsp/ltsp_config -. /usr/share/ltsp/ltsp-init-common - -boolean_is_true(){ - case "$(echo $1 | tr 'A-Z' 'a-z')" in - true|y|yes) return 0 ;; - *) return 1 ;; - esac -} - -configure_network() -{ -#remove old config so it can be rewritten - rm /etc/HOSTNAME /etc/hosts /etc/resolv.conf || true - hostname=$(hostname) - interface=$(cat /run/initramfs/var/lib/dhcpcd/dhcpcd-*.info |grep INTERFACE | cut -d \' -f2) - if [ "(none)" = "$hostname" ] || [ "linux" = "$hostname" ] || [ "none" = "$hostname" ] || [ "ws" = "$hostname" ]; then - export LIP=$(ifconfig $interface | awk '/inet addr/{print substr($2,6)}' | cut -d . -f 4) - export hostname="ws$LIP" - fi - echo "$hostname" > /etc/HOSTNAME - 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 - hostname $hostname - if [ -n "$SEARCH_DOMAIN" ]; then - cat <<EOF >> /etc/resolv.conf -search $SEARCH_DOMAIN -EOF - fi - if [ -n "$DNS_SERVER" ]; then - cat <<EOF >> /etc/resolv.conf -nameserver $DNS_SERVER -EOF - else - cat <<EOF >> /etc/resolv.conf -nameserver $SERVER -nameserver 8.8.4.4 -EOF - fi -} - -get_files_from_tftpd() -{ - if [ -e /etc/notnetbootclient ]; then - echo "get KIWI/deployltspfiles" | tftp $SERVER - sh deployltspfiles - fi -} - -configure_x(){ - if [ ! -f /etc/X11/xorg.conf ];then - ${CONFIGURE_X_COMMAND:-/usr/share/ltsp/configure-x.sh} - fi -} - -run_rcfiles() { - for rcfile in $(env | sort | awk -F= '$1 ~ /^RCFILE_/ { print $2 }'); do - [ -e "$rcfile" ] && "chmod +x $rcfile" && "$rcfile" $@ - done -} - -getltscfg_cluster() { - if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then - # Tell the control center that we are booting and get lts.conf - eval $(getltscfg-cluster -a -l boot) || true - fi -} - -configure_scanner_kl() { - if [ x"$SCANNER_HOST" = x"1" ]; then - "chkconfig sane-port on" && "rcxinetd restart" - fi -} - -configure_scanner() { - if boolean_is_true "$SCANNER" ; then - saned -a - fi -} - -configure_serial_mouse() { - if [ -n "$X_MOUSE_DEVICE" ] && \ - [ -n "$X_MOUSE_PROTOCOL" ] && \ - type inputattach >/dev/null 2>/dev/null ; then - case "${X_MOUSE_DEVICE}" in - *ttyS*) inputattach --"$X_MOUSE_PROTOCOL" "$X_MOUSE_DEVICE" & ;; - esac - fi -} - -load_modules() { - for module in $(env|grep ^MODULE_|sed -e s/^MODULE_[0-9]*\=//|sed -e s/\ /*/g);do - modprobe $(echo $module|tr "*" " ") - done -} - - -case "$1" in - start) - load_modules || true - configure_network || true - get_files_from_tftpd || true - getltscfg_cluster || true - configure_serial_mouse || true - run_rcfiles || true - . /etc/sysconfig/language - export LANG="$RC_LANG" - /usr/bin/plymouth quit --retain-splash || true - start_screen_sessions || true - start_sound || true - configure_sound_volume || true - configure_scanner_kl || true - 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 - exec epoptes-client - ;; - stop) - killall ltspfsd 2> /dev/null || true - killall pulseaudio 2> /dev/null || true - killall jetpipe 2> /dev/null || true - ;; - restart) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart". - # - echo -n "Restarting $DESC: $NAME" - sleep 1 - echo "." - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 Added: trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot (rev 0) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot 2014-08-23 10:58:23 UTC (rev 836) @@ -0,0 +1,5 @@ +#!/bin/bash +fusermount -uzq /usr/lib/browser-plugins || true +#drastic measures +echo 1 > /proc/sys/kernel/sysrq +echo b > /proc/sysrq-trigger Property changes on: trunk/kiwi-ltsp/ltsp/suse-13.2/root/sbin/reboot ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Modified: trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/boot.discover =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.1/root/usr/bin/boot.discover 2014-06-17 05:54:03 UTC (rev 826) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/boot.discover 2014-08-23 10:58:23 UTC (rev 836) @@ -230,8 +230,7 @@ local i=0 for mod in $sndmods;do echo alias snd-card-$i $mod >> /etc/modprobe.d/sound.conf - modprobe -r $mod - modprobe $mod + lsmod |grep $mod || modprobe $mod i=`expr $i + 1` done Added: 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 (rev 0) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init 2014-08-23 10:58:23 UTC (rev 836) @@ -0,0 +1,171 @@ +#! /bin/sh +# +# Author: Matt Zimmerman <md...@ub...> +# Cyberorg Cyberorg <cyb...@cy...> +# Shrenik Bhura <shr...@in...> +# +### BEGIN INIT INFO +# Provides: ltsp-client +# Required-Start: alsasound +# Required-Stop: $network $syslog +# Default-Start: 3 5 +# Default-Stop: S 0 1 6 +# Short-Description: Script for LTSP client initialization +# Description: +### END INIT INFO + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="LTSP client" +NAME=ltsp-client +SCRIPTNAME=/etc/init.d/$NAME + +# Gracefully exit if the package has been removed. +test -f /usr/share/ltsp/ltsp_config || exit 0 +# Gracefully exit if ltsp_chroot file is not present +test -f /etc/ltsp_chroot || exit 0 + +. /usr/share/ltsp/ltsp_config +. /usr/share/ltsp/ltsp-init-common + +boolean_is_true(){ + case "$(echo $1 | tr 'A-Z' 'a-z')" in + true|y|yes) return 0 ;; + *) return 1 ;; + esac +} + +configure_network() +{ +#remove old config so it can be rewritten + rm /etc/HOSTNAME /etc/hosts /etc/resolv.conf || true + hostname=$(hostname) + interface=$(cat /var/run/wicked/wicked-*.info |grep INTERFACE | cut -d \' -f2) + if [ "(none)" = "$hostname" ] || [ "linux" = "$hostname" ] || [ "none" = "$hostname" ] || [ "ws" = "$hostname" ]; then +# export LIP=$(ifconfig $interface | awk '/inet addr/{print substr($2,6)}' | cut -d . -f 4) + export LIP=$(ifconfig $interface | awk '/inet addr/{print substr($2,6)}' | cut -d . -f 3,4 | sed -e "s/\.//g") + export hostname="ws$LIP" + fi + echo "$hostname" > /etc/HOSTNAME + 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 + hostname $hostname + if [ -n "$SEARCH_DOMAIN" ]; then + cat <<EOF >> /etc/resolv.conf +search $SEARCH_DOMAIN +EOF + fi + if [ -n "$DNS_SERVER" ]; then + cat <<EOF >> /etc/resolv.conf +nameserver $DNS_SERVER +EOF + else + cat <<EOF >> /etc/resolv.conf +nameserver $SERVER +nameserver 8.8.4.4 +EOF + fi +} + +get_files_from_tftpd() +{ + if [ -e /etc/notnetbootclient ]; then + echo "get KIWI/deployltspfiles" | tftp $SERVER + sh deployltspfiles + fi +} + +configure_x(){ + if [ ! -f /etc/X11/xorg.conf ];then + ${CONFIGURE_X_COMMAND:-/usr/share/ltsp/configure-x.sh} + fi +} + +run_rcfiles() { + for rcfile in $(env | sort | awk -F= '$1 ~ /^RCFILE_/ { print $2 }'); do + [ -e "$rcfile" ] && "chmod +x $rcfile" && "$rcfile" $@ + done +} + +getltscfg_cluster() { + if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then + # Tell the control center that we are booting and get lts.conf + eval $(getltscfg-cluster -a -l boot) || true + fi +} + +configure_scanner_kl() { + if [ x"$SCANNER_HOST" = x"1" ]; then + "chkconfig sane-port on" && "rcxinetd restart" + fi +} + +configure_scanner() { + if boolean_is_true "$SCANNER" ; then + saned -a + fi +} + +configure_serial_mouse() { + if [ -n "$X_MOUSE_DEVICE" ] && \ + [ -n "$X_MOUSE_PROTOCOL" ] && \ + type inputattach >/dev/null 2>/dev/null ; then + case "${X_MOUSE_DEVICE}" in + *ttyS*) inputattach --"$X_MOUSE_PROTOCOL" "$X_MOUSE_DEVICE" & ;; + esac + fi +} + +load_modules() { + for module in $(env|grep ^MODULE_|sed -e s/^MODULE_[0-9]*\=//|sed -e s/\ /*/g);do + modprobe $(echo $module|tr "*" " ") + done +} + + +case "$1" in + start) + load_modules || true + configure_network || true + get_files_from_tftpd || true + getltscfg_cluster || true + configure_serial_mouse || true + run_rcfiles || true + . /etc/sysconfig/language + export LANG="$RC_LANG" + /usr/bin/plymouth quit --retain-splash || true + start_screen_sessions || true + start_sound || true + configure_sound_volume || true + configure_scanner_kl || true + 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 & + ;; + stop) + killall ltspfsd 2> /dev/null || true + killall pulseaudio 2> /dev/null || true + killall jetpipe 2> /dev/null || true + ;; + restart) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: $NAME" + sleep 1 + echo "." + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2 + exit 1 + ;; +esac + +exit 0 Property changes on: trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/bin/ltsp-client.init ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/lib/systemd/system/ltsp-init.service =================================================================== --- trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/lib/systemd/system/ltsp-init.service (rev 0) +++ trunk/kiwi-ltsp/ltsp/suse-13.2/root/usr/lib/systemd/system/ltsp-init.service 2014-08-23 10:58:23 UTC (rev 836) @@ -0,0 +1,18 @@ +[Unit] +Description=LTSP client init +Requires=var-run.mount +After=ypbind.service gpm.service time-sync.target winbind.service acpid.service +Wants=remote-fs.target dbus.socket systemd-user-sessions.service +After=remote-fs.target dbus.socket systemd-user-sessions.service + +[Service] +Type=forking +PIDFile=/var/run/ltsp-client.init.pid +ExecStart=/usr/bin/ltsp-client.init start +ExecStop=/usr/bin/ltsp-client.init stop +ExecReload=/usr/bin/ltsp-client.init reload +KillMode=process + +[Install] +WantedBy=graphical.target +Alias=xdm.service This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-23 10:45:33
|
Revision: 835 http://sourceforge.net/p/kiwi-ltsp/code/835 Author: cyberorg Date: 2014-08-23 10:45:28 +0000 (Sat, 23 Aug 2014) Log Message: ----------- minor cleanup 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 2014-08-23 10:43:49 UTC (rev 834) +++ trunk/kiwi-ltsp/ltsp/include/kiwi-ltsp-functions.sh 2014-08-23 10:45:28 UTC (rev 835) @@ -1711,20 +1711,9 @@ else mkdir -p $TFTPBOOTPATH/boot fi - #====================================== - # Setup splash screen (if needed), and copy files to right place - #-------------------------------------- - #if [[ -n `echo $initrd_name | grep splash` ]]; then - # initrd_name=`find "$TMPPATH-boot" -type f -name "initrd-*splash.gz" -printf "%f "` - # mv $TMPPATH-boot/$initrd_name $TFTPBOOTPATH/boot/initrd-$LTSP_IMG_NAME - #else - # $KIWICMD --setup-splash $TMPPATH-boot/$initrd_name - # if [[ -n `find "$TMPPATH-boot" -type f -name "*splash.gz" -printf "%f "` ]] ; then - # initrd_name=`find "$TMPPATH-boot" -type f -name "initrd-*splash.gz" -printf "%f "` - # fi - mv $TMPPATH-boot/$initrd_name $TFTPBOOTPATH/boot/initrd-$LTSP_IMG_NAME - #fi + mv $TMPPATH-boot/$initrd_name $TFTPBOOTPATH/boot/initrd-$LTSP_IMG_NAME + mv $TMPPATH-boot/$kernel_name $TFTPBOOTPATH/boot/linux-$LTSP_IMG_NAME ln -sf linux-$LTSP_IMG_NAME "$TFTPBOOTPATH/boot/$LTSP_IMG_NAME-$kernel_name" # for compare kernel versions rm -rf "$TMPPATH-boot" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cyb...@us...> - 2014-08-23 10:43:58
|
Revision: 834 http://sourceforge.net/p/kiwi-ltsp/code/834 Author: cyberorg Date: 2014-08-23 10:43:49 +0000 (Sat, 23 Aug 2014) Log Message: ----------- add setupdnsmasq.sh Added Paths: ----------- trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh Added: trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh =================================================================== --- trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh (rev 0) +++ trunk/kiwi-ltsp/ltsp/include/setupdnsmasq.sh 2014-08-23 10:43:49 UTC (rev 834) @@ -0,0 +1,58 @@ +#!/bin/bash +# kiwi-ltsp - Part of KIWI-LTSP as created by CyberOrg +# +# Copyright (c) 2014 CyberOrg +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Authors: Jigish Gohil <cyb...@cy...> +# Magnus Boman <cap...@gm...> +# Shrenik Bhura <shr...@in...> +# Alex Savin <ale...@op...> +#helper script to set up dnsmasq for ltsp +mkdir -p $TESTDIR/etc/dnsmasq.d +setup_dnsmasq() { + #====================================== + # Write networks specific configs + #-------------------------------------- + local i=0 + for eth_ in $DHCP_IFACES + do + ((i++)) + export sub_net="`echo $DHCP_SUBNETS | cut -f$i -d' ' `" + export netmask="`echo $DHCP_NETMASKS | cut -f$i -d' ' `" + export range_start="`echo $DHCP_RANGES | cut -f$((i*2-1)) -d' ' `" + export range_end="`echo $DHCP_RANGES | cut -f$((i*2)) -d' ' `" + export tftp_server="`echo $TFTP_SERVERS | cut -f$i -d' ' `" + export gateway="`echo $GATEWAYS | cut -f$i -d' ' `" + #====================================== + # Use first value of $TFTP_SERVERS and $GATEWAYS if other not specified + #-------------------------------------- + [[ -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 +dhcp-range=$range_start,$range_end,1h +EOF + done +cat <<EOF >>$TESTDIR/etc/dnsmasq.d/kiwi-ltsp.conf +dhcp-vendorclass=pxe,PXEClient +dhcp-boot=net:pxe,/pxelinux.0 +enable-tftp +tftp-root=$TFTPBOOTPATH +EOF + sed -i -e "s:disable.*:disable = yes:" $TESTDIR/etc/xinetd.d/tftp && rcxinetd restart + sed -i -e "s:.*conf-dir=/etc/dnsmasq.d:conf-dir=/etc/dnsmasq.d:" $TESTDIR/etc/dnsmasq.conf + chkconfig dnsmasq on + rcdnsmasq restart +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |