Merge lp:~enslaver-l/ltsp/ltsp-rhel into lp:~ltsp-upstream/ltsp/ltsp-trunk

Proposed by Joshua Trimm
Status: Rejected
Rejected by: Alkis Georgopoulos
Proposed branch: lp:~enslaver-l/ltsp/ltsp-rhel
Merge into: lp:~ltsp-upstream/ltsp/ltsp-trunk
Diff against target: 34041 lines (+26666/-4898)
375 files modified
.bzrignore (+4/-0)
.gitignore (+11/-0)
client/Fedora/chroot-setup/chroot-setup.d/000-pre-mount-proc (+3/-0)
client/Fedora/chroot-setup/chroot-setup.d/010-cleanup-consoles (+15/-0)
client/Fedora/chroot-setup/chroot-setup.d/020-dracut-config (+15/-0)
client/Fedora/chroot-setup/chroot-setup.d/030-configure-client (+57/-0)
client/Fedora/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config (+7/-0)
client/Fedora/chroot-setup/chroot-setup.d/090-post-umount-proc (+3/-0)
client/Fedora/chroot-setup/ltsp-chroot-setup (+11/-0)
client/Fedora/initscripts/ltsp-client-launch (+0/-91)
client/Fedora/initscripts/ltsp-core (+72/-0)
client/Fedora/rwtab.d/ltsp.rwtab (+27/-0)
client/Fedora/scripts/ltsp-rewrap-latest-kernel (+10/-0)
client/Fedora/share/ltsp/init-ltsp.d/00-overlay (+123/-0)
client/Fedora/share/ltsp/init-ltsp.d/09-hostname (+35/-0)
client/Fedora/share/ltsp/ltsp-client-launch (+91/-0)
client/Fedora/share/ltsp/ltsp-client-vendor-functions (+108/-0)
client/Fedora/template/20-xinitrc-badprocs.sh (+6/-0)
client/Fedora/template/plymouth-default-boot-duration (+11/-0)
client/Fedora/template/sl-other.repo (+42/-0)
client/Fedora/template/x2go.repo (+7/-0)
client/RHEL/chroot-setup/chroot-setup.d/000-pre-mount-proc (+3/-0)
client/RHEL/chroot-setup/chroot-setup.d/015-install-nbd (+8/-0)
client/RHEL/chroot-setup/chroot-setup.d/020-dracut-config (+15/-0)
client/RHEL/chroot-setup/chroot-setup.d/030-configure-client (+59/-0)
client/RHEL/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config (+7/-0)
client/RHEL/chroot-setup/chroot-setup.d/090-post-umount-proc (+3/-0)
client/RHEL/chroot-setup/ltsp-chroot-setup (+11/-0)
client/RHEL/initscripts/ltsp-client-launch (+91/-0)
client/RHEL/initscripts/ltsp-core (+72/-0)
client/RHEL/rwtab.d/ltsp.rwtab (+27/-0)
client/RHEL/scripts/ltsp-rewrap-latest-kernel (+10/-0)
client/RHEL/share/ltsp/init-ltsp.d/00-overlay (+123/-0)
client/RHEL/share/ltsp/init-ltsp.d/09-hostname (+35/-0)
client/RHEL/share/ltsp/init-ltsp.d/10-cleanup-consoles (+15/-0)
client/RHEL/share/ltsp/init-ltsp.d/50-gconf-settings (+8/-0)
client/RHEL/share/ltsp/ltsp-client-launch (+91/-0)
client/RHEL/share/ltsp/ltsp-client-vendor-functions (+108/-0)
client/RHEL/template/20-xinitrc-badprocs.sh (+6/-0)
client/RHEL/template/plymouth-default-boot-duration (+11/-0)
client/RHEL/template/sl-other.repo (+42/-0)
client/RHEL/template/x2go.repo (+7/-0)
client/Redhat/chroot-setup/chroot-setup.d/000-pre-mount-proc (+0/-3)
client/Redhat/chroot-setup/chroot-setup.d/010-cleanup-consoles (+0/-15)
client/Redhat/chroot-setup/chroot-setup.d/020-dracut-config (+0/-15)
client/Redhat/chroot-setup/chroot-setup.d/030-configure-client (+0/-57)
client/Redhat/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config (+0/-7)
client/Redhat/chroot-setup/chroot-setup.d/090-post-umount-proc (+0/-3)
client/Redhat/chroot-setup/ltsp-chroot-setup (+0/-11)
client/Redhat/initscripts/ltsp-client-launch (+0/-91)
client/Redhat/initscripts/ltsp-core (+0/-72)
client/Redhat/rwtab.d/ltsp.rwtab (+0/-27)
client/Redhat/scripts/ltsp-rewrap-latest-kernel (+0/-10)
client/Redhat/share/ltsp/init-ltsp.d/00-overlay (+0/-123)
client/Redhat/share/ltsp/init-ltsp.d/09-hostname (+0/-33)
client/Redhat/share/ltsp/ltsp-client-launch (+0/-91)
client/Redhat/share/ltsp/ltsp-client-vendor-functions (+0/-108)
client/Redhat/template/20-xinitrc-badprocs.sh (+0/-6)
client/Redhat/template/plymouth-default-boot-duration (+0/-11)
client/Redhat/template/sl-other.repo (+0/-42)
client/k12linux/chroot-setup/README (+0/-1)
client/k12linux/chroot-setup/ltsp-chroot-setup (+0/-11)
client/k12linux/chroot-setup/ltsp-chroot-setup.d/000-pre-mount-proc (+0/-3)
client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-cleanup-consoles (+0/-15)
client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-etc-hosts (+0/-23)
client/k12linux/chroot-setup/ltsp-chroot-setup.d/030-configure-client (+0/-61)
client/k12linux/chroot-setup/ltsp-chroot-setup.d/085-sl6-fastbugs-yum-config (+0/-7)
client/k12linux/chroot-setup/ltsp-chroot-setup.d/090-post-umount-proc (+0/-3)
client/k12linux/rwtab.d/k12linux.rwtab (+0/-27)
client/k12linux/scripts/ltsp-rewrap-latest-kernel (+0/-8)
client/k12linux/template/plymouth-default-boot-duration (+0/-11)
client/k12linux/template/sl-other.repo (+0/-42)
client/share/ltsp/background.svg (+447/-0)
client/share/ltsp/init-ltsp.d/00-overlay (+123/-0)
client/share/ltsp/init-ltsp.d/09-hostname (+1/-1)
client/share/ltsp/init-ltsp.d/50-opengl (+1/-0)
client/share/ltsp/screen-x-common (+8/-2)
client/share/ltsp/screen.d/x2goclient (+30/-0)
client/share/ltsp/x2gothinclient_sessions (+38/-0)
client/share/ltsp/x2gothinclient_start (+61/-0)
common/ltsp-common-functions (+19/-2)
server/Fedora/configs/dhcpd.conf (+36/-0)
server/Fedora/configs/dracut/ifcfg-eth0 (+3/-0)
server/Fedora/configs/dracut/ltsp-dracut.conf (+28/-0)
server/Fedora/configs/dracut/ltsp-postinst.d (+57/-0)
server/Fedora/configs/dracut/ltsp-prerm.d (+7/-0)
server/Fedora/configs/dracut/sysconfig-dracut (+28/-0)
server/Fedora/configs/dracut/sysconfig-dracut-skip-first-time (+3/-0)
server/Fedora/configs/dracut/sysconfig-mkinitrd (+26/-0)
server/Fedora/configs/dracut/sysconfig-network (+1/-0)
server/Fedora/configs/fat-client-groups (+7/-0)
server/Fedora/configs/kickstart/11/ltsp-i386.ks (+0/-18)
server/Fedora/configs/kickstart/14/ltsp-i386.ks (+0/-12)
server/Fedora/configs/kickstart/14/ltsp-x86_64.ks (+0/-12)
server/Fedora/configs/kickstart/common/arch/i586.ks (+0/-7)
server/Fedora/configs/kickstart/common/arch/i686.ks (+0/-7)
server/Fedora/configs/kickstart/common/arch/ppc.ks (+0/-6)
server/Fedora/configs/kickstart/common/arch/x86_64.ks (+0/-7)
server/Fedora/configs/kickstart/common/common.ks (+0/-200)
server/Fedora/configs/kickstart/common/release/11.ks (+0/-5)
server/Fedora/configs/kickstart/common/release/14.ks (+0/-11)
server/Fedora/configs/kickstart/common/release/el6.ks (+0/-12)
server/Fedora/configs/kickstart/el6/ltsp-i386.ks (+0/-27)
server/Fedora/configs/kickstart/el6/ltsp-x86_64.ks (+0/-14)
server/Fedora/configs/lts.conf (+81/-0)
server/Fedora/configs/ltsp-build-client.conf (+10/-0)
server/Fedora/configs/ltsp-server.conf (+23/-0)
server/Fedora/configs/mock/fat-groups.list (+7/-0)
server/Fedora/configs/mock/logging.ini (+84/-0)
server/Fedora/configs/mock/ltsp-template.cfg (+58/-0)
server/Fedora/configs/mock/ltsp.cfg (+17/-0)
server/Fedora/configs/mock/site-defaults.cfg (+153/-0)
server/Fedora/configs/nbdswapd.conf (+4/-0)
server/Fedora/configs/pxe-default.conf (+5/-0)
server/Fedora/configs/services/ltsp-dhcpd.init (+0/-156)
server/Fedora/configs/services/sysconfig-ltsp-dhcpd (+0/-2)
server/Fedora/scripts/dhcpd-update (+66/-0)
server/Fedora/scripts/hosts-update (+32/-0)
server/Fedora/scripts/iscsi-update (+78/-0)
server/Fedora/scripts/ltsp-prepare-kernel (+38/-0)
server/Fedora/scripts/ltsp-server-initialize (+120/-0)
server/Fedora/scripts/ltsp-server-tweaks (+28/-0)
server/Fedora/scripts/ltsp-update-image (+316/-0)
server/Fedora/scripts/ltspbashgui (+1536/-0)
server/Fedora/scripts/ltspbashgui_7.0.0.lib (+6964/-0)
server/Fedora/scripts/ltspbashlib (+575/-0)
server/Fedora/scripts/mksquashfs-exclude (+12/-0)
server/Fedora/scripts/scripts.d/01-gdm.conf-update (+62/-0)
server/Fedora/scripts/scripts.d/03-exports-update (+20/-0)
server/Fedora/scripts/scripts.d/04-syslog-update (+41/-0)
server/Fedora/scripts/scripts.d/05-Xaccess-update (+33/-0)
server/Fedora/scripts/scripts.d/06-xdm-config-update (+33/-0)
server/Fedora/scripts/scripts.d/07-xinetd-sysconfig-update (+34/-0)
server/Fedora/scripts/scripts.d/08-selinux-alter (+12/-0)
server/Fedora/scripts/scripts.d/09-disable-suspend-hibernate (+10/-0)
server/Fedora/scripts/scripts.d/14-kdmrc-update (+35/-0)
server/Fedora/scripts/scripts.d/15-kwin-update (+12/-0)
server/Fedora/scripts/scripts.d/16-sysctl-update (+31/-0)
server/Fedora/scripts/scripts.d/17-enable-services (+11/-0)
server/Fedora/scripts/systemd/iptables-ltsp (+1/-0)
server/Fedora/scripts/systemd/ltsp-dhcpd (+1/-0)
server/Fedora/scripts/systemd/ltsp-named (+1/-0)
server/Fedora/scripts/systemd/ltspfs-insecure (+1/-0)
server/Fedora/scripts/systemd/nbdswapd (+1/-0)
server/Fedora/scripts/systemd/nfs (+1/-0)
server/Fedora/scripts/systemd/nfslock (+1/-0)
server/Fedora/scripts/systemd/rpcbind (+1/-0)
server/Fedora/scripts/systemd/tftp (+1/-0)
server/Fedora/scripts/systemd/vncts (+1/-0)
server/Fedora/scripts/systemd/xinetd (+1/-0)
server/Fedora/share/ltsp/ltsp-info-functions (+23/-0)
server/Fedora/share/ltsp/ltsp-server-vendor-functions (+0/-5)
server/Fedora/yum-repo/RPM-GPG-KEY-ltsp (+31/-0)
server/Fedora/yum-repo/ltsp-release.spec (+48/-0)
server/Fedora/yum-repo/ltsp.repo (+17/-0)
server/Gentoo/configs/profiles/kicktoo-5.3.profile (+134/-91)
server/RHEL/configs/dhcpd.conf (+36/-0)
server/RHEL/configs/dracut/ifcfg-eth0 (+3/-0)
server/RHEL/configs/dracut/ltsp-dracut.conf (+28/-0)
server/RHEL/configs/dracut/ltsp-postinst.d (+57/-0)
server/RHEL/configs/dracut/ltsp-prerm.d (+7/-0)
server/RHEL/configs/dracut/sysconfig-dracut (+28/-0)
server/RHEL/configs/dracut/sysconfig-dracut-skip-first-time (+3/-0)
server/RHEL/configs/dracut/sysconfig-mkinitrd (+26/-0)
server/RHEL/configs/dracut/sysconfig-network (+1/-0)
server/RHEL/configs/fat-client-groups (+7/-0)
server/RHEL/configs/lts.conf (+81/-0)
server/RHEL/configs/ltsp-build-client.conf (+10/-0)
server/RHEL/configs/ltsp-server.conf (+23/-0)
server/RHEL/configs/mock/fat-groups.list (+7/-0)
server/RHEL/configs/mock/logging.ini (+84/-0)
server/RHEL/configs/mock/ltsp.cfg (+16/-0)
server/RHEL/configs/mock/site-defaults.cfg (+153/-0)
server/RHEL/configs/nbdswapd.conf (+4/-0)
server/RHEL/configs/pxe-default.conf (+5/-0)
server/RHEL/configs/services/ltsp-dhcpd.init (+156/-0)
server/RHEL/configs/services/sysconfig-ltsp-dhcpd (+2/-0)
server/RHEL/scripts/chkconfig.d/iptables-ltsp (+1/-0)
server/RHEL/scripts/chkconfig.d/ldminfod (+1/-0)
server/RHEL/scripts/chkconfig.d/ltsp-dhcpd (+1/-0)
server/RHEL/scripts/chkconfig.d/ltsp-named (+1/-0)
server/RHEL/scripts/chkconfig.d/ltspfs-insecure (+1/-0)
server/RHEL/scripts/chkconfig.d/nbdrootd (+1/-0)
server/RHEL/scripts/chkconfig.d/nbdswapd (+1/-0)
server/RHEL/scripts/chkconfig.d/nfs (+1/-0)
server/RHEL/scripts/chkconfig.d/nfslock (+1/-0)
server/RHEL/scripts/chkconfig.d/rpcbind (+1/-0)
server/RHEL/scripts/chkconfig.d/tftp (+1/-0)
server/RHEL/scripts/chkconfig.d/vncts (+1/-0)
server/RHEL/scripts/chkconfig.d/xinetd (+1/-0)
server/RHEL/scripts/dhcpd-update (+66/-0)
server/RHEL/scripts/hosts-update (+32/-0)
server/RHEL/scripts/iscsi-update (+78/-0)
server/RHEL/scripts/ltsp-prepare-kernel (+38/-0)
server/RHEL/scripts/ltsp-server-initialize (+120/-0)
server/RHEL/scripts/ltsp-server-tweaks (+28/-0)
server/RHEL/scripts/ltsp-update-image (+308/-0)
server/RHEL/scripts/ltsp-update-sshkeys (+125/-0)
server/RHEL/scripts/ltspbashgui (+1536/-0)
server/RHEL/scripts/ltspbashgui_7.0.0.lib (+6964/-0)
server/RHEL/scripts/ltspbashlib (+575/-0)
server/RHEL/scripts/mksquashfs-exclude (+12/-0)
server/RHEL/scripts/scripts.d/01-gdm.conf-update (+62/-0)
server/RHEL/scripts/scripts.d/03-exports-update (+20/-0)
server/RHEL/scripts/scripts.d/04-syslog-update (+41/-0)
server/RHEL/scripts/scripts.d/05-Xaccess-update (+33/-0)
server/RHEL/scripts/scripts.d/06-xdm-config-update (+33/-0)
server/RHEL/scripts/scripts.d/07-xinetd-sysconfig-update (+34/-0)
server/RHEL/scripts/scripts.d/08-selinux-alter (+12/-0)
server/RHEL/scripts/scripts.d/09-disable-suspend-hibernate (+10/-0)
server/RHEL/scripts/scripts.d/14-kdmrc-update (+35/-0)
server/RHEL/scripts/scripts.d/15-kwin-update (+12/-0)
server/RHEL/scripts/scripts.d/16-sysctl-update (+31/-0)
server/RHEL/scripts/scripts.d/17-enable-services (+11/-0)
server/RHEL/scripts/scripts.d/18-gconf-update (+6/-0)
server/RHEL/share/ltsp/ltsp-info-functions (+23/-0)
server/RHEL/share/ltsp/ltsp-server-vendor-functions (+9/-0)
server/RHEL/yum-repo/RPM-GPG-KEY-ltsp (+31/-0)
server/RHEL/yum-repo/ltsp-release.spec (+48/-0)
server/RHEL/yum-repo/ltsp.repo (+17/-0)
server/RHEL/yum-repo/release.conf (+3/-0)
server/Redhat/configs/dhcpd.conf (+0/-33)
server/Redhat/configs/dracut/ifcfg-eth0 (+0/-3)
server/Redhat/configs/dracut/ltsp-dracut.conf (+0/-28)
server/Redhat/configs/dracut/ltsp-postinst.d (+0/-57)
server/Redhat/configs/dracut/ltsp-prerm.d (+0/-7)
server/Redhat/configs/dracut/sysconfig-dracut (+0/-28)
server/Redhat/configs/dracut/sysconfig-dracut-skip-first-time (+0/-3)
server/Redhat/configs/dracut/sysconfig-mkinitrd (+0/-26)
server/Redhat/configs/dracut/sysconfig-network (+0/-1)
server/Redhat/configs/fat-client-groups (+0/-7)
server/Redhat/configs/lts.conf (+0/-81)
server/Redhat/configs/ltsp-build-client.conf (+0/-12)
server/Redhat/configs/ltsp-server.conf (+0/-22)
server/Redhat/configs/mock/logging.ini (+0/-84)
server/Redhat/configs/mock/ltsp-i386.cfg (+0/-57)
server/Redhat/configs/mock/ltsp-template.cfg (+0/-57)
server/Redhat/configs/mock/ltsp-x86_64.cfg (+0/-57)
server/Redhat/configs/nbdswapd.conf (+0/-4)
server/Redhat/configs/pxe-default.conf (+0/-5)
server/Redhat/configs/services/ltsp-dhcpd.init (+0/-156)
server/Redhat/configs/services/sysconfig-ltsp-dhcpd (+0/-2)
server/Redhat/scripts/chkconfig.d/iptables-ltsp (+0/-1)
server/Redhat/scripts/chkconfig.d/ltsp-dhcpd (+0/-1)
server/Redhat/scripts/chkconfig.d/ltsp-named (+0/-1)
server/Redhat/scripts/chkconfig.d/ltspfs-insecure (+0/-1)
server/Redhat/scripts/chkconfig.d/nbdswapd (+0/-1)
server/Redhat/scripts/chkconfig.d/nfs (+0/-1)
server/Redhat/scripts/chkconfig.d/nfslock (+0/-1)
server/Redhat/scripts/chkconfig.d/rpcbind (+0/-1)
server/Redhat/scripts/chkconfig.d/tftp (+0/-1)
server/Redhat/scripts/chkconfig.d/vncts (+0/-1)
server/Redhat/scripts/chkconfig.d/xinetd (+0/-1)
server/Redhat/scripts/chroot-creator.outdated (+0/-142)
server/Redhat/scripts/dhcpd-update (+0/-66)
server/Redhat/scripts/hosts-update (+0/-32)
server/Redhat/scripts/iscsi-update (+0/-78)
server/Redhat/scripts/ltsp-prepare-kernel (+0/-38)
server/Redhat/scripts/ltsp-server-initialize (+0/-106)
server/Redhat/scripts/ltsp-server-tweaks (+0/-24)
server/Redhat/scripts/mksquashfs-exclude (+0/-12)
server/Redhat/scripts/scripts.d/01-gdm.conf-update (+0/-62)
server/Redhat/scripts/scripts.d/03-exports-update (+0/-20)
server/Redhat/scripts/scripts.d/04-syslog-update (+0/-41)
server/Redhat/scripts/scripts.d/05-Xaccess-update (+0/-33)
server/Redhat/scripts/scripts.d/06-xdm-config-update (+0/-33)
server/Redhat/scripts/scripts.d/07-xinetd-sysconfig-update (+0/-34)
server/Redhat/scripts/scripts.d/08-selinux-alter (+0/-12)
server/Redhat/scripts/scripts.d/09-disable-suspend-hibernate (+0/-10)
server/Redhat/scripts/scripts.d/14-kdmrc-update (+0/-35)
server/Redhat/scripts/scripts.d/15-kwin-update (+0/-12)
server/Redhat/scripts/scripts.d/16-sysctl-update (+0/-31)
server/Redhat/scripts/scripts.d/17-enable-services (+0/-11)
server/Redhat/share/ltsp/ltsp-info-functions (+0/-23)
server/Redhat/share/ltsp/ltsp-server-vendor-functions (+0/-9)
server/doc/QuickInstall-el6 (+32/-0)
server/doc/README.rpminstall (+59/-0)
server/doc/el6-sl6-centos6-notes.txt (+317/-0)
server/doc/examples/xinetd.d/nbdrootd (+1/-1)
server/doc/examples/xinetd.d/nbdswapd (+1/-1)
server/doc/lts.conf.5 (+1483/-0)
server/k12linux/configs/dracut/ifcfg-eth0 (+0/-3)
server/k12linux/configs/dracut/ltsp-postinst.d (+0/-57)
server/k12linux/configs/dracut/ltsp-prerm.d (+0/-7)
server/k12linux/configs/dracut/sysconfig-dracut (+0/-26)
server/k12linux/configs/dracut/sysconfig-dracut-skip-first-time (+0/-3)
server/k12linux/configs/dracut/sysconfig-mkinitrd (+0/-26)
server/k12linux/configs/dracut/sysconfig-network (+0/-2)
server/k12linux/configs/ifcfg-ltspbr0 (+0/-21)
server/k12linux/configs/lts.conf (+0/-60)
server/k12linux/configs/ltsp-build-client.conf (+0/-12)
server/k12linux/configs/ltsp-dhcpd.conf (+0/-132)
server/k12linux/configs/ltsp-server.conf (+0/-4)
server/k12linux/configs/ltsp-update-kernels.conf (+0/-2)
server/k12linux/configs/ltspdist.template (+0/-28)
server/k12linux/configs/pxe-default.conf (+0/-5)
server/k12linux/configs/yaboot-default.conf (+0/-11)
server/k12linux/scripts/chkconfig.d/iptables-ltsp (+0/-1)
server/k12linux/scripts/chkconfig.d/ltsp-dhcpd (+0/-1)
server/k12linux/scripts/chkconfig.d/ltsp-named (+0/-1)
server/k12linux/scripts/chkconfig.d/ltspfs-insecure (+0/-1)
server/k12linux/scripts/chkconfig.d/nbdswapd (+0/-1)
server/k12linux/scripts/chkconfig.d/nfs (+0/-1)
server/k12linux/scripts/chkconfig.d/nfslock (+0/-1)
server/k12linux/scripts/chkconfig.d/rpcbind (+0/-1)
server/k12linux/scripts/chkconfig.d/tftp (+0/-1)
server/k12linux/scripts/chkconfig.d/vncts (+0/-1)
server/k12linux/scripts/chkconfig.d/xinetd (+0/-1)
server/k12linux/scripts/chroot-creator (+0/-142)
server/k12linux/scripts/dhcpd-update (+0/-66)
server/k12linux/scripts/hosts-update (+0/-32)
server/k12linux/scripts/ltsp-prepare-kernel (+0/-39)
server/k12linux/scripts/ltsp-server-initialize (+0/-106)
server/k12linux/scripts/ltsp-server-tweaks (+0/-19)
server/k12linux/scripts/ltsp-update-image (+0/-27)
server/k12linux/scripts/mksquashfs-exclude (+0/-8)
server/k12linux/scripts/scripts.d/01-gdm.conf-update (+0/-62)
server/k12linux/scripts/scripts.d/03-exports-update (+0/-20)
server/k12linux/scripts/scripts.d/04-syslog-update (+0/-41)
server/k12linux/scripts/scripts.d/05-Xaccess-update (+0/-33)
server/k12linux/scripts/scripts.d/06-xdm-config-update (+0/-33)
server/k12linux/scripts/scripts.d/07-xinetd-sysconfig-update (+0/-34)
server/k12linux/scripts/scripts.d/08-selinux-alter (+0/-10)
server/k12linux/scripts/scripts.d/09-disable-suspend-hibernate (+0/-10)
server/k12linux/scripts/scripts.d/14-kdmrc-update (+0/-35)
server/k12linux/scripts/scripts.d/15-kwin-update (+0/-12)
server/k12linux/scripts/scripts.d/16-sysctl-update (+0/-31)
server/k12linux/scripts/scripts.d/17-enable-services (+0/-11)
server/ltsp-update-image (+1/-1)
server/share/ltsp/plugins/ltsp-build-client/Fedora/000-verify-tftpdir (+0/-12)
server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch (+0/-36)
server/share/ltsp/plugins/ltsp-build-client/Fedora/005-warn (+17/-0)
server/share/ltsp/plugins/ltsp-build-client/Fedora/007-dialog (+24/-0)
server/share/ltsp/plugins/ltsp-build-client/Fedora/009-mock-chroot (+118/-0)
server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator (+0/-52)
server/share/ltsp/plugins/ltsp-build-client/Fedora/010-etc-hosts (+0/-1)
server/share/ltsp/plugins/ltsp-build-client/Fedora/010-etc-mtab (+5/-0)
server/share/ltsp/plugins/ltsp-build-client/Fedora/010-mount-proc (+0/-2)
server/share/ltsp/plugins/ltsp-build-client/Fedora/020-cleanup-chroot (+0/-14)
server/share/ltsp/plugins/ltsp-build-client/Fedora/020-rootpath (+0/-9)
server/share/ltsp/plugins/ltsp-build-client/Fedora/030-fat-client (+33/-0)
server/share/ltsp/plugins/ltsp-build-client/Fedora/030-resolvconf-hack (+0/-7)
server/share/ltsp/plugins/ltsp-build-client/Fedora/031-prepare-kernel (+0/-6)
server/share/ltsp/plugins/ltsp-build-client/Fedora/032-chroot-setup (+0/-6)
server/share/ltsp/plugins/ltsp-build-client/Fedora/035-update-kernels (+0/-8)
server/share/ltsp/plugins/ltsp-build-client/Fedora/095-rootpass (+0/-25)
server/share/ltsp/plugins/ltsp-build-client/Fedora/999-end (+11/-0)
server/share/ltsp/plugins/ltsp-build-client/Gentoo/010-bootstrap (+16/-16)
server/share/ltsp/plugins/ltsp-build-client/Gentoo/020-set-initramfs-options (+8/-10)
server/share/ltsp/plugins/ltsp-build-client/Gentoo/020-set-kernel-options (+12/-14)
server/share/ltsp/plugins/ltsp-build-client/Gentoo/030-set-input-devices (+8/-8)
server/share/ltsp/plugins/ltsp-build-client/Gentoo/030-set-video-cards (+8/-8)
server/share/ltsp/plugins/ltsp-build-client/RHEL/005-warn (+17/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/007-dialog (+24/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/009-mock-chroot (+118/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/010-etc-mtab (+5/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/010-mount-proc (+2/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/020-cleanup-chroot (+14/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/020-rootpath (+9/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/030-fat-client (+33/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/032-chroot-setup (+6/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/035-update-kernels (+6/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/095-rootpass (+25/-0)
server/share/ltsp/plugins/ltsp-build-client/RHEL/999-end (+11/-0)
server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch (+0/-33)
server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot (+0/-60)
server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator (+0/-55)
server/share/ltsp/plugins/ltsp-build-client/Redhat/010-mount-proc (+0/-2)
server/share/ltsp/plugins/ltsp-build-client/Redhat/020-cleanup-chroot (+0/-14)
server/share/ltsp/plugins/ltsp-build-client/Redhat/020-rootpath (+0/-9)
server/share/ltsp/plugins/ltsp-build-client/Redhat/030-fat-client (+0/-31)
server/share/ltsp/plugins/ltsp-build-client/Redhat/031-prepare-kernel (+0/-7)
server/share/ltsp/plugins/ltsp-build-client/Redhat/032-chroot-setup (+0/-6)
server/share/ltsp/plugins/ltsp-build-client/Redhat/035-update-kernels (+0/-8)
server/share/ltsp/plugins/ltsp-build-client/Redhat/095-rootpass (+0/-25)
To merge this branch: bzr merge lp:~enslaver-l/ltsp/ltsp-rhel
Reviewer Review Type Date Requested Status
Alkis Georgopoulos Disapprove
Review via email: mp+151353@code.launchpad.net

Description of the change

Changed directories from Redhat to RHEL. Also added a file to fix ltsp-build-client

To post a comment you must log in.
lp:~enslaver-l/ltsp/ltsp-rhel updated
2463. By Wim Muskee

Gentoo: cleanup for ltsp-build-client files; tabs to spaces, shorthand ifs in profile and set some defaults in plugins.

2464. By Wim Muskee

Gentoo: install profile compatible with kicktoo-0.5.1

2465. By Launchpad Translations on behalf of ltsp-upstream

Launchpad automatic translations update.

2466. By Joshua Trimm

Update to rev 2465

2467. By Joshua Trimm

Cleanup code, remove unused Fedora / k12linux files from previous releases.

2468. By Joshua Trimm

Fixed fat client build, and added a fix for progress bar

2469. By Joshua Trimm

updated GPG key for RPM signing

2470. By Joshua Trimm

fixed rpm

2471. By Joshua Trimm

Updated to use easybashgui to create dialogs, modified name to avoid file
conflicts. Also fixed progress bar issues.

2472. By Joshua Trimm

Added modules for nbd.ko for nbdroot support in client, changed the way mock works.

2473. By Joshua Trimm

Added README and SERVERIP config var for ltsp-server.conf

2474. By Joshua Trimm

Commit to merge

2475. By Joshua Trimm

Added NBD support back, updated ltsp-build-client to make thiclient 'thinner'.

2476. By Joshua Trimm

Added another doc, updated scripts to assist with initial setup and updated
GPG key for client repo. Also fixed a dhcp reissue bug.

2477. By Joshua Trimm

Resolved

2478. By Joshua Trimm

Part of the x2go addon screen being incorporated

2479. By Joshua Trimm

overlay init script should be in main repo tree

2480. By Joshua Trimm

Added help doc for setting up new el6 system, reconfigured repo, hopefully
fixed hostname bug

2481. By Joshua Trimm

First branch commit for fedora branch

2482. By Joshua Trimm

Prep for stable release, mock changes, enabled nbd and fixed misc bugs.

2483. By Joshua Trimm

Merge from trunk

2484. By Joshua Trimm

Added X11 fonts and fixed firstboot issue

2485. By Joshua Trimm

Fixed issue with ARCH and filename extention on mock chroot configs for
ltsp-build-client

2486. By Joshua Trimm

Merge in 2475 from trunk

2487. By Joshua Trimm

Fixed ltsp-update-sshkeys to remove unsupported cypher also minor mock changes for better compatibility with future releases.

Revision history for this message
Alkis Georgopoulos (alkisg) wrote :

I'm setting the state of old merge requests that have been stale for years, to rejected; if someone wants, he can do another merge request in git format, since now ltsp uses git.

review: Disapprove

Unmerged revisions

2487. By Joshua Trimm

Fixed ltsp-update-sshkeys to remove unsupported cypher also minor mock changes for better compatibility with future releases.

2486. By Joshua Trimm

Merge in 2475 from trunk

2485. By Joshua Trimm

Fixed issue with ARCH and filename extention on mock chroot configs for
ltsp-build-client

2484. By Joshua Trimm

Added X11 fonts and fixed firstboot issue

2483. By Joshua Trimm

Merge from trunk

2482. By Joshua Trimm

Prep for stable release, mock changes, enabled nbd and fixed misc bugs.

2481. By Joshua Trimm

First branch commit for fedora branch

2480. By Joshua Trimm

Added help doc for setting up new el6 system, reconfigured repo, hopefully
fixed hostname bug

2479. By Joshua Trimm

overlay init script should be in main repo tree

2478. By Joshua Trimm

Part of the x2go addon screen being incorporated

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2008-12-11 07:01:43 +0000
3+++ .bzrignore 2013-07-22 07:06:30 +0000
4@@ -4,3 +4,7 @@
5 *.rpm
6 rpmbuild.log
7 ltsp.spec
8+junk.sh
9+build.sh
10+.git
11+
12
13=== added file '.gitignore'
14--- .gitignore 1970-01-01 00:00:00 +0000
15+++ .gitignore 2013-07-22 07:06:30 +0000
16@@ -0,0 +1,11 @@
17+messages.mo
18+*.tar.gz
19+*.tar.bz2
20+*.rpm
21+rpmbuild.log
22+ltsp.spec
23+junk.sh
24+build.sh
25+.git
26+.bzr
27+
28
29=== added symlink 'README.md'
30=== target is u'server/doc/README.rpminstall'
31=== modified file 'autogen.sh' (properties changed: +x to -x)
32=== added directory 'client/Fedora'
33=== removed directory 'client/Fedora'
34=== added directory 'client/Fedora/chroot-setup'
35=== added directory 'client/Fedora/chroot-setup/chroot-setup.d'
36=== added file 'client/Fedora/chroot-setup/chroot-setup.d/000-pre-mount-proc'
37--- client/Fedora/chroot-setup/chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
38+++ client/Fedora/chroot-setup/chroot-setup.d/000-pre-mount-proc 2013-07-22 07:06:30 +0000
39@@ -0,0 +1,3 @@
40+#!/bin/sh
41+
42+mount /proc 2> /dev/null ||:
43
44=== added file 'client/Fedora/chroot-setup/chroot-setup.d/010-cleanup-consoles'
45--- client/Fedora/chroot-setup/chroot-setup.d/010-cleanup-consoles 1970-01-01 00:00:00 +0000
46+++ client/Fedora/chroot-setup/chroot-setup.d/010-cleanup-consoles 2013-07-22 07:06:30 +0000
47@@ -0,0 +1,15 @@
48+#!/bin/sh
49+
50+### Set Runlevel 5 and turn off the mingetty's
51+# Fedora 8 and previous, and RHEL5
52+[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
53+# Fedora 9+ with Upstart
54+if [ -e /etc/event.d/tty1 ]; then
55+ for NUM in 1 2 3 4 5 6; do
56+ echo > /etc/event.d/tty$NUM
57+ done
58+fi
59+# Fedora 13+ and EL6 with Upstart
60+if [ -e /etc/init/start-ttys.conf ]; then
61+ echo > /etc/init/start-ttys.conf
62+fi
63
64=== added file 'client/Fedora/chroot-setup/chroot-setup.d/020-dracut-config'
65--- client/Fedora/chroot-setup/chroot-setup.d/020-dracut-config 1970-01-01 00:00:00 +0000
66+++ client/Fedora/chroot-setup/chroot-setup.d/020-dracut-config 2013-07-22 07:06:30 +0000
67@@ -0,0 +1,15 @@
68+#!/bin/bash
69+
70+if [ -f /etc/dracut.conf ]; then
71+ echo Generating initramfs
72+ [ -e "/usr/share/ltsp/template/sysconfig-dracut" ] && cp /usr/share/ltsp/template/sysconfig-dracut /etc/dracut.conf.d/ltsp-dracut.conf
73+ NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
74+ unset DRACUTARG
75+ [ -x /sbin/dracut ] && DRACUTARG=--dracut
76+ /sbin/dracut -f 2>/dev/null
77+ /sbin/new-kernel-pkg --mkinitrd $DRACUTARG --add-plymouth-initrd --install $NAME 2>/dev/null
78+ /sbin/new-kernel-pkg --rpmposttrans $NAME 2>/dev/null
79+else
80+ echo Warning: Dracut not installed or no /etc/dracut.conf found
81+fi
82+
83
84=== added file 'client/Fedora/chroot-setup/chroot-setup.d/030-configure-client'
85--- client/Fedora/chroot-setup/chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
86+++ client/Fedora/chroot-setup/chroot-setup.d/030-configure-client 2013-07-22 07:06:30 +0000
87@@ -0,0 +1,57 @@
88+#!/bin/sh
89+
90+# Disable services we don't want
91+for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
92+ iscsid kudzu lvm2-monitor mcstrans mdmonitor nfs NetworkManager named\
93+ pcscd rpcbind rpcgssd rpcidmapd rpcsvcgssd kdump nfslock; do
94+ if [ ! -e /etc/init.d/$service ]; then
95+ continue
96+ fi
97+ #echo "Disabling Service: $service"
98+ /sbin/chkconfig $service off
99+done
100+
101+# Enable services we do want
102+for service in haldaemon messagebus rsyslog udev-post ltsp-core ; do
103+ if [ ! -e /etc/init.d/$service ]; then
104+ continue
105+ fi
106+ #echo "Enabling Service: $service"
107+ /sbin/chkconfig $service on
108+done
109+
110+# Setup readonly-root Mode
111+#sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
112+
113+# Set ltsp-launch-client as DM
114+#echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
115+
116+# Link /etc/mtab to /proc/mounts
117+# This is not perfect, but it enables fuse mounts to work.
118+rm -f /etc/mtab 2>/dev/null
119+ln -sf /proc/mounts /etc/mtab
120+
121+# Files to silence warning messages
122+#touch /etc/alsa/asound.state
123+#touch /etc/asound.state
124+
125+# Silence /etc/mtab rwtab error message during bootup
126+sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
127+
128+# Silence /etc/mtab* removal errors
129+#sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
130+
131+# Silence local filesystems mount errors during bootup
132+sed -i '/^sysfs/d' /etc/fstab
133+#sed -i '/sysroot/d' /etc/mtab
134+#sed -i '/unionfs/d' /etc/mtab
135+
136+# F10+: install default boot-duration so plymouth can guess the startup progress bar better
137+if [ -e /usr/share/plymouth/default-boot-duration ]; then
138+ cp /usr/share/ltsp/template/default-boot-duration /usr/share/plymouth/default-boot-duration
139+fi
140+
141+# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
142+#sed -i 's/^kill_all $"Sending all processes/#kill_all $"Sending all processes/' /etc/init.d/halt
143+#sed -i 's/sleep 2/#sleep 2/' /etc/init.d/halt
144+#sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
145
146=== added file 'client/Fedora/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config'
147--- client/Fedora/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
148+++ client/Fedora/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 2013-07-22 07:06:30 +0000
149@@ -0,0 +1,7 @@
150+#!/bin/sh
151+
152+# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
153+# Not needed for CentOS 6
154+if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
155+ cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
156+fi
157
158=== added file 'client/Fedora/chroot-setup/chroot-setup.d/090-post-umount-proc'
159--- client/Fedora/chroot-setup/chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
160+++ client/Fedora/chroot-setup/chroot-setup.d/090-post-umount-proc 2013-07-22 07:06:30 +0000
161@@ -0,0 +1,3 @@
162+#!/bin/sh
163+
164+umount /proc 2> /dev/null ||:
165
166=== added file 'client/Fedora/chroot-setup/ltsp-chroot-setup'
167--- client/Fedora/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
168+++ client/Fedora/chroot-setup/ltsp-chroot-setup 2013-07-22 07:06:30 +0000
169@@ -0,0 +1,11 @@
170+#!/bin/sh
171+
172+# Exit immediately if this is not a LTSP client chroot.
173+[ ! -e /etc/ltsp_chroot ] && exit 0
174+
175+for i in /usr/share/ltsp/chroot-setup.d/* ; do
176+ [ -d $i ] && continue
177+ if [ -x $i ]; then
178+ $i
179+ fi
180+done
181
182=== added directory 'client/Fedora/initscripts'
183=== removed directory 'client/Fedora/initscripts'
184=== added file 'client/Fedora/initscripts/ltsp-client-launch'
185--- client/Fedora/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
186+++ client/Fedora/initscripts/ltsp-client-launch 2013-07-22 07:06:30 +0000
187@@ -0,0 +1,91 @@
188+#!/bin/bash
189+#
190+# ltsp-client-launch LTSP Client Launcher
191+#
192+# description: This launches the LTSP clients defined in /etc/lts.conf
193+# along with sound server and other configured devices.
194+#
195+
196+# Gracefully exit if ltsp_chroot file is not present
197+test -f /etc/ltsp_chroot || exit 0
198+
199+# Make sure LANG is set
200+if [ -z "$LANG" ]
201+then
202+ if [ -f /etc/sysconfig/i18n ]
203+ then
204+ . /etc/sysconfig/i18n
205+ export LANG
206+ fi
207+fi
208+
209+if [ -z "$LC_MESSAGES" ]
210+then
211+ if [ -z "$LC_ALL" ]
212+ then
213+ LC_MESSAGES=$LANG
214+ export LC_MESSAGES
215+ fi
216+fi
217+
218+# Grab lts.conf from the same IP address as the mount server.
219+# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
220+
221+# check for NBD devices
222+NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
223+if [ -n "$NBD_DEVICES" ]; then
224+ for DEVICE in $NBD_DEVICES ; do
225+ SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
226+ test -n "$SERVER" && break
227+ done
228+else
229+ # check for NFS root
230+ SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
231+fi
232+
233+SERVER="${SERVER:-172.31.100.254}"
234+export SERVER
235+
236+ARCH=$(uname -m)
237+[ "$ARCH" = "i586" ] && ARCH=i386
238+[ "$ARCH" = "i686" ] && ARCH=i386
239+TFTPPATH="/ltsp/$ARCH/lts.conf"
240+
241+# Attempt to get lts.conf via tftp
242+cd /var/run
243+(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
244+if [ -s ./lts.conf ];then
245+ cp ./lts.conf /etc/lts.conf
246+fi
247+cd - > /dev/null
248+
249+# Source function libraries.
250+. /usr/share/ltsp/ltsp-init-common
251+
252+teardown() {
253+ killall -g screen_session pulseaudio ldm ltspfsd
254+}
255+trap "teardown" TERM
256+
257+# Start Screen Sessions defined in /etc/lts.conf
258+for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
259+eval num=\$SCREEN_$screen
260+if [ -n "$num" ]; then
261+ /usr/share/ltsp/screen_session "$screen" &
262+fi
263+done
264+
265+# TODO: Move these into service ltsp-client-setup
266+configure_localdev
267+configure_swap
268+configure_serial_mouse
269+configure_printer
270+
271+# /dev/dsp must be owned by pulse
272+chown pulse /dev/dsp
273+start_sound
274+configure_sound_volume
275+
276+while :; do
277+ sleep 365d
278+done
279
280=== removed file 'client/Fedora/initscripts/ltsp-client-launch'
281--- client/Fedora/initscripts/ltsp-client-launch 2012-05-13 15:39:01 +0000
282+++ client/Fedora/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
283@@ -1,91 +0,0 @@
284-#!/bin/bash
285-#
286-# ltsp-client-launch LTSP Client Launcher
287-#
288-# description: This launches the LTSP clients defined in /etc/lts.conf
289-# along with sound server and other configured devices.
290-#
291-
292-# Gracefully exit if ltsp_chroot file is not present
293-test -f /etc/ltsp_chroot || exit 0
294-
295-# Make sure LANG is set
296-if [ -z "$LANG" ]
297-then
298- if [ -f /etc/sysconfig/i18n ]
299- then
300- . /etc/sysconfig/i18n
301- export LANG
302- fi
303-fi
304-
305-if [ -z "$LC_MESSAGES" ]
306-then
307- if [ -z "$LC_ALL" ]
308- then
309- LC_MESSAGES=$LANG
310- export LC_MESSAGES
311- fi
312-fi
313-
314-# Grab lts.conf from the same IP address as the mount server.
315-# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
316-
317-# check for NBD devices
318-NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
319-if [ -n "$NBD_DEVICES" ]; then
320- for DEVICE in $NBD_DEVICES ; do
321- SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
322- test -n "$SERVER" && break
323- done
324-else
325- # check for NFS root
326- SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
327-fi
328-
329-SERVER="${SERVER:-172.31.100.254}"
330-export SERVER
331-
332-ARCH=$(uname -m)
333-[ "$ARCH" = "i586" ] && ARCH=i386
334-[ "$ARCH" = "i686" ] && ARCH=i386
335-TFTPPATH="/ltsp/$ARCH/lts.conf"
336-
337-# Attempt to get lts.conf via tftp
338-cd /var/run
339-(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
340-if [ -s ./lts.conf ];then
341- cp ./lts.conf /etc/lts.conf
342-fi
343-cd - > /dev/null
344-
345-# Source function libraries.
346-. /usr/share/ltsp/ltsp-init-common
347-
348-teardown() {
349- killall -g screen_session pulseaudio ldm ltspfsd
350-}
351-trap "teardown" TERM
352-
353-# Start Screen Sessions defined in /etc/lts.conf
354-for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
355-eval num=\$SCREEN_$screen
356-if [ -n "$num" ]; then
357- /usr/share/ltsp/screen_session "$screen" &
358-fi
359-done
360-
361-# TODO: Move these into service ltsp-client-setup
362-configure_localdev
363-configure_swap
364-configure_serial_mouse
365-configure_printer
366-
367-# /dev/dsp must be owned by pulse
368-chown pulse /dev/dsp
369-start_sound
370-configure_sound_volume
371-
372-while :; do
373- sleep 365d
374-done
375
376=== added file 'client/Fedora/initscripts/ltsp-core'
377--- client/Fedora/initscripts/ltsp-core 1970-01-01 00:00:00 +0000
378+++ client/Fedora/initscripts/ltsp-core 2013-07-22 07:06:30 +0000
379@@ -0,0 +1,72 @@
380+#! /bin/sh
381+#
382+# Author: Matt Zimmerman <mdz@ubuntu.com>
383+#
384+### BEGIN INIT INFO
385+# Provides: ltsp-client ltsp-client-core ltsp-client-setup
386+# Required-Start: $remote_fs $network $syslog
387+# Should-Start:
388+# Required-Stop:
389+# Default-Start: 2 3 4 5
390+# Default-Stop: 0 6
391+# Short-Description: Script for LTSP client initialization
392+# Description:
393+### END INIT INFO
394+
395+set -e
396+
397+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
398+DESC="LTSP client"
399+NAME=ltsp-client
400+SCRIPTNAME=/etc/init.d/$NAME
401+
402+# Gracefully exit if an LTSP boot was not requested
403+grep -Eqsw "init=/sbin/init-ltsp|ltsp" /proc/cmdline || exit 0
404+
405+# handle localization settings
406+if [ -r /etc/default/locale ]; then
407+ . /etc/default/locale
408+ export LANG LANGUAGE
409+elif [ -r /etc/environment ]; then
410+ . /etc/environment
411+ export LANG LANGUAGE
412+fi
413+
414+. /lib/lsb/init-functions
415+. /usr/share/ltsp/ltsp-init-common
416+
417+case "$1" in
418+ start)
419+ log_success_msg "Starting LTSP client..."
420+
421+ if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then
422+ # Tell the control center that we are booting and get lts.conf
423+ eval $(getltscfg-cluster -a -l boot) || true
424+ fi
425+
426+ if [ -x /bin/plymouth ]; then
427+ /bin/plymouth quit --retain-splash || true
428+ fi
429+
430+ start_screen_sessions || true
431+ start_sound || true
432+
433+ ;;
434+ stop)
435+ # This means that an LTSP client is shutting down or rebooting.
436+ # Try to cleanly close any open network connections.
437+ if [ -x /usr/share/ltsp/nbd-disconnect ]; then
438+ /usr/share/ltsp/nbd-disconnect &
439+ fi
440+ ;;
441+ restart|force-reload)
442+ echo "$NAME does not support restarting, reboot your client instead." >&2
443+ exit 1
444+ ;;
445+ *)
446+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
447+ exit 1
448+ ;;
449+esac
450+
451+exit 0
452
453=== added directory 'client/Fedora/rwtab.d'
454=== added file 'client/Fedora/rwtab.d/ltsp.rwtab'
455--- client/Fedora/rwtab.d/ltsp.rwtab 1970-01-01 00:00:00 +0000
456+++ client/Fedora/rwtab.d/ltsp.rwtab 2013-07-22 07:06:30 +0000
457@@ -0,0 +1,27 @@
458+# Already in F12 /etc/rwtab
459+empty /var/log/ConsoleKit/
460+empty /var/lib/dbus/
461+empty /var/cache/hald/
462+empty /var/lib/pulse/
463+files /.viminfo
464+files /etc/alsa/asound.state
465+# Already in F11 /etc/rwtab
466+dirs /var/lib/xkb/
467+
468+# BUG: Directories that need to be writable but contain files we don't want to disappear
469+# (Although somehow this wasn't harmful to LTSP in the past?)
470+dirs /etc/udev/rules.d/
471+
472+# LTSP specific
473+dirs /var/cache/ldm/
474+dirs /home
475+empty /var/cache/ltsp-localapps/
476+empty /root
477+files /etc/lts.conf
478+files /etc/X11/xorg.conf
479+files /etc/passwd
480+files /etc/group
481+files /etc/localtime
482+files /etc/cups/client.conf
483+# Old versions of Fedora only
484+files /etc/asound.state
485
486=== added directory 'client/Fedora/scripts'
487=== added file 'client/Fedora/scripts/ltsp-rewrap-latest-kernel'
488--- client/Fedora/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
489+++ client/Fedora/scripts/ltsp-rewrap-latest-kernel 2013-07-22 07:06:30 +0000
490@@ -0,0 +1,10 @@
491+#!/bin/bash
492+# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
493+echo "Re-wrapping vmlinuz and initrd, Please be patient."
494+
495+NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
496+unset DRACUTARG
497+[ -x /sbin/dracut ] && DRACUTARG=--dracut
498+/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
499+/sbin/new-kernel-pkg --rpmposttrans $NAME
500+/sbin/depmod -au "$NAME" -F "/boot/System.map-$NAME"
501
502=== added directory 'client/Fedora/share'
503=== added directory 'client/Fedora/share/ltsp'
504=== added directory 'client/Fedora/share/ltsp/init-ltsp.d'
505=== added file 'client/Fedora/share/ltsp/init-ltsp.d/00-overlay'
506--- client/Fedora/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
507+++ client/Fedora/share/ltsp/init-ltsp.d/00-overlay 2013-07-22 07:06:30 +0000
508@@ -0,0 +1,123 @@
509+#!/bin/sh
510+#
511+# Overlay filesystem mounting -*- overlay-module -*-
512+#
513+# 2013, Joshua Trimm <enslaver@enslaver.com>
514+#
515+# Derived from previously modified scripts written by:
516+# 2008, Stephane Graber <stgraber@ubuntu.com>
517+# 2009, Vagrant Cascadian <vagrant@freegeek.org>
518+#
519+# This program is free software; you can redistribute it and/or
520+# modify it under the terms of the GNU General Public License as
521+# published by the Free Software Foundation; either version 2 of the
522+# License, or (at your option) any later version.
523+#
524+# This program is distributed in the hope that it will be useful,
525+# but WITHOUT ANY WARRANTY; without even the implied warranty of
526+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
527+# GNU General Public License for more details.
528+#
529+# You should have received a copy of the GNU General Public License
530+# along with this program. If not, you can find it on the World Wide
531+# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
532+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
533+# MA 02110-1301, USA.
534+#
535+# The idea is to make this a double script, running from init-ltsp
536+# and also be installed to the initramfs using either dracut or
537+# initramfs-tools.
538+
539+#set -x
540+
541+[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
542+
543+# On by default
544+OVERLAY=${OVERLAY:-Y}
545+
546+if [ -f /.inside-cow ]; then
547+ # Already inside copy-on-write filesystem
548+ return
549+fi
550+
551+if [ ! $OVERLAY ]; then
552+ # Someone doesnt love me
553+ return
554+fi
555+
556+
557+
558+# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
559+OVERLAYFS=${OVERLAYFS:-unionfs}
560+
561+panic() { echo "Error: $@"; exit 1; }
562+
563+
564+# Try to give us some tmp space in userland
565+test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
566+
567+[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
568+[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
569+[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
570+[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
571+
572+if modprobe -q overlayfs; then
573+ # For kernel overlays
574+ if [ "$DETECT_MODULE_INCOMPLETE" ]; then
575+ UNION_TYPE=overlayfs
576+ UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
577+ fi
578+elif modprobe -q fuse; then
579+ # For fuse overlays
580+ FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
581+ if [ "$INSIDE_DRACUT" ]; then
582+ . /tmp/root.info
583+ [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
584+ CHROOT_PATH="/tmp/unionfs"
585+ UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
586+ NEWROOT=${NEWROOT:-/sysroot}
587+ OLDROOT="$NEWROOT"
588+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
589+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
590+ mount --move /sysroot /tmp/sysroot
591+ mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
592+ unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
593+ echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
594+ [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
595+ cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
596+ elif [ "$INSIDE_INITRAMFS" ]; then
597+ # This is for initramfs-tools that include the fuse module.
598+ # it is incomplete but should be similar to above, just set
599+ # NEWROOT to where it mounts the nfsroot
600+ NEWROOT="${rootmnt}"
601+ . /tmp/root.info
602+ [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
603+ CHROOT_PATH="/tmp/unionfs"
604+ UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
605+ NEWROOT=${NEWROOT:-/sysroot}
606+ OLDROOT="$NEWROOT"
607+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
608+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
609+ mount --move /sysroot /tmp/sysroot
610+ mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
611+ unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
612+ echo inside-cow-initramfs > /sysroot/.inside-cow
613+ [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
614+ cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
615+ elif [ "$INSIDE_LTSP_INIT" ]; then
616+ CHROOT_PATH="/tmp/unionfs"
617+ UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
618+ UBIN=/usr/bin/unionfs
619+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
620+ [ -e "/proc/cmdline" ] || mount -t proc proc /proc
621+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
622+ mount --bind / $CHROOT_PATH/rofs
623+ $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
624+ mount -t proc proc /tmp/union/proc
625+ echo inside-cow-ltsp-init > /tmp/union/.inside-cow
626+ cd /tmp/union
627+ mkdir oldroot
628+ pivot_root . oldroot
629+ init q
630+ fi
631+fi
632
633=== added file 'client/Fedora/share/ltsp/init-ltsp.d/09-hostname'
634--- client/Fedora/share/ltsp/init-ltsp.d/09-hostname 1970-01-01 00:00:00 +0000
635+++ client/Fedora/share/ltsp/init-ltsp.d/09-hostname 2013-07-22 07:06:30 +0000
636@@ -0,0 +1,35 @@
637+if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
638+ HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
639+ IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
640+ IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
641+ case "$HOSTNAME_EXTRA" in
642+ mac)
643+ HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
644+ ;;
645+ ip|"")
646+ HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
647+ ;;
648+ esac
649+ HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
650+fi
651+
652+hostname "$HOSTNAME"
653+echo "$HOSTNAME" > /etc/hostname
654+
655+cat <<EOF > /etc/hosts
656+127.0.0.1 localhost
657+127.0.0.2 $HOSTNAME
658+$SERVER server
659+
660+# The following lines are desirable for IPv6 capable hosts
661+::1 ip6-localhost ip6-loopback
662+fe00::0 ip6-localnet
663+ff00::0 ip6-mcastprefix
664+ff02::1 ip6-allnodes
665+ff02::2 ip6-allrouters
666+EOF
667+
668+if [ -f /etc/hosts.ltsp ]; then
669+ cat /etc/hosts.ltsp >> /etc/hosts
670+fi
671+env | sed -n '/^HOSTS_[0-9][0-9]=/s///p' >> /etc/hosts
672
673=== added file 'client/Fedora/share/ltsp/ltsp-client-launch'
674--- client/Fedora/share/ltsp/ltsp-client-launch 1970-01-01 00:00:00 +0000
675+++ client/Fedora/share/ltsp/ltsp-client-launch 2013-07-22 07:06:30 +0000
676@@ -0,0 +1,91 @@
677+#!/bin/bash
678+#
679+# ltsp-client-launch LTSP Client Launcher
680+#
681+# description: This launches the LTSP clients defined in /etc/lts.conf
682+# along with sound server and other configured devices.
683+#
684+
685+# Gracefully exit if ltsp_chroot file is not present
686+test -f /etc/ltsp_chroot || exit 0
687+
688+# Make sure LANG is set
689+if [ -z "$LANG" ]
690+then
691+ if [ -f /etc/sysconfig/i18n ]
692+ then
693+ . /etc/sysconfig/i18n
694+ export LANG
695+ fi
696+fi
697+
698+if [ -z "$LC_MESSAGES" ]
699+then
700+ if [ -z "$LC_ALL" ]
701+ then
702+ LC_MESSAGES=$LANG
703+ export LC_MESSAGES
704+ fi
705+fi
706+
707+# Grab lts.conf from the same IP address as the mount server.
708+# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
709+
710+# check for NBD devices
711+NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
712+if [ -n "$NBD_DEVICES" ]; then
713+ for DEVICE in $NBD_DEVICES ; do
714+ SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
715+ test -n "$SERVER" && break
716+ done
717+else
718+ # check for NFS root
719+ SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
720+fi
721+
722+SERVER="${SERVER:-172.31.100.254}"
723+export SERVER
724+
725+ARCH=$(uname -m)
726+[ "$ARCH" = "i586" ] && ARCH=i386
727+[ "$ARCH" = "i686" ] && ARCH=i386
728+TFTPPATH="/ltsp/$ARCH/lts.conf"
729+
730+# Attempt to get lts.conf via tftp
731+cd /var/run
732+(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
733+if [ -s ./lts.conf ];then
734+ cp ./lts.conf /etc/lts.conf
735+fi
736+cd - > /dev/null
737+
738+# Source function libraries.
739+. /usr/share/ltsp/ltsp-init-common
740+
741+teardown() {
742+ killall -g screen_session pulseaudio ldm ltspfsd
743+}
744+trap "teardown" TERM
745+
746+# Start Screen Sessions defined in /etc/lts.conf
747+for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
748+eval num=\$SCREEN_$screen
749+if [ -n "$num" ]; then
750+ /usr/share/ltsp/screen_session "$screen" &
751+fi
752+done
753+
754+# TODO: Move these into service ltsp-client-setup
755+configure_localdev
756+configure_swap
757+configure_serial_mouse
758+configure_printer
759+
760+# /dev/dsp must be owned by pulse
761+chown pulse /dev/dsp
762+start_sound
763+configure_sound_volume
764+
765+while :; do
766+ sleep 365d
767+done
768
769=== added file 'client/Fedora/share/ltsp/ltsp-client-vendor-functions'
770--- client/Fedora/share/ltsp/ltsp-client-vendor-functions 1970-01-01 00:00:00 +0000
771+++ client/Fedora/share/ltsp/ltsp-client-vendor-functions 2013-07-22 07:06:30 +0000
772@@ -0,0 +1,108 @@
773+# Fedora-specific function overrides for the common functions
774+
775+detect_arch() {
776+ echo $(uname -m | sed -e s/i.86/i386/)
777+}
778+
779+if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost.localdomain" ] || [ "$HOSTNAME" = "localhost" ]; then
780+ HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
781+ IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
782+ IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
783+ case "$HOSTNAME_EXTRA" in
784+ mac)
785+ HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
786+ ;;
787+ ip|"")
788+ HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
789+ ;;
790+ esac
791+ HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
792+fi
793+
794+# Taken from dracut lib
795+# returns OK if $1 contains $2
796+strstr() {
797+ [ "${1#*$2*}" != "$1" ]
798+}
799+
800+getarg() {
801+ set +x
802+ local o line
803+ if [ -z "$CMDLINE" ]; then
804+ if [ -e /etc/cmdline ]; then
805+ while read line; do
806+ CMDLINE_ETC="$CMDLINE_ETC $line";
807+ done </etc/cmdline;
808+ fi
809+ read CMDLINE </proc/cmdline;
810+ CMDLINE="$CMDLINE $CMDLINE_ETC"
811+ fi
812+ for o in $CMDLINE; do
813+ [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
814+ [ "${o%%=*}" = "${1%=}" ] && { echo ${o#*=}; [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
815+ done
816+ [ "$RDDEBUG" = "yes" ] && set -x
817+ return 1
818+}
819+
820+getargs() {
821+ set +x
822+ local o line found
823+ if [ -z "$CMDLINE" ]; then
824+ if [ -e /etc/cmdline ]; then
825+ while read line; do
826+ CMDLINE_ETC="$CMDLINE_ETC $line";
827+ done </etc/cmdline;
828+ fi
829+ read CMDLINE </proc/cmdline;
830+ CMDLINE="$CMDLINE $CMDLINE_ETC"
831+ fi
832+ for o in $CMDLINE; do
833+ [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
834+ if [ "${o%%=*}" = "${1%=}" ]; then
835+ echo -n "${o#*=} ";
836+ found=1;
837+ fi
838+ done
839+ [ -n "$found" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
840+ [ "$RDDEBUG" = "yes" ] && set -x
841+ return 1;
842+}
843+
844+nfsroot_to_var() {
845+ # strip nfs[4]:
846+ local arg="$@:"
847+ nfs="${arg%%:*}"
848+ arg="${arg##$nfs:}"
849+
850+ # check if we have a server
851+ if strstr "$arg" ':/*' ; then
852+ server="${arg%%:/*}"
853+ arg="/${arg##*:/}"
854+ fi
855+
856+ path="${arg%%:*}"
857+
858+ # rest are options
859+ options="${arg##$path}"
860+ # strip leading ":"
861+ options="${options##:}"
862+ # strip ":"
863+ options="${options%%:}"
864+
865+ # Does it really start with '/'?
866+ [ -n "${path%%/*}" ] && path="error";
867+
868+ #Fix kernel legacy style separating path and options with ','
869+ if [ "$path" != "${path#*,}" ] ; then
870+ options=${path#*,}
871+ path=${path%%,*}
872+ fi
873+}
874+
875+[ -z "$root" ] && root=$(getarg root=)
876+[ -z "$netroot" ] && netroot=$(getarg netroot=)
877+[ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
878+[ -z "$nbdroot" ] && nbdroot=$(getarg nbdroot=)
879+
880+
881
882=== added directory 'client/Fedora/template'
883=== added file 'client/Fedora/template/20-xinitrc-badprocs.sh'
884--- client/Fedora/template/20-xinitrc-badprocs.sh 1970-01-01 00:00:00 +0000
885+++ client/Fedora/template/20-xinitrc-badprocs.sh 2013-07-22 07:06:30 +0000
886@@ -0,0 +1,6 @@
887+PATTERN="(vmtoolsd.*vmusr|vmware-user)"
888+
889+# Signal all running instances of the user daemon.
890+# Our pattern ensures that we won't touch the system daemon.
891+ pkill -$1 -f "$PATTERN"
892+ return 0
893
894=== added file 'client/Fedora/template/plymouth-default-boot-duration'
895--- client/Fedora/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
896+++ client/Fedora/template/plymouth-default-boot-duration 2013-07-22 07:06:30 +0000
897@@ -0,0 +1,11 @@
898+0.788:RCkernelparam
899+0.789:RChostname
900+0.867:RCmountfs
901+0.876:RCswap
902+0.888:portreserve
903+0.895:rsyslog
904+0.901:nfslock
905+0.928:messagebus
906+0.937:haldaemon
907+0.990:udev-post
908+0.996:local
909
910=== added file 'client/Fedora/template/sl-other.repo'
911--- client/Fedora/template/sl-other.repo 1970-01-01 00:00:00 +0000
912+++ client/Fedora/template/sl-other.repo 2013-07-22 07:06:30 +0000
913@@ -0,0 +1,42 @@
914+[sl-fastbugs]
915+name=Scientific Linux $releasever - $basearch - fastbug updates
916+baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
917+ http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
918+ http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
919+ ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
920+#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
921+enabled=1
922+gpgcheck=1
923+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
924+
925+[sl-debuginfo]
926+name=Scientific Linux Debuginfo
927+baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
928+ http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
929+ http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
930+ ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
931+enabled=0
932+gpgcheck=1
933+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
934+
935+
936+[sl-testing]
937+name=Scientific Linux Testing - $basearch
938+baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
939+ http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
940+ http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
941+ ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
942+enabled=0
943+gpgcheck=0
944+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
945+
946+[sl-testing-source]
947+name=Scientific Linux Testing - Source
948+baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
949+ http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
950+ http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
951+ ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
952+enabled=0
953+gpgcheck=0
954+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
955+
956
957=== added file 'client/Fedora/template/x2go.repo'
958--- client/Fedora/template/x2go.repo 1970-01-01 00:00:00 +0000
959+++ client/Fedora/template/x2go.repo 2013-07-22 07:06:30 +0000
960@@ -0,0 +1,7 @@
961+[X11_RemoteDesktop_x2go]
962+name=X2go - after NoMachine ditched the open version (RHEL_6)
963+type=rpm-md
964+baseurl=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/
965+gpgcheck=1
966+gpgkey=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/repodata/repomd.xml.key
967+enabled=1
968
969=== added directory 'client/RHEL'
970=== added directory 'client/RHEL/chroot-setup'
971=== added directory 'client/RHEL/chroot-setup/chroot-setup.d'
972=== added file 'client/RHEL/chroot-setup/chroot-setup.d/000-pre-mount-proc'
973--- client/RHEL/chroot-setup/chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
974+++ client/RHEL/chroot-setup/chroot-setup.d/000-pre-mount-proc 2013-07-22 07:06:30 +0000
975@@ -0,0 +1,3 @@
976+#!/bin/sh
977+
978+mount /proc 2> /dev/null ||:
979
980=== added file 'client/RHEL/chroot-setup/chroot-setup.d/015-install-nbd'
981--- client/RHEL/chroot-setup/chroot-setup.d/015-install-nbd 1970-01-01 00:00:00 +0000
982+++ client/RHEL/chroot-setup/chroot-setup.d/015-install-nbd 2013-07-22 07:06:30 +0000
983@@ -0,0 +1,8 @@
984+#!/bin/bash
985+KERN_DIR=$(find /lib/modules/ -maxdepth 1 -type d -name 2.* |tail -1)
986+if [ -d "$KERN_DIR" ]; then
987+ [ `echo $KERN_DIR | grep x86_64` ] && cp /usr/share/ltsp/template/nbd.ko.x86_64 $KERN_DIR/kernel/drivers/block/nbd.ko
988+ [ `echo $KERN_DIR | grep i686` ] && cp /usr/share/ltsp/template/nbd.ko.i686 $KERN_DIR/kernel/drivers/block/nbd.ko
989+fi
990+current_kernel=$(basename $KERN_DIR)
991+depmod -ae -F /boot/System.map-${current_kernel} ${current_kernel}
992
993=== added file 'client/RHEL/chroot-setup/chroot-setup.d/020-dracut-config'
994--- client/RHEL/chroot-setup/chroot-setup.d/020-dracut-config 1970-01-01 00:00:00 +0000
995+++ client/RHEL/chroot-setup/chroot-setup.d/020-dracut-config 2013-07-22 07:06:30 +0000
996@@ -0,0 +1,15 @@
997+#!/bin/bash
998+
999+if [ -f /etc/dracut.conf ]; then
1000+ echo Generating initramfs
1001+ [ -e "/usr/share/ltsp/template/sysconfig-dracut" ] && cp /usr/share/ltsp/template/sysconfig-dracut /etc/dracut.conf.d/ltsp-dracut.conf
1002+ NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
1003+ unset DRACUTARG
1004+ [ -x /sbin/dracut ] && DRACUTARG=--dracut
1005+ /sbin/dracut -f 2>/dev/null
1006+ /sbin/new-kernel-pkg --mkinitrd $DRACUTARG --add-plymouth-initrd --install $NAME 2>/dev/null
1007+ /sbin/new-kernel-pkg --rpmposttrans $NAME 2>/dev/null
1008+else
1009+ echo Warning: Dracut not installed or no /etc/dracut.conf found
1010+fi
1011+
1012
1013=== added file 'client/RHEL/chroot-setup/chroot-setup.d/030-configure-client'
1014--- client/RHEL/chroot-setup/chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
1015+++ client/RHEL/chroot-setup/chroot-setup.d/030-configure-client 2013-07-22 07:06:30 +0000
1016@@ -0,0 +1,59 @@
1017+#!/bin/sh
1018+
1019+# Disable services we don't want
1020+for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
1021+ iscsid kudzu lvm2-monitor mcstrans mdmonitor nfs NetworkManager named\
1022+ pcscd rpcgssd rpcidmapd rpcsvcgssd kdump nfslock; do
1023+ if [ ! -e /etc/init.d/$service ]; then
1024+ continue
1025+ fi
1026+ #echo "Disabling Service: $service"
1027+ /sbin/chkconfig $service off
1028+done
1029+
1030+# Enable services we do want
1031+for service in haldaemon messagebus rsyslog udev-post ltsp-core rpcbind nfslock epoptes-client; do
1032+ if [ ! -e /etc/init.d/$service ]; then
1033+ continue
1034+ fi
1035+ #echo "Enabling Service: $service"
1036+ /sbin/chkconfig $service on
1037+done
1038+
1039+# Setup readonly-root Mode
1040+#sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
1041+
1042+# Set ltsp-launch-client as DM
1043+#echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
1044+
1045+# Link /etc/mtab to /proc/mounts
1046+# This is not perfect, but it enables fuse mounts to work.
1047+rm -f /etc/mtab 2>/dev/null
1048+#ln -sf /proc/mounts /etc/mtab
1049+cat /proc/mounts > /etc/mtab
1050+
1051+# Files to silence warning messages
1052+#touch /etc/alsa/asound.state
1053+touch /etc/asound.state
1054+
1055+# Silence /etc/mtab rwtab error message during bootup
1056+sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
1057+
1058+# Silence /etc/mtab* removal errors
1059+sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
1060+
1061+# Silence local filesystems mount errors during bootup
1062+sed -i '/^sysfs/d' /etc/fstab
1063+sed -i '/sysroot/d' /etc/mtab
1064+sed -i '/unionfs/d' /etc/mtab
1065+sed -i '/cgroup/d' /etc/mtab
1066+
1067+# F10+: install default boot-duration so plymouth can guess the startup progress bar better
1068+if [ -e /usr/share/plymouth/default-boot-duration ]; then
1069+ cp /usr/share/ltsp/template/default-boot-duration /usr/share/plymouth/default-boot-duration
1070+fi
1071+
1072+# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
1073+sed -i 's/^kill_all $"Sending all processes/#kill_all $"Sending all processes/' /etc/init.d/halt
1074+sed -i 's/sleep 2/#sleep 2/' /etc/init.d/halt
1075+sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
1076
1077=== added file 'client/RHEL/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config'
1078--- client/RHEL/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
1079+++ client/RHEL/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 2013-07-22 07:06:30 +0000
1080@@ -0,0 +1,7 @@
1081+#!/bin/sh
1082+
1083+# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
1084+# Not needed for CentOS 6
1085+if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
1086+ cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
1087+fi
1088
1089=== added file 'client/RHEL/chroot-setup/chroot-setup.d/090-post-umount-proc'
1090--- client/RHEL/chroot-setup/chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
1091+++ client/RHEL/chroot-setup/chroot-setup.d/090-post-umount-proc 2013-07-22 07:06:30 +0000
1092@@ -0,0 +1,3 @@
1093+#!/bin/sh
1094+
1095+umount /proc 2> /dev/null ||:
1096
1097=== added file 'client/RHEL/chroot-setup/ltsp-chroot-setup'
1098--- client/RHEL/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
1099+++ client/RHEL/chroot-setup/ltsp-chroot-setup 2013-07-22 07:06:30 +0000
1100@@ -0,0 +1,11 @@
1101+#!/bin/sh
1102+
1103+# Exit immediately if this is not a LTSP client chroot.
1104+[ ! -e /etc/ltsp_chroot ] && exit 0
1105+
1106+for i in /usr/share/ltsp/chroot-setup.d/* ; do
1107+ [ -d $i ] && continue
1108+ if [ -x $i ]; then
1109+ $i
1110+ fi
1111+done
1112
1113=== added directory 'client/RHEL/initscripts'
1114=== added file 'client/RHEL/initscripts/ltsp-client-launch'
1115--- client/RHEL/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
1116+++ client/RHEL/initscripts/ltsp-client-launch 2013-07-22 07:06:30 +0000
1117@@ -0,0 +1,91 @@
1118+#!/bin/bash
1119+#
1120+# ltsp-client-launch LTSP Client Launcher
1121+#
1122+# description: This launches the LTSP clients defined in /etc/lts.conf
1123+# along with sound server and other configured devices.
1124+#
1125+
1126+# Gracefully exit if ltsp_chroot file is not present
1127+test -f /etc/ltsp_chroot || exit 0
1128+
1129+# Make sure LANG is set
1130+if [ -z "$LANG" ]
1131+then
1132+ if [ -f /etc/sysconfig/i18n ]
1133+ then
1134+ . /etc/sysconfig/i18n
1135+ export LANG
1136+ fi
1137+fi
1138+
1139+if [ -z "$LC_MESSAGES" ]
1140+then
1141+ if [ -z "$LC_ALL" ]
1142+ then
1143+ LC_MESSAGES=$LANG
1144+ export LC_MESSAGES
1145+ fi
1146+fi
1147+
1148+# Grab lts.conf from the same IP address as the mount server.
1149+# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
1150+
1151+# check for NBD devices
1152+NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
1153+if [ -n "$NBD_DEVICES" ]; then
1154+ for DEVICE in $NBD_DEVICES ; do
1155+ SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
1156+ test -n "$SERVER" && break
1157+ done
1158+else
1159+ # check for NFS root
1160+ SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
1161+fi
1162+
1163+SERVER="${SERVER:-172.31.100.254}"
1164+export SERVER
1165+
1166+ARCH=$(uname -m)
1167+[ "$ARCH" = "i586" ] && ARCH=i386
1168+[ "$ARCH" = "i686" ] && ARCH=i386
1169+TFTPPATH="/ltsp/$ARCH/lts.conf"
1170+
1171+# Attempt to get lts.conf via tftp
1172+cd /var/run
1173+(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
1174+if [ -s ./lts.conf ];then
1175+ cp ./lts.conf /etc/lts.conf
1176+fi
1177+cd - > /dev/null
1178+
1179+# Source function libraries.
1180+. /usr/share/ltsp/ltsp-init-common
1181+
1182+teardown() {
1183+ killall -g screen_session pulseaudio ldm ltspfsd
1184+}
1185+trap "teardown" TERM
1186+
1187+# Start Screen Sessions defined in /etc/lts.conf
1188+for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
1189+eval num=\$SCREEN_$screen
1190+if [ -n "$num" ]; then
1191+ /usr/share/ltsp/screen_session "$screen" &
1192+fi
1193+done
1194+
1195+# TODO: Move these into service ltsp-client-setup
1196+configure_localdev
1197+configure_swap
1198+configure_serial_mouse
1199+configure_printer
1200+
1201+# /dev/dsp must be owned by pulse
1202+chown pulse /dev/dsp
1203+start_sound
1204+configure_sound_volume
1205+
1206+while :; do
1207+ sleep 365d
1208+done
1209
1210=== added file 'client/RHEL/initscripts/ltsp-core'
1211--- client/RHEL/initscripts/ltsp-core 1970-01-01 00:00:00 +0000
1212+++ client/RHEL/initscripts/ltsp-core 2013-07-22 07:06:30 +0000
1213@@ -0,0 +1,72 @@
1214+#! /bin/sh
1215+#
1216+# Author: Matt Zimmerman <mdz@ubuntu.com>
1217+#
1218+### BEGIN INIT INFO
1219+# Provides: ltsp-client ltsp-client-core ltsp-client-setup
1220+# Required-Start: $remote_fs $network $syslog
1221+# Should-Start:
1222+# Required-Stop:
1223+# Default-Start: 2 3 4 5
1224+# Default-Stop: 0 6
1225+# Short-Description: Script for LTSP client initialization
1226+# Description:
1227+### END INIT INFO
1228+
1229+set -e
1230+
1231+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
1232+DESC="LTSP client"
1233+NAME=ltsp-client
1234+SCRIPTNAME=/etc/init.d/$NAME
1235+
1236+# Gracefully exit if an LTSP boot was not requested
1237+grep -Eqsw "init=/sbin/init-ltsp|ltsp" /proc/cmdline || exit 0
1238+
1239+# handle localization settings
1240+if [ -r /etc/default/locale ]; then
1241+ . /etc/default/locale
1242+ export LANG LANGUAGE
1243+elif [ -r /etc/environment ]; then
1244+ . /etc/environment
1245+ export LANG LANGUAGE
1246+fi
1247+
1248+. /lib/lsb/init-functions
1249+. /usr/share/ltsp/ltsp-init-common
1250+
1251+case "$1" in
1252+ start)
1253+ log_success_msg "Starting LTSP client..."
1254+
1255+ if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then
1256+ # Tell the control center that we are booting and get lts.conf
1257+ eval $(getltscfg-cluster -a -l boot) || true
1258+ fi
1259+
1260+ if [ -x /bin/plymouth ]; then
1261+ /bin/plymouth quit --retain-splash || true
1262+ fi
1263+
1264+ start_screen_sessions || true
1265+ start_sound || true
1266+
1267+ ;;
1268+ stop)
1269+ # This means that an LTSP client is shutting down or rebooting.
1270+ # Try to cleanly close any open network connections.
1271+ if [ -x /usr/share/ltsp/nbd-disconnect ]; then
1272+ /usr/share/ltsp/nbd-disconnect &
1273+ fi
1274+ ;;
1275+ restart|force-reload)
1276+ echo "$NAME does not support restarting, reboot your client instead." >&2
1277+ exit 1
1278+ ;;
1279+ *)
1280+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
1281+ exit 1
1282+ ;;
1283+esac
1284+
1285+exit 0
1286
1287=== added directory 'client/RHEL/rwtab.d'
1288=== added file 'client/RHEL/rwtab.d/ltsp.rwtab'
1289--- client/RHEL/rwtab.d/ltsp.rwtab 1970-01-01 00:00:00 +0000
1290+++ client/RHEL/rwtab.d/ltsp.rwtab 2013-07-22 07:06:30 +0000
1291@@ -0,0 +1,27 @@
1292+# Already in F12 /etc/rwtab
1293+empty /var/log/ConsoleKit/
1294+empty /var/lib/dbus/
1295+empty /var/cache/hald/
1296+empty /var/lib/pulse/
1297+files /.viminfo
1298+files /etc/alsa/asound.state
1299+# Already in F11 /etc/rwtab
1300+dirs /var/lib/xkb/
1301+
1302+# BUG: Directories that need to be writable but contain files we don't want to disappear
1303+# (Although somehow this wasn't harmful to LTSP in the past?)
1304+dirs /etc/udev/rules.d/
1305+
1306+# LTSP specific
1307+dirs /var/cache/ldm/
1308+dirs /home
1309+empty /var/cache/ltsp-localapps/
1310+empty /root
1311+files /etc/lts.conf
1312+files /etc/X11/xorg.conf
1313+files /etc/passwd
1314+files /etc/group
1315+files /etc/localtime
1316+files /etc/cups/client.conf
1317+# Old versions of Fedora only
1318+files /etc/asound.state
1319
1320=== added directory 'client/RHEL/scripts'
1321=== added file 'client/RHEL/scripts/ltsp-rewrap-latest-kernel'
1322--- client/RHEL/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
1323+++ client/RHEL/scripts/ltsp-rewrap-latest-kernel 2013-07-22 07:06:30 +0000
1324@@ -0,0 +1,10 @@
1325+#!/bin/bash
1326+# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
1327+echo "Re-wrapping vmlinuz and initrd, Please be patient."
1328+
1329+NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
1330+unset DRACUTARG
1331+[ -x /sbin/dracut ] && DRACUTARG=--dracut
1332+/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
1333+/sbin/new-kernel-pkg --rpmposttrans $NAME
1334+/sbin/depmod -au "$NAME" -F "/boot/System.map-$NAME"
1335
1336=== added directory 'client/RHEL/share'
1337=== added directory 'client/RHEL/share/ltsp'
1338=== added directory 'client/RHEL/share/ltsp/init-ltsp.d'
1339=== added file 'client/RHEL/share/ltsp/init-ltsp.d/00-overlay'
1340--- client/RHEL/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
1341+++ client/RHEL/share/ltsp/init-ltsp.d/00-overlay 2013-07-22 07:06:30 +0000
1342@@ -0,0 +1,123 @@
1343+#!/bin/sh
1344+#
1345+# Overlay filesystem mounting -*- overlay-module -*-
1346+#
1347+# 2013, Joshua Trimm <enslaver@enslaver.com>
1348+#
1349+# Derived from previously modified scripts written by:
1350+# 2008, Stephane Graber <stgraber@ubuntu.com>
1351+# 2009, Vagrant Cascadian <vagrant@freegeek.org>
1352+#
1353+# This program is free software; you can redistribute it and/or
1354+# modify it under the terms of the GNU General Public License as
1355+# published by the Free Software Foundation; either version 2 of the
1356+# License, or (at your option) any later version.
1357+#
1358+# This program is distributed in the hope that it will be useful,
1359+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1360+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1361+# GNU General Public License for more details.
1362+#
1363+# You should have received a copy of the GNU General Public License
1364+# along with this program. If not, you can find it on the World Wide
1365+# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
1366+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
1367+# MA 02110-1301, USA.
1368+#
1369+# The idea is to make this a double script, running from init-ltsp
1370+# and also be installed to the initramfs using either dracut or
1371+# initramfs-tools.
1372+
1373+#set -x
1374+
1375+[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
1376+
1377+# On by default
1378+OVERLAY=${OVERLAY:-Y}
1379+
1380+if [ -f /.inside-cow ]; then
1381+ # Already inside copy-on-write filesystem
1382+ return
1383+fi
1384+
1385+if [ ! $OVERLAY ]; then
1386+ # Someone doesnt love me
1387+ return
1388+fi
1389+
1390+
1391+
1392+# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
1393+OVERLAYFS=${OVERLAYFS:-unionfs}
1394+
1395+panic() { echo "Error: $@"; exit 1; }
1396+
1397+
1398+# Try to give us some tmp space in userland
1399+test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
1400+
1401+[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
1402+[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
1403+[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
1404+[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
1405+
1406+if modprobe -q overlayfs; then
1407+ # For kernel overlays
1408+ if [ "$DETECT_MODULE_INCOMPLETE" ]; then
1409+ UNION_TYPE=overlayfs
1410+ UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
1411+ fi
1412+elif modprobe -q fuse; then
1413+ # For fuse overlays
1414+ FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
1415+ if [ "$INSIDE_DRACUT" ]; then
1416+ . /tmp/root.info
1417+ [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
1418+ CHROOT_PATH="/tmp/unionfs"
1419+ UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
1420+ NEWROOT=${NEWROOT:-/sysroot}
1421+ OLDROOT="$NEWROOT"
1422+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
1423+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
1424+ mount --move /sysroot /tmp/sysroot
1425+ mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
1426+ unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
1427+ echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
1428+ [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
1429+ cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
1430+ elif [ "$INSIDE_INITRAMFS" ]; then
1431+ # This is for initramfs-tools that include the fuse module.
1432+ # it is incomplete but should be similar to above, just set
1433+ # NEWROOT to where it mounts the nfsroot
1434+ NEWROOT="${rootmnt}"
1435+ . /tmp/root.info
1436+ [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
1437+ CHROOT_PATH="/tmp/unionfs"
1438+ UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
1439+ NEWROOT=${NEWROOT:-/sysroot}
1440+ OLDROOT="$NEWROOT"
1441+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
1442+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
1443+ mount --move /sysroot /tmp/sysroot
1444+ mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
1445+ unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
1446+ echo inside-cow-initramfs > /sysroot/.inside-cow
1447+ [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
1448+ cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
1449+ elif [ "$INSIDE_LTSP_INIT" ]; then
1450+ CHROOT_PATH="/tmp/unionfs"
1451+ UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
1452+ UBIN=/usr/bin/unionfs
1453+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
1454+ [ -e "/proc/cmdline" ] || mount -t proc proc /proc
1455+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
1456+ mount --bind / $CHROOT_PATH/rofs
1457+ $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
1458+ mount -t proc proc /tmp/union/proc
1459+ echo inside-cow-ltsp-init > /tmp/union/.inside-cow
1460+ cd /tmp/union
1461+ mkdir oldroot
1462+ pivot_root . oldroot
1463+ init q
1464+ fi
1465+fi
1466
1467=== added file 'client/RHEL/share/ltsp/init-ltsp.d/09-hostname'
1468--- client/RHEL/share/ltsp/init-ltsp.d/09-hostname 1970-01-01 00:00:00 +0000
1469+++ client/RHEL/share/ltsp/init-ltsp.d/09-hostname 2013-07-22 07:06:30 +0000
1470@@ -0,0 +1,35 @@
1471+if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
1472+ HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
1473+ IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
1474+ IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
1475+ case "$HOSTNAME_EXTRA" in
1476+ mac)
1477+ HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
1478+ ;;
1479+ ip|"")
1480+ HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
1481+ ;;
1482+ esac
1483+ HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
1484+fi
1485+
1486+hostname "$HOSTNAME"
1487+echo "$HOSTNAME" > /etc/hostname
1488+
1489+cat <<EOF > /etc/hosts
1490+127.0.0.1 localhost
1491+127.0.0.2 $HOSTNAME
1492+$SERVER server
1493+
1494+# The following lines are desirable for IPv6 capable hosts
1495+::1 ip6-localhost ip6-loopback
1496+fe00::0 ip6-localnet
1497+ff00::0 ip6-mcastprefix
1498+ff02::1 ip6-allnodes
1499+ff02::2 ip6-allrouters
1500+EOF
1501+
1502+if [ -f /etc/hosts.ltsp ]; then
1503+ cat /etc/hosts.ltsp >> /etc/hosts
1504+fi
1505+env | sed -n '/^HOSTS_[0-9][0-9]=/s///p' >> /etc/hosts
1506
1507=== added file 'client/RHEL/share/ltsp/init-ltsp.d/10-cleanup-consoles'
1508--- client/RHEL/share/ltsp/init-ltsp.d/10-cleanup-consoles 1970-01-01 00:00:00 +0000
1509+++ client/RHEL/share/ltsp/init-ltsp.d/10-cleanup-consoles 2013-07-22 07:06:30 +0000
1510@@ -0,0 +1,15 @@
1511+#!/bin/sh
1512+
1513+### Set Runlevel 5 and turn off the mingetty's
1514+# Fedora 8 and previous, and RHEL5
1515+[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
1516+# Fedora 9+ with Upstart
1517+if [ -e /etc/event.d/tty1 ]; then
1518+ for NUM in 1 2 3 4 5 6; do
1519+ echo > /etc/event.d/tty$NUM
1520+ done
1521+fi
1522+# Fedora 13+ and EL6 with Upstart
1523+if [ -e /etc/init/start-ttys.conf ]; then
1524+ echo > /etc/init/start-ttys.conf
1525+fi
1526
1527=== added file 'client/RHEL/share/ltsp/init-ltsp.d/50-gconf-settings'
1528--- client/RHEL/share/ltsp/init-ltsp.d/50-gconf-settings 1970-01-01 00:00:00 +0000
1529+++ client/RHEL/share/ltsp/init-ltsp.d/50-gconf-settings 2013-07-22 07:06:30 +0000
1530@@ -0,0 +1,8 @@
1531+# Disable Gnome notifications
1532+gconftool-2 -s \
1533+/apps/panel/global/tooltips_enabled --type bool false
1534+
1535+# Disable lockscreen
1536+gconftool-2 -s \
1537+/apps/panel/global/disable_lock_screen --type bool true
1538+
1539
1540=== added file 'client/RHEL/share/ltsp/ltsp-client-launch'
1541--- client/RHEL/share/ltsp/ltsp-client-launch 1970-01-01 00:00:00 +0000
1542+++ client/RHEL/share/ltsp/ltsp-client-launch 2013-07-22 07:06:30 +0000
1543@@ -0,0 +1,91 @@
1544+#!/bin/bash
1545+#
1546+# ltsp-client-launch LTSP Client Launcher
1547+#
1548+# description: This launches the LTSP clients defined in /etc/lts.conf
1549+# along with sound server and other configured devices.
1550+#
1551+
1552+# Gracefully exit if ltsp_chroot file is not present
1553+test -f /etc/ltsp_chroot || exit 0
1554+
1555+# Make sure LANG is set
1556+if [ -z "$LANG" ]
1557+then
1558+ if [ -f /etc/sysconfig/i18n ]
1559+ then
1560+ . /etc/sysconfig/i18n
1561+ export LANG
1562+ fi
1563+fi
1564+
1565+if [ -z "$LC_MESSAGES" ]
1566+then
1567+ if [ -z "$LC_ALL" ]
1568+ then
1569+ LC_MESSAGES=$LANG
1570+ export LC_MESSAGES
1571+ fi
1572+fi
1573+
1574+# Grab lts.conf from the same IP address as the mount server.
1575+# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
1576+
1577+# check for NBD devices
1578+NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
1579+if [ -n "$NBD_DEVICES" ]; then
1580+ for DEVICE in $NBD_DEVICES ; do
1581+ SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
1582+ test -n "$SERVER" && break
1583+ done
1584+else
1585+ # check for NFS root
1586+ SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
1587+fi
1588+
1589+SERVER="${SERVER:-172.31.100.254}"
1590+export SERVER
1591+
1592+ARCH=$(uname -m)
1593+[ "$ARCH" = "i586" ] && ARCH=i386
1594+[ "$ARCH" = "i686" ] && ARCH=i386
1595+TFTPPATH="/ltsp/$ARCH/lts.conf"
1596+
1597+# Attempt to get lts.conf via tftp
1598+cd /var/run
1599+(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
1600+if [ -s ./lts.conf ];then
1601+ cp ./lts.conf /etc/lts.conf
1602+fi
1603+cd - > /dev/null
1604+
1605+# Source function libraries.
1606+. /usr/share/ltsp/ltsp-init-common
1607+
1608+teardown() {
1609+ killall -g screen_session pulseaudio ldm ltspfsd
1610+}
1611+trap "teardown" TERM
1612+
1613+# Start Screen Sessions defined in /etc/lts.conf
1614+for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
1615+eval num=\$SCREEN_$screen
1616+if [ -n "$num" ]; then
1617+ /usr/share/ltsp/screen_session "$screen" &
1618+fi
1619+done
1620+
1621+# TODO: Move these into service ltsp-client-setup
1622+configure_localdev
1623+configure_swap
1624+configure_serial_mouse
1625+configure_printer
1626+
1627+# /dev/dsp must be owned by pulse
1628+chown pulse /dev/dsp
1629+start_sound
1630+configure_sound_volume
1631+
1632+while :; do
1633+ sleep 365d
1634+done
1635
1636=== added file 'client/RHEL/share/ltsp/ltsp-client-vendor-functions'
1637--- client/RHEL/share/ltsp/ltsp-client-vendor-functions 1970-01-01 00:00:00 +0000
1638+++ client/RHEL/share/ltsp/ltsp-client-vendor-functions 2013-07-22 07:06:30 +0000
1639@@ -0,0 +1,108 @@
1640+# Fedora-specific function overrides for the common functions
1641+
1642+detect_arch() {
1643+ echo $(uname -m | sed -e s/i.86/i386/)
1644+}
1645+
1646+if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost.localdomain" ] || [ "$HOSTNAME" = "localhost" ]; then
1647+ HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
1648+ IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
1649+ IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
1650+ case "$HOSTNAME_EXTRA" in
1651+ mac)
1652+ HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
1653+ ;;
1654+ ip|"")
1655+ HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
1656+ ;;
1657+ esac
1658+ HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
1659+fi
1660+
1661+# Taken from dracut lib
1662+# returns OK if $1 contains $2
1663+strstr() {
1664+ [ "${1#*$2*}" != "$1" ]
1665+}
1666+
1667+getarg() {
1668+ set +x
1669+ local o line
1670+ if [ -z "$CMDLINE" ]; then
1671+ if [ -e /etc/cmdline ]; then
1672+ while read line; do
1673+ CMDLINE_ETC="$CMDLINE_ETC $line";
1674+ done </etc/cmdline;
1675+ fi
1676+ read CMDLINE </proc/cmdline;
1677+ CMDLINE="$CMDLINE $CMDLINE_ETC"
1678+ fi
1679+ for o in $CMDLINE; do
1680+ [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
1681+ [ "${o%%=*}" = "${1%=}" ] && { echo ${o#*=}; [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
1682+ done
1683+ [ "$RDDEBUG" = "yes" ] && set -x
1684+ return 1
1685+}
1686+
1687+getargs() {
1688+ set +x
1689+ local o line found
1690+ if [ -z "$CMDLINE" ]; then
1691+ if [ -e /etc/cmdline ]; then
1692+ while read line; do
1693+ CMDLINE_ETC="$CMDLINE_ETC $line";
1694+ done </etc/cmdline;
1695+ fi
1696+ read CMDLINE </proc/cmdline;
1697+ CMDLINE="$CMDLINE $CMDLINE_ETC"
1698+ fi
1699+ for o in $CMDLINE; do
1700+ [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
1701+ if [ "${o%%=*}" = "${1%=}" ]; then
1702+ echo -n "${o#*=} ";
1703+ found=1;
1704+ fi
1705+ done
1706+ [ -n "$found" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
1707+ [ "$RDDEBUG" = "yes" ] && set -x
1708+ return 1;
1709+}
1710+
1711+nfsroot_to_var() {
1712+ # strip nfs[4]:
1713+ local arg="$@:"
1714+ nfs="${arg%%:*}"
1715+ arg="${arg##$nfs:}"
1716+
1717+ # check if we have a server
1718+ if strstr "$arg" ':/*' ; then
1719+ server="${arg%%:/*}"
1720+ arg="/${arg##*:/}"
1721+ fi
1722+
1723+ path="${arg%%:*}"
1724+
1725+ # rest are options
1726+ options="${arg##$path}"
1727+ # strip leading ":"
1728+ options="${options##:}"
1729+ # strip ":"
1730+ options="${options%%:}"
1731+
1732+ # Does it really start with '/'?
1733+ [ -n "${path%%/*}" ] && path="error";
1734+
1735+ #Fix kernel legacy style separating path and options with ','
1736+ if [ "$path" != "${path#*,}" ] ; then
1737+ options=${path#*,}
1738+ path=${path%%,*}
1739+ fi
1740+}
1741+
1742+[ -z "$root" ] && root=$(getarg root=)
1743+[ -z "$netroot" ] && netroot=$(getarg netroot=)
1744+[ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
1745+[ -z "$nbdroot" ] && nbdroot=$(getarg nbdroot=)
1746+
1747+
1748
1749=== added directory 'client/RHEL/template'
1750=== added file 'client/RHEL/template/20-xinitrc-badprocs.sh'
1751--- client/RHEL/template/20-xinitrc-badprocs.sh 1970-01-01 00:00:00 +0000
1752+++ client/RHEL/template/20-xinitrc-badprocs.sh 2013-07-22 07:06:30 +0000
1753@@ -0,0 +1,6 @@
1754+PATTERN="(vmtoolsd.*vmusr|vmware-user)"
1755+
1756+# Signal all running instances of the user daemon.
1757+# Our pattern ensures that we won't touch the system daemon.
1758+ pkill -$1 -f "$PATTERN"
1759+ return 0
1760
1761=== added file 'client/RHEL/template/nbd.ko.i686'
1762Binary files client/RHEL/template/nbd.ko.i686 1970-01-01 00:00:00 +0000 and client/RHEL/template/nbd.ko.i686 2013-07-22 07:06:30 +0000 differ
1763=== added file 'client/RHEL/template/nbd.ko.x86_64'
1764Binary files client/RHEL/template/nbd.ko.x86_64 1970-01-01 00:00:00 +0000 and client/RHEL/template/nbd.ko.x86_64 2013-07-22 07:06:30 +0000 differ
1765=== added file 'client/RHEL/template/plymouth-default-boot-duration'
1766--- client/RHEL/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
1767+++ client/RHEL/template/plymouth-default-boot-duration 2013-07-22 07:06:30 +0000
1768@@ -0,0 +1,11 @@
1769+0.788:RCkernelparam
1770+0.789:RChostname
1771+0.867:RCmountfs
1772+0.876:RCswap
1773+0.888:portreserve
1774+0.895:rsyslog
1775+0.901:nfslock
1776+0.928:messagebus
1777+0.937:haldaemon
1778+0.990:udev-post
1779+0.996:local
1780
1781=== added file 'client/RHEL/template/sl-other.repo'
1782--- client/RHEL/template/sl-other.repo 1970-01-01 00:00:00 +0000
1783+++ client/RHEL/template/sl-other.repo 2013-07-22 07:06:30 +0000
1784@@ -0,0 +1,42 @@
1785+[sl-fastbugs]
1786+name=Scientific Linux $releasever - $basearch - fastbug updates
1787+baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
1788+ http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
1789+ http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
1790+ ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
1791+#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
1792+enabled=1
1793+gpgcheck=1
1794+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
1795+
1796+[sl-debuginfo]
1797+name=Scientific Linux Debuginfo
1798+baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
1799+ http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
1800+ http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
1801+ ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
1802+enabled=0
1803+gpgcheck=1
1804+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
1805+
1806+
1807+[sl-testing]
1808+name=Scientific Linux Testing - $basearch
1809+baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
1810+ http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
1811+ http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
1812+ ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
1813+enabled=0
1814+gpgcheck=0
1815+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
1816+
1817+[sl-testing-source]
1818+name=Scientific Linux Testing - Source
1819+baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
1820+ http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
1821+ http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
1822+ ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
1823+enabled=0
1824+gpgcheck=0
1825+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
1826+
1827
1828=== added file 'client/RHEL/template/x2go.repo'
1829--- client/RHEL/template/x2go.repo 1970-01-01 00:00:00 +0000
1830+++ client/RHEL/template/x2go.repo 2013-07-22 07:06:30 +0000
1831@@ -0,0 +1,7 @@
1832+[X11_RemoteDesktop_x2go]
1833+name=X2go - after NoMachine ditched the open version (RHEL_6)
1834+type=rpm-md
1835+baseurl=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/
1836+gpgcheck=1
1837+gpgkey=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/repodata/repomd.xml.key
1838+enabled=1
1839
1840=== removed directory 'client/Redhat'
1841=== removed directory 'client/Redhat/chroot-setup'
1842=== removed directory 'client/Redhat/chroot-setup/chroot-setup.d'
1843=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/000-pre-mount-proc'
1844--- client/Redhat/chroot-setup/chroot-setup.d/000-pre-mount-proc 2013-02-27 08:22:30 +0000
1845+++ client/Redhat/chroot-setup/chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
1846@@ -1,3 +0,0 @@
1847-#!/bin/sh
1848-
1849-mount /proc 2> /dev/null ||:
1850
1851=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/010-cleanup-consoles'
1852--- client/Redhat/chroot-setup/chroot-setup.d/010-cleanup-consoles 2013-02-27 08:22:30 +0000
1853+++ client/Redhat/chroot-setup/chroot-setup.d/010-cleanup-consoles 1970-01-01 00:00:00 +0000
1854@@ -1,15 +0,0 @@
1855-#!/bin/sh
1856-
1857-### Set Runlevel 5 and turn off the mingetty's
1858-# Fedora 8 and previous, and RHEL5
1859-[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
1860-# Fedora 9+ with Upstart
1861-if [ -e /etc/event.d/tty1 ]; then
1862- for NUM in 1 2 3 4 5 6; do
1863- echo > /etc/event.d/tty$NUM
1864- done
1865-fi
1866-# Fedora 13+ and EL6 with Upstart
1867-if [ -e /etc/init/start-ttys.conf ]; then
1868- echo > /etc/init/start-ttys.conf
1869-fi
1870
1871=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/020-dracut-config'
1872--- client/Redhat/chroot-setup/chroot-setup.d/020-dracut-config 2013-02-27 08:22:30 +0000
1873+++ client/Redhat/chroot-setup/chroot-setup.d/020-dracut-config 1970-01-01 00:00:00 +0000
1874@@ -1,15 +0,0 @@
1875-#!/bin/bash
1876-
1877-if [ -f /etc/dracut.conf ]; then
1878- echo Generating initramfs
1879- cp /usr/share/ltsp/dracut/sysconfig-dracut /etc/dracut.conf.d/ltsp-dracut.conf
1880- NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
1881- unset DRACUTARG
1882- [ -x /sbin/dracut ] && DRACUTARG=--dracut
1883- /sbin/dracut -f
1884- /sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
1885- /sbin/new-kernel-pkg --rpmposttrans $NAME
1886-else
1887- echo Warning: Dracut not installed or no /etc/dracut.conf found
1888-fi
1889-
1890
1891=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/030-configure-client'
1892--- client/Redhat/chroot-setup/chroot-setup.d/030-configure-client 2013-02-27 08:22:30 +0000
1893+++ client/Redhat/chroot-setup/chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
1894@@ -1,57 +0,0 @@
1895-#!/bin/sh
1896-
1897-# Disable services we don't want
1898-for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
1899- iscsid kudzu lvm2-monitor mcstrans mdmonitor nfs NetworkManager named\
1900- pcscd rpcbind rpcgssd rpcidmapd rpcsvcgssd; do
1901- if [ ! -e /etc/init.d/$service ]; then
1902- continue
1903- fi
1904- #echo "Disabling Service: $service"
1905- /sbin/chkconfig $service off
1906-done
1907-
1908-# Enable services we do want
1909-for service in haldaemon messagebus rsyslog udev-post ltsp-core ; do
1910- if [ ! -e /etc/init.d/$service ]; then
1911- continue
1912- fi
1913- #echo "Enabling Service: $service"
1914- /sbin/chkconfig $service on
1915-done
1916-
1917-# Setup readonly-root Mode
1918-#sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
1919-
1920-# Set ltsp-launch-client as DM
1921-#echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
1922-
1923-# Link /etc/mtab to /proc/mounts
1924-# This is not perfect, but it enables fuse mounts to work.
1925-rm -f /etc/mtab
1926-ln -sf ../proc/mounts /etc/mtab
1927-
1928-# Files to silence warning messages
1929-touch /etc/alsa/asound.state
1930-touch /etc/asound.state
1931-
1932-# Silence /etc/mtab rwtab error message during bootup
1933-sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
1934-
1935-# Silence /etc/mtab* removal errors
1936-sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
1937-
1938-# Silence local filesystems mount errors during bootup
1939-sed -i '/^sysfs/d' /etc/fstab
1940-sed -i '/sysroot/d' /etc/mtab
1941-sed -i '/unionfs/d' /etc/mtab
1942-
1943-# F10+: install default boot-duration so plymouth can guess the startup progress bar better
1944-if [ -e /var/lib/plymouth/boot-duration ]; then
1945- cp /usr/share/ltsp/template/plymouth-default-boot-duration /var/lib/plymouth/boot-duration
1946-fi
1947-
1948-# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
1949-sed -i 's/^kill_all $"Sending all processes/#kill_all $"Sending all processes/' /etc/init.d/halt
1950-sed -i 's/sleep 2/#sleep 2/' /etc/init.d/halt
1951-sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
1952
1953=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config'
1954--- client/Redhat/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 2013-02-27 08:22:30 +0000
1955+++ client/Redhat/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
1956@@ -1,7 +0,0 @@
1957-#!/bin/sh
1958-
1959-# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
1960-# Not needed for CentOS 6
1961-if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
1962- cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
1963-fi
1964
1965=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/090-post-umount-proc'
1966--- client/Redhat/chroot-setup/chroot-setup.d/090-post-umount-proc 2013-02-27 08:22:30 +0000
1967+++ client/Redhat/chroot-setup/chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
1968@@ -1,3 +0,0 @@
1969-#!/bin/sh
1970-
1971-umount /proc 2> /dev/null ||:
1972
1973=== removed file 'client/Redhat/chroot-setup/ltsp-chroot-setup'
1974--- client/Redhat/chroot-setup/ltsp-chroot-setup 2013-02-27 08:22:30 +0000
1975+++ client/Redhat/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
1976@@ -1,11 +0,0 @@
1977-#!/bin/sh
1978-
1979-# Exit immediately if this is not a LTSP client chroot.
1980-[ ! -e /etc/ltsp_chroot ] && exit 0
1981-
1982-for i in /usr/share/ltsp/chroot-setup.d/* ; do
1983- [ -d $i ] && continue
1984- if [ -x $i ]; then
1985- $i
1986- fi
1987-done
1988
1989=== removed directory 'client/Redhat/initscripts'
1990=== removed file 'client/Redhat/initscripts/ltsp-client-launch'
1991--- client/Redhat/initscripts/ltsp-client-launch 2013-02-27 08:22:30 +0000
1992+++ client/Redhat/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
1993@@ -1,91 +0,0 @@
1994-#!/bin/bash
1995-#
1996-# ltsp-client-launch LTSP Client Launcher
1997-#
1998-# description: This launches the LTSP clients defined in /etc/lts.conf
1999-# along with sound server and other configured devices.
2000-#
2001-
2002-# Gracefully exit if ltsp_chroot file is not present
2003-test -f /etc/ltsp_chroot || exit 0
2004-
2005-# Make sure LANG is set
2006-if [ -z "$LANG" ]
2007-then
2008- if [ -f /etc/sysconfig/i18n ]
2009- then
2010- . /etc/sysconfig/i18n
2011- export LANG
2012- fi
2013-fi
2014-
2015-if [ -z "$LC_MESSAGES" ]
2016-then
2017- if [ -z "$LC_ALL" ]
2018- then
2019- LC_MESSAGES=$LANG
2020- export LC_MESSAGES
2021- fi
2022-fi
2023-
2024-# Grab lts.conf from the same IP address as the mount server.
2025-# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
2026-
2027-# check for NBD devices
2028-NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
2029-if [ -n "$NBD_DEVICES" ]; then
2030- for DEVICE in $NBD_DEVICES ; do
2031- SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
2032- test -n "$SERVER" && break
2033- done
2034-else
2035- # check for NFS root
2036- SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
2037-fi
2038-
2039-SERVER="${SERVER:-172.31.100.254}"
2040-export SERVER
2041-
2042-ARCH=$(uname -m)
2043-[ "$ARCH" = "i586" ] && ARCH=i386
2044-[ "$ARCH" = "i686" ] && ARCH=i386
2045-TFTPPATH="/ltsp/$ARCH/lts.conf"
2046-
2047-# Attempt to get lts.conf via tftp
2048-cd /var/run
2049-(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
2050-if [ -s ./lts.conf ];then
2051- cp ./lts.conf /etc/lts.conf
2052-fi
2053-cd - > /dev/null
2054-
2055-# Source function libraries.
2056-. /usr/share/ltsp/ltsp-init-common
2057-
2058-teardown() {
2059- killall -g screen_session pulseaudio ldm ltspfsd
2060-}
2061-trap "teardown" TERM
2062-
2063-# Start Screen Sessions defined in /etc/lts.conf
2064-for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
2065-eval num=\$SCREEN_$screen
2066-if [ -n "$num" ]; then
2067- /usr/share/ltsp/screen_session "$screen" &
2068-fi
2069-done
2070-
2071-# TODO: Move these into service ltsp-client-setup
2072-configure_localdev
2073-configure_swap
2074-configure_serial_mouse
2075-configure_printer
2076-
2077-# /dev/dsp must be owned by pulse
2078-chown pulse /dev/dsp
2079-start_sound
2080-configure_sound_volume
2081-
2082-while :; do
2083- sleep 365d
2084-done
2085
2086=== removed file 'client/Redhat/initscripts/ltsp-core'
2087--- client/Redhat/initscripts/ltsp-core 2013-02-27 08:22:30 +0000
2088+++ client/Redhat/initscripts/ltsp-core 1970-01-01 00:00:00 +0000
2089@@ -1,72 +0,0 @@
2090-#! /bin/sh
2091-#
2092-# Author: Matt Zimmerman <mdz@ubuntu.com>
2093-#
2094-### BEGIN INIT INFO
2095-# Provides: ltsp-client ltsp-client-core ltsp-client-setup
2096-# Required-Start: $remote_fs $network $syslog
2097-# Should-Start:
2098-# Required-Stop:
2099-# Default-Start: 2 3 4 5
2100-# Default-Stop: 0 6
2101-# Short-Description: Script for LTSP client initialization
2102-# Description:
2103-### END INIT INFO
2104-
2105-set -e
2106-
2107-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
2108-DESC="LTSP client"
2109-NAME=ltsp-client
2110-SCRIPTNAME=/etc/init.d/$NAME
2111-
2112-# Gracefully exit if an LTSP boot was not requested
2113-grep -Eqsw "init=/sbin/init-ltsp|ltsp" /proc/cmdline || exit 0
2114-
2115-# handle localization settings
2116-if [ -r /etc/default/locale ]; then
2117- . /etc/default/locale
2118- export LANG LANGUAGE
2119-elif [ -r /etc/environment ]; then
2120- . /etc/environment
2121- export LANG LANGUAGE
2122-fi
2123-
2124-. /lib/lsb/init-functions
2125-. /usr/share/ltsp/ltsp-init-common
2126-
2127-case "$1" in
2128- start)
2129- log_success_msg "Starting LTSP client..."
2130-
2131- if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then
2132- # Tell the control center that we are booting and get lts.conf
2133- eval $(getltscfg-cluster -a -l boot) || true
2134- fi
2135-
2136- if [ -x /bin/plymouth ]; then
2137- /bin/plymouth quit --retain-splash || true
2138- fi
2139-
2140- start_screen_sessions || true
2141- start_sound || true
2142-
2143- ;;
2144- stop)
2145- # This means that an LTSP client is shutting down or rebooting.
2146- # Try to cleanly close any open network connections.
2147- if [ -x /usr/share/ltsp/nbd-disconnect ]; then
2148- /usr/share/ltsp/nbd-disconnect &
2149- fi
2150- ;;
2151- restart|force-reload)
2152- echo "$NAME does not support restarting, reboot your client instead." >&2
2153- exit 1
2154- ;;
2155- *)
2156- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
2157- exit 1
2158- ;;
2159-esac
2160-
2161-exit 0
2162
2163=== removed directory 'client/Redhat/rwtab.d'
2164=== removed file 'client/Redhat/rwtab.d/ltsp.rwtab'
2165--- client/Redhat/rwtab.d/ltsp.rwtab 2013-02-27 08:22:30 +0000
2166+++ client/Redhat/rwtab.d/ltsp.rwtab 1970-01-01 00:00:00 +0000
2167@@ -1,27 +0,0 @@
2168-# Already in F12 /etc/rwtab
2169-empty /var/log/ConsoleKit/
2170-empty /var/lib/dbus/
2171-empty /var/cache/hald/
2172-empty /var/lib/pulse/
2173-files /.viminfo
2174-files /etc/alsa/asound.state
2175-# Already in F11 /etc/rwtab
2176-dirs /var/lib/xkb/
2177-
2178-# BUG: Directories that need to be writable but contain files we don't want to disappear
2179-# (Although somehow this wasn't harmful to LTSP in the past?)
2180-dirs /etc/udev/rules.d/
2181-
2182-# LTSP specific
2183-dirs /var/cache/ldm/
2184-dirs /home
2185-empty /var/cache/ltsp-localapps/
2186-empty /root
2187-files /etc/lts.conf
2188-files /etc/X11/xorg.conf
2189-files /etc/passwd
2190-files /etc/group
2191-files /etc/localtime
2192-files /etc/cups/client.conf
2193-# Old versions of Fedora only
2194-files /etc/asound.state
2195
2196=== removed directory 'client/Redhat/scripts'
2197=== removed file 'client/Redhat/scripts/ltsp-rewrap-latest-kernel'
2198--- client/Redhat/scripts/ltsp-rewrap-latest-kernel 2013-02-27 08:22:30 +0000
2199+++ client/Redhat/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
2200@@ -1,10 +0,0 @@
2201-#!/bin/bash
2202-# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
2203-echo "Re-wrapping vmlinuz and initrd, Please be patient."
2204-
2205-NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
2206-unset DRACUTARG
2207-[ -x /sbin/dracut ] && DRACUTARG=--dracut
2208-/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
2209-/sbin/new-kernel-pkg --rpmposttrans $NAME
2210-/sbin/depmod -au "$NAME" -F "/boot/System.map-$NAME"
2211
2212=== removed directory 'client/Redhat/share'
2213=== removed directory 'client/Redhat/share/ltsp'
2214=== removed directory 'client/Redhat/share/ltsp/init-ltsp.d'
2215=== removed file 'client/Redhat/share/ltsp/init-ltsp.d/00-overlay'
2216--- client/Redhat/share/ltsp/init-ltsp.d/00-overlay 2013-02-27 08:22:30 +0000
2217+++ client/Redhat/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
2218@@ -1,123 +0,0 @@
2219-#!/bin/sh
2220-#
2221-# Overlay filesystem mounting -*- overlay-module -*-
2222-#
2223-# 2013, Joshua Trimm <enslaver@enslaver.com>
2224-#
2225-# Derived from previously modified scripts written by:
2226-# 2008, Stephane Graber <stgraber@ubuntu.com>
2227-# 2009, Vagrant Cascadian <vagrant@freegeek.org>
2228-#
2229-# This program is free software; you can redistribute it and/or
2230-# modify it under the terms of the GNU General Public License as
2231-# published by the Free Software Foundation; either version 2 of the
2232-# License, or (at your option) any later version.
2233-#
2234-# This program is distributed in the hope that it will be useful,
2235-# but WITHOUT ANY WARRANTY; without even the implied warranty of
2236-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2237-# GNU General Public License for more details.
2238-#
2239-# You should have received a copy of the GNU General Public License
2240-# along with this program. If not, you can find it on the World Wide
2241-# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
2242-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
2243-# MA 02110-1301, USA.
2244-#
2245-# The idea is to make this a double script, running from init-ltsp
2246-# and also be installed to the initramfs using either dracut or
2247-# initramfs-tools.
2248-
2249-#set -x
2250-
2251-[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
2252-
2253-# On by default
2254-OVERLAY=${OVERLAY:-Y}
2255-
2256-if [ -f /.inside-cow ]; then
2257- # Already inside copy-on-write filesystem
2258- return
2259-fi
2260-
2261-if [ ! $OVERLAY ]; then
2262- # Someone doesnt love me
2263- return
2264-fi
2265-
2266-
2267-
2268-# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
2269-OVERLAYFS=${OVERLAYFS:-unionfs}
2270-
2271-panic() { echo "Error: $@"; exit 1; }
2272-
2273-
2274-# Try to give us some tmp space in userland
2275-test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
2276-
2277-[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
2278-[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
2279-[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
2280-[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
2281-
2282-if modprobe -q overlayfs; then
2283- # For kernel overlays
2284- if [ "$DETECT_MODULE_INCOMPLETE" ]; then
2285- UNION_TYPE=overlayfs
2286- UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
2287- fi
2288-elif modprobe -q fuse; then
2289- # For fuse overlays
2290- FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
2291- if [ "$INSIDE_DRACUT" ]; then
2292- . /tmp/root.info
2293- [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
2294- CHROOT_PATH="/tmp/unionfs"
2295- UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
2296- NEWROOT=${NEWROOT:-/sysroot}
2297- OLDROOT="$NEWROOT"
2298- mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
2299- mount -t tmpfs tmpfs $CHROOT_PATH/cow
2300- mount --move /sysroot /tmp/sysroot
2301- mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
2302- unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
2303- echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
2304- [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
2305- cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
2306- elif [ "$INSIDE_INITRAMFS" ]; then
2307- # This is for initramfs-tools that include the fuse module.
2308- # it is incomplete but should be similar to above, just set
2309- # NEWROOT to where it mounts the nfsroot
2310- NEWROOT="${rootmnt}"
2311- . /tmp/root.info
2312- [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
2313- CHROOT_PATH="/tmp/unionfs"
2314- UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
2315- NEWROOT=${NEWROOT:-/sysroot}
2316- OLDROOT="$NEWROOT"
2317- mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
2318- mount -t tmpfs tmpfs $CHROOT_PATH/cow
2319- mount --move /sysroot /tmp/sysroot
2320- mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
2321- unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
2322- echo inside-cow-initramfs > /sysroot/.inside-cow
2323- [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
2324- cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
2325- elif [ "$INSIDE_LTSP_INIT" ]; then
2326- CHROOT_PATH="/tmp/unionfs"
2327- UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
2328- UBIN=/usr/bin/unionfs
2329- mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
2330- [ -e "/proc/cmdline" ] || mount -t proc proc /proc
2331- mount -t tmpfs tmpfs $CHROOT_PATH/cow
2332- mount --bind / $CHROOT_PATH/rofs
2333- $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
2334- mount -t proc proc /tmp/union/proc
2335- echo inside-cow-ltsp-init > /tmp/union/.inside-cow
2336- cd /tmp/union
2337- mkdir oldroot
2338- pivot_root . oldroot
2339- init q
2340- fi
2341-fi
2342
2343=== removed file 'client/Redhat/share/ltsp/init-ltsp.d/09-hostname'
2344--- client/Redhat/share/ltsp/init-ltsp.d/09-hostname 2013-02-27 08:22:30 +0000
2345+++ client/Redhat/share/ltsp/init-ltsp.d/09-hostname 1970-01-01 00:00:00 +0000
2346@@ -1,33 +0,0 @@
2347-if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
2348- HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
2349- case "$HOSTNAME_EXTRA" in
2350- mac)
2351- HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
2352- ;;
2353- ip|"")
2354- HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
2355- ;;
2356- esac
2357- HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
2358-fi
2359-
2360-hostname "$HOSTNAME"
2361-echo "$HOSTNAME" > /etc/hostname
2362-
2363-cat <<EOF > /etc/hosts
2364-127.0.0.1 localhost
2365-127.0.0.2 $HOSTNAME
2366-$SERVER server
2367-
2368-# The following lines are desirable for IPv6 capable hosts
2369-::1 ip6-localhost ip6-loopback
2370-fe00::0 ip6-localnet
2371-ff00::0 ip6-mcastprefix
2372-ff02::1 ip6-allnodes
2373-ff02::2 ip6-allrouters
2374-EOF
2375-
2376-if [ -f /etc/hosts.ltsp ]; then
2377- cat /etc/hosts.ltsp >> /etc/hosts
2378-fi
2379-env | sed -n '/^HOSTS_[0-9][0-9]=/s///p' >> /etc/hosts
2380
2381=== removed file 'client/Redhat/share/ltsp/ltsp-client-launch'
2382--- client/Redhat/share/ltsp/ltsp-client-launch 2013-02-27 08:22:30 +0000
2383+++ client/Redhat/share/ltsp/ltsp-client-launch 1970-01-01 00:00:00 +0000
2384@@ -1,91 +0,0 @@
2385-#!/bin/bash
2386-#
2387-# ltsp-client-launch LTSP Client Launcher
2388-#
2389-# description: This launches the LTSP clients defined in /etc/lts.conf
2390-# along with sound server and other configured devices.
2391-#
2392-
2393-# Gracefully exit if ltsp_chroot file is not present
2394-test -f /etc/ltsp_chroot || exit 0
2395-
2396-# Make sure LANG is set
2397-if [ -z "$LANG" ]
2398-then
2399- if [ -f /etc/sysconfig/i18n ]
2400- then
2401- . /etc/sysconfig/i18n
2402- export LANG
2403- fi
2404-fi
2405-
2406-if [ -z "$LC_MESSAGES" ]
2407-then
2408- if [ -z "$LC_ALL" ]
2409- then
2410- LC_MESSAGES=$LANG
2411- export LC_MESSAGES
2412- fi
2413-fi
2414-
2415-# Grab lts.conf from the same IP address as the mount server.
2416-# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
2417-
2418-# check for NBD devices
2419-NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
2420-if [ -n "$NBD_DEVICES" ]; then
2421- for DEVICE in $NBD_DEVICES ; do
2422- SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
2423- test -n "$SERVER" && break
2424- done
2425-else
2426- # check for NFS root
2427- SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
2428-fi
2429-
2430-SERVER="${SERVER:-172.31.100.254}"
2431-export SERVER
2432-
2433-ARCH=$(uname -m)
2434-[ "$ARCH" = "i586" ] && ARCH=i386
2435-[ "$ARCH" = "i686" ] && ARCH=i386
2436-TFTPPATH="/ltsp/$ARCH/lts.conf"
2437-
2438-# Attempt to get lts.conf via tftp
2439-cd /var/run
2440-(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
2441-if [ -s ./lts.conf ];then
2442- cp ./lts.conf /etc/lts.conf
2443-fi
2444-cd - > /dev/null
2445-
2446-# Source function libraries.
2447-. /usr/share/ltsp/ltsp-init-common
2448-
2449-teardown() {
2450- killall -g screen_session pulseaudio ldm ltspfsd
2451-}
2452-trap "teardown" TERM
2453-
2454-# Start Screen Sessions defined in /etc/lts.conf
2455-for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
2456-eval num=\$SCREEN_$screen
2457-if [ -n "$num" ]; then
2458- /usr/share/ltsp/screen_session "$screen" &
2459-fi
2460-done
2461-
2462-# TODO: Move these into service ltsp-client-setup
2463-configure_localdev
2464-configure_swap
2465-configure_serial_mouse
2466-configure_printer
2467-
2468-# /dev/dsp must be owned by pulse
2469-chown pulse /dev/dsp
2470-start_sound
2471-configure_sound_volume
2472-
2473-while :; do
2474- sleep 365d
2475-done
2476
2477=== removed file 'client/Redhat/share/ltsp/ltsp-client-vendor-functions'
2478--- client/Redhat/share/ltsp/ltsp-client-vendor-functions 2013-02-27 08:22:30 +0000
2479+++ client/Redhat/share/ltsp/ltsp-client-vendor-functions 1970-01-01 00:00:00 +0000
2480@@ -1,108 +0,0 @@
2481-# Fedora-specific function overrides for the common functions
2482-
2483-detect_arch() {
2484- echo $(uname -m | sed -e s/i.86/i386/)
2485-}
2486-
2487-if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost.localdomain" ] || [ "$HOSTNAME" = "localhost" ]; then
2488- HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
2489- IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
2490- IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
2491- case "$HOSTNAME_EXTRA" in
2492- mac)
2493- HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
2494- ;;
2495- ip|"")
2496- HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
2497- ;;
2498- esac
2499- HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
2500-fi
2501-
2502-# Taken from dracut lib
2503-# returns OK if $1 contains $2
2504-strstr() {
2505- [ "${1#*$2*}" != "$1" ]
2506-}
2507-
2508-getarg() {
2509- set +x
2510- local o line
2511- if [ -z "$CMDLINE" ]; then
2512- if [ -e /etc/cmdline ]; then
2513- while read line; do
2514- CMDLINE_ETC="$CMDLINE_ETC $line";
2515- done </etc/cmdline;
2516- fi
2517- read CMDLINE </proc/cmdline;
2518- CMDLINE="$CMDLINE $CMDLINE_ETC"
2519- fi
2520- for o in $CMDLINE; do
2521- [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
2522- [ "${o%%=*}" = "${1%=}" ] && { echo ${o#*=}; [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
2523- done
2524- [ "$RDDEBUG" = "yes" ] && set -x
2525- return 1
2526-}
2527-
2528-getargs() {
2529- set +x
2530- local o line found
2531- if [ -z "$CMDLINE" ]; then
2532- if [ -e /etc/cmdline ]; then
2533- while read line; do
2534- CMDLINE_ETC="$CMDLINE_ETC $line";
2535- done </etc/cmdline;
2536- fi
2537- read CMDLINE </proc/cmdline;
2538- CMDLINE="$CMDLINE $CMDLINE_ETC"
2539- fi
2540- for o in $CMDLINE; do
2541- [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
2542- if [ "${o%%=*}" = "${1%=}" ]; then
2543- echo -n "${o#*=} ";
2544- found=1;
2545- fi
2546- done
2547- [ -n "$found" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
2548- [ "$RDDEBUG" = "yes" ] && set -x
2549- return 1;
2550-}
2551-
2552-nfsroot_to_var() {
2553- # strip nfs[4]:
2554- local arg="$@:"
2555- nfs="${arg%%:*}"
2556- arg="${arg##$nfs:}"
2557-
2558- # check if we have a server
2559- if strstr "$arg" ':/*' ; then
2560- server="${arg%%:/*}"
2561- arg="/${arg##*:/}"
2562- fi
2563-
2564- path="${arg%%:*}"
2565-
2566- # rest are options
2567- options="${arg##$path}"
2568- # strip leading ":"
2569- options="${options##:}"
2570- # strip ":"
2571- options="${options%%:}"
2572-
2573- # Does it really start with '/'?
2574- [ -n "${path%%/*}" ] && path="error";
2575-
2576- #Fix kernel legacy style separating path and options with ','
2577- if [ "$path" != "${path#*,}" ] ; then
2578- options=${path#*,}
2579- path=${path%%,*}
2580- fi
2581-}
2582-
2583-[ -z "$root" ] && root=$(getarg root=)
2584-[ -z "$netroot" ] && netroot=$(getarg netroot=)
2585-[ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
2586-[ -z "$nbdroot" ] && nbdroot=$(getarg nbdroot=)
2587-
2588-
2589
2590=== removed directory 'client/Redhat/template'
2591=== removed file 'client/Redhat/template/20-xinitrc-badprocs.sh'
2592--- client/Redhat/template/20-xinitrc-badprocs.sh 2013-02-27 08:22:30 +0000
2593+++ client/Redhat/template/20-xinitrc-badprocs.sh 1970-01-01 00:00:00 +0000
2594@@ -1,6 +0,0 @@
2595-PATTERN="(vmtoolsd.*vmusr|vmware-user)"
2596-
2597-# Signal all running instances of the user daemon.
2598-# Our pattern ensures that we won't touch the system daemon.
2599- pkill -$1 -f "$PATTERN"
2600- return 0
2601
2602=== removed file 'client/Redhat/template/clover.png'
2603Binary files client/Redhat/template/clover.png 2013-02-27 08:22:30 +0000 and client/Redhat/template/clover.png 1970-01-01 00:00:00 +0000 differ
2604=== removed file 'client/Redhat/template/plymouth-default-boot-duration'
2605--- client/Redhat/template/plymouth-default-boot-duration 2013-02-27 08:22:30 +0000
2606+++ client/Redhat/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
2607@@ -1,11 +0,0 @@
2608-0.788:RCkernelparam
2609-0.789:RChostname
2610-0.867:RCmountfs
2611-0.876:RCswap
2612-0.888:portreserve
2613-0.895:rsyslog
2614-0.901:nfslock
2615-0.928:messagebus
2616-0.937:haldaemon
2617-0.990:udev-post
2618-0.996:local
2619
2620=== removed file 'client/Redhat/template/sl-other.repo'
2621--- client/Redhat/template/sl-other.repo 2013-02-27 08:22:30 +0000
2622+++ client/Redhat/template/sl-other.repo 1970-01-01 00:00:00 +0000
2623@@ -1,42 +0,0 @@
2624-[sl-fastbugs]
2625-name=Scientific Linux $releasever - $basearch - fastbug updates
2626-baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2627- http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2628- http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2629- ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2630-#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
2631-enabled=1
2632-gpgcheck=1
2633-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2634-
2635-[sl-debuginfo]
2636-name=Scientific Linux Debuginfo
2637-baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2638- http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2639- http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2640- ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2641-enabled=0
2642-gpgcheck=1
2643-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2644-
2645-
2646-[sl-testing]
2647-name=Scientific Linux Testing - $basearch
2648-baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2649- http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2650- http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2651- ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2652-enabled=0
2653-gpgcheck=0
2654-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2655-
2656-[sl-testing-source]
2657-name=Scientific Linux Testing - Source
2658-baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2659- http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2660- http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2661- ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2662-enabled=0
2663-gpgcheck=0
2664-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2665-
2666
2667=== removed directory 'client/k12linux'
2668=== removed directory 'client/k12linux/chroot-setup'
2669=== removed file 'client/k12linux/chroot-setup/README'
2670--- client/k12linux/chroot-setup/README 2008-07-16 20:21:36 +0000
2671+++ client/k12linux/chroot-setup/README 1970-01-01 00:00:00 +0000
2672@@ -1,1 +0,0 @@
2673-This directory contains scriptlets that run in numerical order in %post of ltsp-client.
2674
2675=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup'
2676--- client/k12linux/chroot-setup/ltsp-chroot-setup 2008-07-16 20:21:36 +0000
2677+++ client/k12linux/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
2678@@ -1,11 +0,0 @@
2679-#!/bin/sh
2680-
2681-# Exit immediately if this is not a LTSP client chroot.
2682-[ ! -e /etc/ltsp_chroot ] && exit 0
2683-
2684-for i in /usr/share/ltsp/chroot-setup.d/* ; do
2685- [ -d $i ] && continue
2686- if [ -x $i ]; then
2687- $i
2688- fi
2689-done
2690
2691=== removed directory 'client/k12linux/chroot-setup/ltsp-chroot-setup.d'
2692=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/000-pre-mount-proc'
2693--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/000-pre-mount-proc 2011-08-12 04:42:11 +0000
2694+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
2695@@ -1,3 +0,0 @@
2696-#!/bin/sh
2697-
2698-mount /proc 2> /dev/null ||:
2699
2700=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-cleanup-consoles'
2701--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-cleanup-consoles 2011-05-23 07:03:26 +0000
2702+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-cleanup-consoles 1970-01-01 00:00:00 +0000
2703@@ -1,15 +0,0 @@
2704-#!/bin/sh
2705-
2706-### Set Runlevel 5 and turn off the mingetty's
2707-# Fedora 8 and previous, and RHEL5
2708-[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
2709-# Fedora 9+ with Upstart
2710-if [ -e /etc/event.d/tty1 ]; then
2711- for NUM in 1 2 3 4 5 6; do
2712- echo > /etc/event.d/tty$NUM
2713- done
2714-fi
2715-# Fedora 13+ and EL6 with Upstart
2716-if [ -e /etc/init/start-ttys.conf ]; then
2717- echo > /etc/init/start-ttys.conf
2718-fi
2719
2720=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-etc-hosts'
2721--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-etc-hosts 2008-10-30 21:08:51 +0000
2722+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-etc-hosts 1970-01-01 00:00:00 +0000
2723@@ -1,23 +0,0 @@
2724-#!/bin/sh
2725-
2726-cat <<EOF > /dev/hosts
2727-#This is a ltsp chroot and this file will be rewritten in boot process
2728-#of terminal.
2729-127.0.0.1 localhost
2730-EOF
2731-
2732-rm -f /etc/hosts
2733-ln -s ../dev/hosts /etc/hosts
2734-
2735-cat <<EOF > /etc/sysconfig/network
2736-NETWORKING=yes
2737-NETWORKING_IPV6=no
2738-HOSTNAME=localhost.localdomain
2739-/bin/grep -q "Generated by ltsp-client" /etc/hosts 2> /dev/null
2740-if [ \$? -ne 0 ]; then
2741- ipaddr=\$(ip addr show scope global | awk '/[[:space:]]inet / { print gensub("/.*","","g",\$2) }')
2742- echo "# Generated by ltsp-client during bootup" >> /etc/hosts
2743- echo "127.0.0.1 localhost" >> /etc/hosts
2744- echo "\$ipaddr client-\$ipaddr" >> /etc/hosts
2745-fi
2746-EOF
2747
2748=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/030-configure-client'
2749--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/030-configure-client 2011-08-10 13:40:48 +0000
2750+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
2751@@ -1,61 +0,0 @@
2752-#!/bin/sh
2753-
2754-# Disable services we don't want
2755-for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
2756- iscsi iscsid kudzu lvm2-monitor mcstrans mdmonitor netfs network nfs \
2757- pcscd rpcbind rpcgssd rpcidmapd rpcsvcgssd; do
2758- if [ ! -e /etc/init.d/$service ]; then
2759- continue
2760- fi
2761- #echo "Disabling Service: $service"
2762- /sbin/chkconfig $service off
2763-done
2764-
2765-# Enable services we do want
2766-for service in haldaemon messagebus rsyslog udev-post; do
2767- if [ ! -e /etc/init.d/$service ]; then
2768- continue
2769- fi
2770- #echo "Enabling Service: $service"
2771- /sbin/chkconfig $service on
2772-done
2773-
2774-# Setup readonly-root Mode
2775-sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
2776-
2777-# Set ltsp-launch-client as DM
2778-echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
2779-
2780-# Link /etc/mtab to /proc/mounts
2781-# This is not perfect, but it enables fuse mounts to work.
2782-rm -f /etc/mtab
2783-ln -sf ../proc/mounts /etc/mtab
2784-
2785-# Blacklist pcspkr
2786-/bin/grep -q "blacklist pcspkr" /etc/modprobe.d/blacklist-pcspkr.conf 2> /dev/null
2787-if [ $? -ne 0 ]; then
2788- echo "blacklist pcspkr" >> /etc/modprobe.d/blacklist-pcspkr.conf
2789-fi
2790-
2791-# Files to silence warning messages
2792-touch /etc/alsa/asound.state
2793-touch /etc/asound.state
2794-
2795-# Silence /etc/mtab rwtab error message during bootup
2796-sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
2797-
2798-# Silence /etc/mtab* removal errors
2799-sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
2800-
2801-# Silence local filesystems mount errors during bootup
2802-sed -i '/^sysfs/d' /etc/fstab
2803-
2804-# F10+: install default boot-duration so plymouth can guess the startup progress bar better
2805-if [ -e /var/lib/plymouth/boot-duration ]; then
2806- cp /usr/share/ltsp/template/plymouth-default-boot-duration /var/lib/plymouth/boot-duration
2807-fi
2808-
2809-# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
2810-sed -i 's/^action $"Sending all processes/#action $"Sending all processes/' /etc/init.d/halt
2811-sed -i 's/^sleep 2/#sleep 2/' /etc/init.d/halt
2812-sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
2813
2814=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/085-sl6-fastbugs-yum-config'
2815--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/085-sl6-fastbugs-yum-config 2011-08-10 09:42:25 +0000
2816+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
2817@@ -1,7 +0,0 @@
2818-#!/bin/sh
2819-
2820-# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
2821-# Not needed for CentOS 6
2822-if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
2823- cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
2824-fi
2825
2826=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/090-post-umount-proc'
2827--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/090-post-umount-proc 2011-08-12 04:42:11 +0000
2828+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
2829@@ -1,3 +0,0 @@
2830-#!/bin/sh
2831-
2832-umount /proc 2> /dev/null ||:
2833
2834=== removed directory 'client/k12linux/rwtab.d'
2835=== removed file 'client/k12linux/rwtab.d/k12linux.rwtab'
2836--- client/k12linux/rwtab.d/k12linux.rwtab 2009-08-05 19:34:47 +0000
2837+++ client/k12linux/rwtab.d/k12linux.rwtab 1970-01-01 00:00:00 +0000
2838@@ -1,27 +0,0 @@
2839-# Already in F12 /etc/rwtab
2840-empty /var/log/ConsoleKit/
2841-empty /var/lib/dbus/
2842-empty /var/cache/hald/
2843-empty /var/lib/pulse/
2844-files /.viminfo
2845-files /etc/alsa/asound.state
2846-# Already in F11 /etc/rwtab
2847-dirs /var/lib/xkb/
2848-
2849-# BUG: Directories that need to be writable but contain files we don't want to disappear
2850-# (Although somehow this wasn't harmful to LTSP in the past?)
2851-dirs /etc/udev/rules.d/
2852-
2853-# LTSP specific
2854-dirs /var/cache/ldm/
2855-dirs /home
2856-empty /var/cache/ltsp-localapps/
2857-empty /root
2858-files /etc/lts.conf
2859-files /etc/X11/xorg.conf
2860-files /etc/passwd
2861-files /etc/group
2862-files /etc/localtime
2863-files /etc/cups/client.conf
2864-# Old versions of Fedora only
2865-files /etc/asound.state
2866
2867=== removed directory 'client/k12linux/scripts'
2868=== removed file 'client/k12linux/scripts/ltsp-rewrap-latest-kernel'
2869--- client/k12linux/scripts/ltsp-rewrap-latest-kernel 2011-08-12 06:17:12 +0000
2870+++ client/k12linux/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
2871@@ -1,8 +0,0 @@
2872-#!/bin/bash
2873-# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
2874-
2875-NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
2876-unset DRACUTARG
2877-[ -x /sbin/dracut ] && DRACUTARG=--dracut
2878-/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
2879-/sbin/new-kernel-pkg --rpmposttrans $NAME
2880
2881=== removed directory 'client/k12linux/template'
2882=== removed file 'client/k12linux/template/plymouth-default-boot-duration'
2883--- client/k12linux/template/plymouth-default-boot-duration 2011-08-10 13:38:12 +0000
2884+++ client/k12linux/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
2885@@ -1,11 +0,0 @@
2886-0.788:RCkernelparam
2887-0.789:RChostname
2888-0.867:RCmountfs
2889-0.876:RCswap
2890-0.888:portreserve
2891-0.895:rsyslog
2892-0.901:nfslock
2893-0.928:messagebus
2894-0.937:haldaemon
2895-0.990:udev-post
2896-0.996:local
2897
2898=== removed file 'client/k12linux/template/sl-other.repo'
2899--- client/k12linux/template/sl-other.repo 2011-08-10 09:42:25 +0000
2900+++ client/k12linux/template/sl-other.repo 1970-01-01 00:00:00 +0000
2901@@ -1,42 +0,0 @@
2902-[sl-fastbugs]
2903-name=Scientific Linux $releasever - $basearch - fastbug updates
2904-baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2905- http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2906- http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2907- ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
2908-#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
2909-enabled=1
2910-gpgcheck=1
2911-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2912-
2913-[sl-debuginfo]
2914-name=Scientific Linux Debuginfo
2915-baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2916- http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2917- http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2918- ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
2919-enabled=0
2920-gpgcheck=1
2921-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2922-
2923-
2924-[sl-testing]
2925-name=Scientific Linux Testing - $basearch
2926-baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2927- http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2928- http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2929- ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
2930-enabled=0
2931-gpgcheck=0
2932-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2933-
2934-[sl-testing-source]
2935-name=Scientific Linux Testing - Source
2936-baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2937- http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2938- http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2939- ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
2940-enabled=0
2941-gpgcheck=0
2942-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
2943-
2944
2945=== added file 'client/share/ltsp/background.png'
2946Binary files client/share/ltsp/background.png 1970-01-01 00:00:00 +0000 and client/share/ltsp/background.png 2013-07-22 07:06:30 +0000 differ
2947=== added file 'client/share/ltsp/background.svg'
2948--- client/share/ltsp/background.svg 1970-01-01 00:00:00 +0000
2949+++ client/share/ltsp/background.svg 2013-07-22 07:06:30 +0000
2950@@ -0,0 +1,447 @@
2951+<?xml version="1.0" standalone="no"?>
2952+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
2953+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
2954+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
2955+ width="640.000000pt" height="480.000000pt" viewBox="0 0 640.000000 480.000000"
2956+ preserveAspectRatio="xMidYMid meet">
2957+<metadata>
2958+Created by potrace 1.11, written by Peter Selinger 2001-2013
2959+</metadata>
2960+<g transform="translate(0.000000,480.000000) scale(0.100000,-0.100000)"
2961+fill="#000000" stroke="none">
2962+<path d="M0 3645 c0 -806 3 -1155 11 -1155 6 0 7 -5 2 -12 -12 -19 -10 -58 2
2963+-58 7 0 18 -12 26 -28 8 -15 18 -30 23 -34 6 -4 4 -13 -3 -22 -8 -9 -10 -16
2964+-5 -16 5 -1 -6 -7 -23 -15 -25 -11 -33 -20 -33 -40 0 -25 23 -35 35 -15 4 6
2965+10 8 15 5 5 -3 12 5 16 17 7 22 111 128 126 128 4 0 18 4 31 9 23 9 24 13 17
2966+46 -7 30 -5 39 13 56 27 25 33 10 13 -29 -15 -29 -15 -30 14 -42 23 -10 33
2967+-10 44 0 10 8 21 8 32 2 12 -7 28 -3 57 14 30 17 45 20 59 13 28 -15 58 10 58
2968+48 0 37 14 48 52 44 20 -2 28 2 28 13 0 9 -7 16 -15 16 -8 0 -15 6 -15 14 0 9
2969+16 17 43 21 100 15 103 16 82 32 -20 14 -69 10 -92 -9 -6 -5 -27 -8 -45 -6
2970+-30 3 -33 6 -36 38 -2 29 3 41 28 63 36 33 39 57 7 57 -25 0 -57 -28 -57 -48
2971+0 -7 -4 -12 -8 -12 -5 0 -23 -13 -40 -28 -31 -28 -44 -72 -21 -72 6 0 17 -6
2972+24 -14 12 -11 10 -15 -11 -26 -15 -8 -28 -28 -34 -52 -6 -21 -17 -38 -24 -38
2973+-8 0 -19 -7 -26 -15 -17 -21 -30 -19 -30 4 0 11 -4 22 -9 26 -5 3 -12 19 -16
2974+36 -6 25 -10 29 -28 23 -12 -3 -29 -13 -38 -20 -8 -8 -26 -14 -38 -14 -20 0
2975+-22 4 -16 33 5 25 4 29 -5 17 -10 -13 -11 -12 -6 3 3 10 6 25 6 32 0 7 16 21
2976+37 30 20 10 81 62 136 117 98 97 102 100 148 102 37 1 45 4 37 14 -15 17 56
2977+16 180 -3 124 -20 182 -36 182 -52 0 -10 -22 -13 -82 -14 -46 0 -76 -3 -68 -6
2978+8 -4 23 -17 33 -30 18 -23 67 -32 67 -13 0 6 -5 10 -12 10 -6 0 -9 3 -5 6 3 4
2979+20 2 36 -4 29 -10 56 1 29 11 -22 8 22 34 48 29 28 -5 30 0 8 33 -15 23 -15
2980+25 0 25 9 0 19 -7 22 -15 8 -20 32 -19 83 6 25 12 50 17 59 13 10 -4 22 -6 27
2981+-4 53 15 75 16 78 6 3 -8 8 -8 18 2 9 9 10 12 1 12 -7 0 -12 5 -12 10 0 6 11
2982+8 26 4 17 -4 29 -2 35 7 7 11 9 11 9 -2 0 -11 15 -21 43 -28 23 -7 49 -15 57
2983+-18 13 -5 13 -4 1 10 -7 10 -19 17 -25 17 -18 0 -56 43 -56 63 0 25 37 21 66
2984+-8 20 -20 26 -22 30 -10 4 10 11 12 21 7 8 -5 27 -6 44 -4 24 3 27 7 18 18 -9
2985+11 -6 14 15 14 16 0 26 5 26 15 0 12 13 15 59 15 39 0 61 4 64 13 3 9 7 9 18
2986+0 8 -6 32 -15 54 -19 22 -4 59 -15 83 -25 34 -15 42 -23 38 -37 -6 -16 0 -19
2987+42 -20 29 0 64 -9 86 -21 20 -12 47 -21 59 -21 21 0 96 -35 107 -49 9 -13 78
2988+-41 98 -41 12 0 24 -4 27 -10 3 -5 13 -10 22 -10 28 0 190 -147 263 -239 14
2989+-17 28 -31 32 -31 5 0 8 101 8 223 0 204 2 225 18 240 17 15 56 17 358 17 281
2990+0 344 -3 368 -15 15 -8 30 -15 31 -15 8 0 -10 46 -22 58 -7 7 -13 22 -13 33 0
2991+10 -4 19 -10 19 -5 0 -10 11 -10 25 0 14 -5 25 -10 25 -12 0 -8 91 4 125 26
2992+67 79 165 91 165 7 0 26 6 42 14 46 23 97 36 139 36 55 0 155 -25 165 -41 6
2993+-11 13 -11 26 -3 11 6 32 7 52 3 32 -7 67 3 82 24 3 5 9 -1 12 -13 5 -21 6
2994+-21 37 -5 30 15 33 15 51 0 21 -20 49 -14 49 10 0 8 9 15 20 15 13 0 20 -7 20
2995+-20 0 -14 -5 -18 -17 -13 -10 4 -1 -9 18 -28 20 -19 38 -41 42 -49 4 -12 6
2996+-12 6 2 1 10 9 16 19 15 14 -1 17 -7 13 -31 -2 -17 -6 -25 -8 -18 -9 23 -23
2997+12 -23 -18 0 -23 4 -30 16 -28 11 2 18 -5 19 -19 1 -16 -4 -23 -17 -23 -14 0
2998+-18 -8 -18 -35 0 -33 12 -46 24 -26 3 5 20 11 38 14 18 3 57 12 86 19 51 13
2999+52 14 32 31 -25 21 -25 34 0 42 26 8 40 -1 40 -26 0 -12 7 -19 19 -19 11 0 18
3000+6 17 16 0 9 7 21 17 28 15 9 21 7 36 -12 l17 -24 17 26 c20 30 30 32 51 11 16
3001+-17 33 -19 38 -6 3 8 150 20 257 21 30 0 52 3 48 6 -3 4 -55 7 -114 8 l-108 1
3002+-3 28 c-2 15 -7 25 -12 22 -4 -3 -6 -14 -3 -24 6 -24 -9 -33 -42 -25 -19 5
3003+-25 12 -25 35 0 28 2 29 53 30 28 1 67 0 84 -1 18 -1 43 6 55 15 l23 17 -28
3004+-5 c-20 -3 -27 0 -27 12 -1 15 -1 15 -10 0 -10 -18 -58 -15 -73 5 -5 7 -6 3
3005+-3 -8 5 -15 2 -17 -16 -12 -13 3 -31 6 -40 6 -14 0 -18 8 -18 35 0 34 2 35 36
3006+35 28 0 35 -3 31 -15 -4 -8 -2 -17 3 -20 6 -4 9 19 8 57 -1 42 -3 50 -5 26 -4
3007+-41 -12 -45 -43 -25 -17 10 -22 9 -30 -3 -5 -8 -10 -10 -10 -4 0 7 -26 12 -72
3008+12 -40 0 -79 1 -86 1 -9 1 -12 12 -10 34 3 32 3 32 51 29 26 -2 47 0 47 6 0 5
3009+11 9 25 8 14 0 25 -5 25 -9 0 -5 6 -5 13 0 6 4 20 6 30 5 9 -2 17 2 17 7 0 7
3010+-25 11 -64 11 -61 0 -63 1 -64 25 0 14 4 28 8 30 5 3 6 14 3 25 -6 21 -28 27
3011+-38 11 -3 -6 -16 -6 -34 0 -23 8 -27 14 -23 37 2 15 10 33 16 41 8 11 8 15 -2
3012+18 -6 3 -12 20 -12 39 0 28 4 34 22 34 26 0 16 13 -12 15 -14 1 -20 -7 -25
3013+-36 -4 -21 -4 -42 -2 -46 3 -4 -7 -9 -21 -10 -25 -1 -72 30 -72 48 0 8 34 21
3014+60 24 8 0 15 5 15 10 0 11 -11 11 -39 -1 -16 -6 -18 -4 -13 10 6 14 3 17 -9
3015+12 -8 -3 -18 -6 -20 -6 -2 0 -4 -20 -4 -44 0 -49 -19 -66 -46 -39 -15 16 -17
3016+16 -29 0 -7 -9 -15 -17 -19 -17 -4 0 -15 -7 -23 -16 -13 -12 -13 -15 -2 -14
3017+30 5 39 -1 39 -25 0 -21 -5 -25 -29 -25 -33 0 -54 19 -42 39 12 19 -28 62 -54
3018+59 -15 -2 -20 3 -20 22 0 18 6 26 23 28 12 2 22 10 22 18 0 13 -13 19 -33 15
3019+-5 -1 -11 8 -14 19 -3 11 -14 20 -24 20 -12 0 -16 -5 -13 -14 3 -8 1 -16 -4
3020+-20 -14 -9 -52 5 -52 20 0 8 -9 14 -20 14 -13 0 -18 -5 -14 -15 5 -11 -1 -15
3021+-20 -15 -16 0 -26 6 -26 15 0 9 -10 15 -26 15 -14 0 -23 -4 -19 -10 8 -14 -21
3022+-24 -42 -15 -17 7 -16 8 2 15 14 6 1 9 -41 9 -62 1 -104 23 -104 56 0 8 -9 15
3023+-20 15 -13 0 -20 7 -20 20 0 25 27 27 33 3 4 -14 5 -15 6 -2 2 32 43 39 244
3024+43 108 1 200 6 204 10 3 3 -5 6 -20 6 -17 0 -28 7 -32 20 -9 27 1 40 31 40 15
3025+0 24 6 24 15 0 10 -10 15 -30 15 -28 0 -30 3 -30 35 0 30 3 35 24 35 13 0 33
3026+3 43 6 15 5 15 4 3 -5 -8 -5 -11 -13 -7 -17 4 -4 13 -2 19 4 7 7 22 12 35 12
3027+13 0 23 5 23 11 0 7 -9 9 -21 6 -15 -4 -23 0 -26 14 -4 16 -8 17 -20 7 -8 -6
3028+-45 -12 -84 -12 -68 -1 -76 3 -70 37 3 17 -21 5 -26 -13 -3 -11 -12 -20 -20
3029+-20 -18 0 -73 -56 -73 -75 0 -8 -8 -15 -17 -15 -29 0 -73 -44 -73 -74 0 -19
3030+-5 -25 -17 -23 -45 7 -52 43 -11 49 20 3 20 3 1 28 -20 25 -21 44 -8 88 5 14
3031+3 22 -4 22 -6 0 -11 6 -11 14 0 8 -4 17 -9 20 -14 9 -41 -4 -41 -20 0 -8 -9
3032+-14 -20 -14 -13 0 -20 7 -20 20 0 12 -7 20 -16 20 -9 0 -18 -9 -21 -20 -3 -13
3033+-14 -20 -29 -20 -16 0 -22 4 -18 14 6 16 -19 28 -41 20 -8 -4 -15 -12 -15 -20
3034+0 -8 -7 -14 -16 -14 -10 0 -14 6 -10 15 6 18 10 17 -79 19 -80 1 -95 8 -95 42
3035+0 13 -4 24 -9 24 -6 0 -6 11 0 29 15 43 43 47 354 50 77 1 96 4 87 13 -17 17
3036+-15 48 3 48 8 0 15 4 15 9 0 5 -7 16 -15 25 -8 8 -15 21 -15 30 0 20 29 48 42
3037+40 6 -4 34 -6 63 -5 51 1 54 0 58 -27 l4 -27 2 28 c1 22 6 27 26 27 16 0 25 6
3038+25 15 0 11 -7 14 -25 9 -23 -6 -25 -3 -25 28 0 19 6 40 13 47 10 11 10 14 0
3039+18 -16 6 -17 73 -2 73 5 0 7 5 4 10 -15 24 -27 -6 -23 -56 3 -29 2 -51 -2 -49
3040+-3 2 -4 -11 -2 -30 4 -38 -8 -50 -44 -41 -21 6 -25 12 -22 39 2 24 8 33 26 35
3041+30 5 28 22 -3 22 -22 0 -25 4 -25 35 0 25 -4 35 -15 35 -9 0 -15 -6 -14 -12 5
3042+-42 -2 -56 -30 -60 -33 -5 -41 9 -31 52 4 18 12 25 29 25 13 0 27 7 29 15 4
3043+12 2 13 -9 3 -9 -8 -20 -9 -29 -3 -9 6 -769 10 -1867 10 l-1853 0 0 -1155z
3044+m2629 467 c61 -59 111 -111 111 -117 0 -5 -22 -30 -49 -55 -28 -25 -82 -76
3045+-121 -113 -87 -84 -98 -81 -102 31 l-3 77 -220 5 -220 5 -3 45 c-3 33 1 47 14
3046+57 27 20 40 15 16 -6 -15 -12 -22 -30 -22 -55 l0 -36 225 0 225 0 0 -80 c0
3047+-70 2 -80 18 -80 10 0 64 46 121 101 l103 102 -111 110 c-127 126 -131 126
3048+-131 11 l0 -72 -55 -1 c-67 0 -74 17 -7 21 l47 3 1 63 c3 125 21 123 163 -16z
3049+m-1141 -220 c105 -103 192 -193 192 -200 0 -7 -43 -54 -96 -105 -53 -51 -141
3050+-136 -196 -189 -144 -141 -161 -135 -166 63 l-4 128 -369 3 c-427 3 -400 -3
3051+-402 100 -2 105 -29 98 402 98 l371 0 0 120 c0 230 14 229 268 -18z m1863 80
3052+c38 -36 69 -72 69 -81 0 -23 -138 -151 -155 -144 -11 3 -15 21 -15 59 l0 54
3053+-145 0 -145 0 0 26 c0 43 17 49 130 48 155 -1 160 0 160 47 0 40 21 90 29 67
3054+2 -6 35 -41 72 -76z m-1140 -329 c17 -10 33 -29 36 -43 3 -14 10 -31 16 -37
3055+14 -19 47 -16 48 5 1 16 2 16 6 0 4 -16 17 -18 99 -18 56 0 94 4 94 10 0 6 5
3056+10 10 10 6 0 10 -7 10 -15 0 -12 -18 -15 -105 -15 -87 0 -105 -3 -105 -15 0
3057+-8 -5 -15 -11 -15 -5 0 -8 4 -4 9 8 14 -12 23 -35 16 -14 -4 -20 -15 -20 -36
3058+0 -16 -4 -29 -9 -29 -5 0 -17 -8 -27 -17 -23 -23 -124 -25 -145 -3 -56 60 -60
3059+125 -10 179 24 26 36 31 76 31 27 0 60 -8 76 -17z m294 -495 c24 -19 25 -23
3060+25 -147 0 -165 4 -161 -153 -164 -82 -2 -120 1 -133 10 -15 11 4 13 118 13
3061+115 0 137 2 142 16 3 9 6 66 6 129 0 82 -4 116 -14 124 -17 14 -246 14 -263
3062+-1 -7 -6 -13 -28 -13 -49 l0 -39 58 -2 57 -1 -55 -6 -55 -6 0 -78 c0 -42 -3
3063+-77 -7 -77 -13 0 -10 288 3 292 7 2 68 4 136 5 108 1 126 -2 148 -19z"/>
3064+<path d="M1260 4055 c-8 -10 -12 -56 -11 -145 l2 -130 -371 0 c-435 0 -420 3
3065+-420 -88 0 -40 5 -58 18 -68 13 -11 97 -13 395 -14 l378 0 -2 -122 c-2 -156
3066+-2 -155 16 -162 11 -4 73 51 200 176 102 100 185 187 185 193 0 6 -79 87 -176
3067+181 -97 93 -183 174 -189 181 -10 10 -16 9 -25 -2z"/>
3068+<path d="M3266 3980 c-3 -23 -4 -45 -1 -50 3 -6 -56 -11 -142 -12 -145 -3
3069+-148 -3 -151 -25 -3 -23 -3 -23 142 -23 l146 0 1 -27 c1 -16 1 -40 1 -55 -1
3070+-33 2 -34 31 -8 12 11 39 34 60 51 20 17 37 37 37 45 0 8 5 14 11 14 7 0 -13
3071+24 -42 53 -87 84 -85 84 -93 37z"/>
3072+<path d="M2088 3633 c-35 -23 -55 -81 -38 -114 26 -49 52 -69 92 -69 29 0 45
3073+7 62 25 27 30 41 87 27 112 -28 54 -96 75 -143 46z"/>
3074+<path d="M3758 4492 c-1 -37 -1 -88 0 -114 2 -46 2 -47 -25 -45 -23 2 -27 7
3075+-25 25 3 18 -2 22 -23 22 -22 0 -24 -3 -16 -19 9 -16 7 -20 -14 -23 -29 -6
3076+-35 -1 -35 24 0 11 -7 18 -20 18 -13 0 -20 -7 -20 -20 0 -15 -7 -20 -26 -20
3077+-21 0 -25 4 -21 20 4 16 0 20 -23 20 -23 0 -27 -4 -23 -20 4 -16 0 -20 -22
3078+-20 -22 0 -26 4 -22 20 4 17 0 20 -29 20 -32 0 -34 -2 -24 -21 10 -18 9 -20
3079+-7 -17 -10 2 -17 12 -17 21 2 14 -5 17 -29 15 -28 -3 -32 -7 -34 -38 l-3 -35
3080+215 3 c244 4 248 3 244 -62 -1 -23 -2 -58 -1 -80 2 -33 4 -37 17 -26 8 7 15
3081+18 15 24 0 11 35 46 46 46 3 0 19 14 36 30 16 17 25 30 20 30 -5 0 -12 6 -15
3082+14 -4 11 1 14 21 13 16 -2 36 6 51 19 22 21 23 23 7 45 l-16 23 0 -26 c0 -14
3083+-6 -28 -12 -31 -20 -7 -58 15 -58 33 0 26 20 41 42 29 28 -15 22 -1 -17 35
3084+-32 30 -34 31 -37 12 -3 -23 -35 -29 -55 -9 -21 19 -16 51 8 55 19 3 18 6 -15
3085+40 l-36 37 -2 -67z"/>
3086+<path d="M4150 4124 c0 -9 11 -14 30 -14 17 0 31 -6 31 -12 1 -7 2 -20 3 -28
3087+1 -20 -24 -30 -46 -18 -15 7 -18 4 -18 -16 0 -23 2 -24 30 -16 30 9 30 8 30
3088+-31 0 -39 -1 -40 -32 -37 -25 2 -34 8 -36 26 -2 12 -8 22 -14 22 -5 0 -8 -6
3089+-5 -14 7 -19 -12 -36 -40 -36 -18 0 -23 6 -23 25 0 18 -5 25 -20 25 -17 0 -19
3090+-4 -14 -27 6 -24 5 -26 -17 -20 -13 4 -27 7 -31 7 -5 0 -8 11 -8 25 0 16 -6
3091+25 -15 25 -9 0 -15 -9 -15 -24 0 -17 -7 -25 -25 -28 -21 -4 -25 -1 -25 17 0
3092+13 -6 25 -14 28 -16 6 -36 -11 -36 -31 0 -8 -9 -12 -22 -10 -15 2 -23 10 -23
3093+23 0 13 -7 20 -20 20 -13 0 -20 -6 -19 -17 2 -26 -32 -23 -39 3 -7 27 -27 15
3094+-27 -16 0 -54 -3 -53 198 -49 103 2 202 6 220 8 18 2 32 -1 32 -6 0 -6 16 -8
3095+35 -6 34 4 35 3 35 -29 0 -30 -3 -33 -30 -33 -22 0 -30 -5 -30 -17 0 -28 74
3096+-23 102 7 l22 23 -21 -5 c-16 -4 -20 -2 -16 8 3 8 0 14 -6 14 -7 0 -7 8 1 25
3097+8 17 14 22 19 14 4 -7 16 -9 27 -6 12 2 23 0 25 -6 2 -6 13 -1 25 11 17 17 18
3098+22 7 22 -8 0 -15 8 -15 18 0 14 -2 15 -10 2 -6 -9 -5 -17 3 -22 6 -4 -2 -5
3099+-18 -3 -17 2 -35 4 -41 4 -20 2 -33 45 -18 59 17 15 56 16 72 0 9 -9 12 -9 12
3100+3 0 18 -37 42 -51 33 -6 -3 -19 2 -30 12 -12 11 -16 20 -9 24 7 4 3 15 -10 30
3101+-23 26 -70 36 -70 14z"/>
3102+<path d="M3746 3347 c-16 -12 -16 -14 -2 -26 9 -8 16 -18 16 -23 0 -5 9 -21
3103+19 -36 33 -47 35 -106 5 -165 -42 -84 -97 -120 -180 -118 -55 1 -131 32 -141
3104+57 -10 28 -24 13 -21 -22 2 -24 10 -41 23 -48 11 -6 27 -19 36 -28 43 -46 200
3105+-13 281 59 22 19 51 84 66 143 15 62 -9 147 -53 190 -27 26 -33 28 -49 17z"/>
3106+<path d="M3934 3346 c-4 -10 -13 -11 -44 -2 -22 5 -42 8 -44 5 -6 -6 25 -94
3107+37 -105 11 -11 8 -121 -3 -144 -5 -11 -15 -30 -21 -41 -12 -24 5 -54 19 -33 6
3108+9 44 28 107 53 113 47 105 39 105 97 0 29 -4 56 -10 59 -5 3 -10 12 -10 18 0
3109+7 4 6 10 -3 7 -11 10 -5 10 23 0 20 -4 37 -10 37 -5 0 -10 6 -10 14 0 19 -39
3110+31 -53 17 -13 -13 -47 -15 -47 -2 0 15 -30 21 -36 7z"/>
3111+<path d="M3576 3321 c-3 -4 -20 -11 -37 -15 -49 -10 -89 -73 -89 -142 0 -43 1
3112+-44 33 -44 33 0 33 0 33 49 -1 69 20 91 91 91 40 0 53 -4 53 -15 0 -8 5 -15
3113+10 -15 6 0 10 18 10 40 0 36 -3 40 -24 40 -14 0 -28 5 -31 10 -8 12 -42 13
3114+-49 1z"/>
3115+<path d="M3710 3192 c0 -96 -10 -104 -133 -103 -78 1 -97 -2 -108 -16 -9 -10
3116+-9 -14 -2 -10 16 10 53 -13 53 -33 0 -13 1 -13 10 0 8 12 13 13 30 3 24 -15
3117+66 -17 75 -3 3 6 15 10 25 10 53 0 103 119 78 186 -19 52 -28 41 -28 -34z"/>
3118+<path d="M4742 3216 c5 -23 3 -23 -26 -13 -17 5 -36 14 -42 18 -6 5 -25 2 -44
3119+-7 -21 -11 -34 -13 -39 -6 -7 12 -160 -3 -196 -18 -11 -5 -29 -11 -40 -13 -18
3120+-4 -18 -5 3 -6 17 -1 22 -7 22 -27 0 -21 -4 -25 -22 -22 -15 2 -24 11 -26 26
3121+-2 12 -9 22 -16 22 -18 0 -35 -21 -29 -36 7 -20 -24 -18 -35 2 -9 16 -13 15
3122+-50 -2 -48 -22 -59 -59 -19 -67 l22 -4 -22 -2 c-13 0 -23 -5 -23 -11 0 -15 66
3123+-12 79 4 7 8 28 16 49 19 20 3 55 10 77 16 22 5 61 15 87 22 35 9 48 17 50 33
3124+4 26 58 37 58 12 0 -9 7 -16 15 -16 8 0 15 9 15 21 0 16 4 19 20 14 14 -5 20
3125+-2 20 9 0 9 4 16 10 16 5 0 7 -6 4 -13 -3 -8 2 -19 10 -26 12 -10 17 -9 25 7
3126+11 21 48 20 64 -2 5 -7 12 -5 21 7 14 18 66 24 66 7 0 -5 5 -10 10 -10 6 0 10
3127+7 10 15 0 11 -11 15 -41 15 -32 0 -42 4 -46 20 -8 28 -26 25 -21 -4z"/>
3128+<path d="M4675 3119 c-130 -14 -220 -30 -229 -39 -7 -7 -4 -10 7 -10 10 0 17
3129+-8 17 -20 0 -15 -7 -20 -25 -20 -18 0 -25 5 -25 20 0 13 -7 20 -20 20 -13 0
3130+-20 -7 -20 -20 0 -15 -7 -20 -26 -20 -14 0 -23 4 -19 10 9 14 -17 12 -67 -4
3131+-24 -8 -57 -17 -74 -21 -31 -6 -32 -8 -33 -60 l0 -53 27 9 c56 18 62 22 63 35
3132+1 8 2 19 3 26 1 13 26 24 26 11 0 -5 -5 -14 -12 -21 -9 -9 -8 -12 4 -12 36 0
3133+79 14 75 24 -3 7 17 12 60 13 36 0 70 6 76 12 6 6 22 11 37 11 52 0 70 11 70
3134+41 0 25 4 29 26 29 17 0 28 -6 31 -20 3 -11 12 -20 20 -20 9 0 13 6 10 13 -11
3135+30 10 40 87 39 42 -1 81 -4 86 -7 5 -3 11 -1 15 4 3 6 12 8 20 4 11 -4 13 -1
3136+9 11 -7 18 -24 22 -24 6 0 -5 -7 -10 -15 -10 -9 0 -12 6 -9 15 4 8 1 15 -5 15
3137+-6 0 -11 -5 -11 -11 0 -7 -9 -9 -22 -6 -13 3 -32 7 -43 10 -11 2 -51 1 -90 -4z"/>
3138+<path d="M4065 3092 c-10 -3 -29 -10 -40 -18 -11 -7 -30 -15 -40 -17 -11 -2
3139+-42 -13 -69 -25 -27 -12 -53 -22 -59 -22 -5 0 -19 -10 -31 -23 -12 -13 -37
3140+-32 -56 -43 -19 -10 -37 -22 -40 -25 -3 -3 -26 -11 -52 -18 -53 -15 -150 -7
3141+-193 15 -15 8 -31 14 -36 14 -5 0 -9 -43 -9 -95 0 -139 -14 -132 280 -134 188
3142+-1 247 2 280 14 48 17 62 19 40 5 -8 -5 -12 -12 -8 -15 10 -10 49 19 43 32 -2
3143+7 -1 13 4 13 11 0 21 63 14 89 -6 25 -12 23 -146 -39 -37 -17 -73 -29 -80 -26
3144+-7 2 -4 5 6 5 9 1 17 6 17 11 0 6 5 10 12 10 6 0 36 12 67 26 136 62 131 57
3145+124 115 -5 35 -5 35 -39 25 -19 -6 -34 -14 -34 -18 0 -4 -18 -11 -40 -14 -22
3146+-4 -40 -10 -40 -15 0 -5 -7 -9 -15 -9 -26 0 -16 19 13 26 15 4 38 15 52 25 14
3147+9 42 20 62 24 42 8 46 15 38 70 -4 34 -8 40 -25 37z"/>
3148+<path d="M4690 3009 c-136 -18 -137 -18 -132 -50 5 -31 -6 -36 -39 -18 -11 5
3149+-17 14 -14 18 7 13 -20 21 -36 10 -8 -5 -10 -9 -5 -9 5 0 3 -7 -4 -15 -15 -18
3150+-41 -20 -37 -3 3 17 -34 23 -44 7 -4 -7 -27 -14 -51 -16 -24 -1 -52 -7 -63
3151+-12 -11 -4 -39 -17 -62 -27 -41 -18 -43 -21 -43 -61 0 -24 4 -43 10 -43 17 0
3152+144 43 158 53 7 5 10 18 7 28 -5 15 -1 19 19 19 19 0 26 -5 26 -20 0 -16 4
3153+-18 23 -11 12 5 21 14 19 21 -2 8 9 10 37 5 23 -4 42 -2 45 4 4 5 43 13 87 17
3154+69 6 82 10 89 28 4 11 4 22 -1 24 -19 8 6 32 33 32 28 0 30 -2 26 -30 -4 -24
3155+-1 -30 14 -30 13 0 18 8 18 30 0 27 3 30 30 30 23 0 30 -4 30 -20 0 -11 5 -20
3156+10 -20 6 0 10 10 10 23 0 19 5 23 33 22 27 0 32 -4 31 -22 -1 -33 24 -28 28 5
3157+3 23 8 27 33 27 17 0 33 -4 36 -8 3 -5 9 -2 12 7 5 13 -12 15 -136 14 -78 -1
3158+-167 -4 -197 -9z"/>
3159+<path d="M2692 2907 c-20 -21 -22 -34 -22 -130 l0 -107 116 0 c88 0 119 3 130
3160+15 12 11 14 39 12 127 l-3 113 -105 3 c-100 2 -107 1 -128 -21z"/>
3161+<path d="M2950 2928 c0 -2 -2 -59 -5 -128 -3 -104 -7 -126 -21 -137 -12 -9
3162+-56 -13 -136 -13 l-118 0 0 -114 c0 -81 4 -123 15 -143 8 -15 20 -42 26 -59 7
3163+-17 25 -40 40 -50 32 -21 41 -62 19 -84 -11 -11 -30 -14 -63 -12 -40 3 -47 1
3164+-47 -14 0 -16 -1 -16 -18 -1 -23 21 -52 22 -52 2 0 -14 64 -37 99 -36 9 1 25
3165+2 36 2 11 1 40 -1 65 -4 25 -3 51 -6 58 -6 6 -1 12 -8 12 -16 0 -9 6 -26 14
3166+-38 19 -30 29 -77 16 -77 -5 0 -10 -7 -10 -16 0 -13 3 -14 14 -5 15 13 32 -1
3167+22 -18 -3 -5 1 -28 9 -51 8 -23 15 -45 15 -47 0 -9 -26 23 -33 40 -10 26 -24
3168+20 -29 -13 -6 -39 17 -90 42 -97 11 -3 20 -9 20 -14 0 -9 -13 -12 -26 -6 -4 1
3169+-11 -8 -15 -21 -12 -32 6 -62 36 -62 23 0 35 -23 18 -33 -5 -2 -2 -2 5 -1 7 2
3170+12 -8 12 -26 0 -17 4 -30 9 -30 6 0 10 -8 10 -17 0 -10 2 -35 5 -55 4 -22 2
3171+-40 -5 -44 -8 -4 -7 -9 2 -15 10 -6 11 -9 2 -9 -7 0 -13 -9 -13 -20 0 -11 -4
3172+-20 -10 -20 -5 0 -10 5 -10 12 0 9 -3 9 -11 1 -9 -9 -8 -16 4 -27 21 -21 24
3173+-20 31 10 6 21 10 24 19 15 8 -8 8 -14 2 -19 -6 -4 -17 -20 -24 -37 -11 -23
3174+-15 -26 -18 -12 -3 9 -9 17 -15 17 -5 0 -8 -6 -5 -14 3 -8 1 -17 -6 -19 -9 -3
3175+-9 -8 1 -18 17 -18 15 -32 -3 -26 -9 4 -21 -5 -32 -23 -11 -20 -25 -30 -40
3176+-30 -13 0 -26 -7 -29 -15 -4 -8 -12 -15 -20 -15 -8 0 -14 -4 -14 -10 0 -16 27
3177+-12 34 5 3 8 15 15 27 15 13 0 31 7 41 17 16 14 18 14 18 1 0 -14 -20 -29 -42
3178+-32 -3 -1 -17 -10 -30 -22 -13 -11 -28 -19 -33 -17 -15 4 -40 -15 -32 -24 5
3179+-4 12 -1 17 7 7 12 11 10 18 -10 7 -17 6 -26 -1 -29 -6 -2 -13 1 -15 7 -2 6
3180+-10 8 -18 5 -19 -7 -44 14 -44 38 0 9 -7 25 -16 33 -8 9 -12 16 -7 16 4 0 1 6
3181+-8 13 -9 7 -19 24 -23 40 -5 20 -12 27 -31 27 -26 0 -34 -15 -12 -23 7 -3 5
3182+-6 -5 -6 -10 -1 -18 -7 -18 -13 0 -9 -3 -8 -10 2 -8 13 -11 12 -24 -5 -9 -11
3183+-16 -27 -16 -36 0 -21 -61 -139 -72 -139 -4 0 -8 -7 -8 -16 0 -9 -12 -25 -26
3184+-36 -22 -18 -25 -28 -24 -72 4 -126 1 -148 -20 -153 -24 -6 -27 -23 -5 -23 13
3185+0 13 -2 3 -14 -8 -9 -15 -10 -19 -4 -4 6 -11 8 -17 4 -5 -3 -10 4 -10 17 -1
3186+40 -14 87 -24 87 -6 0 -8 9 -5 20 3 11 1 20 -4 20 -5 0 -9 5 -9 10 0 6 -9 30
3187+-20 52 -11 23 -20 48 -20 55 0 7 -4 13 -9 13 -4 0 -9 12 -9 28 -4 81 -15 132
3188+-28 132 -8 0 -19 10 -24 22 -6 17 -9 18 -9 6 -2 -30 -21 -30 -52 1 -20 20 -25
3189+31 -16 31 8 0 18 7 21 16 4 11 1 14 -12 12 -18 -4 -55 29 -85 75 -17 26 -21
3190+27 -75 22 -75 -8 -87 -8 -152 1 -58 7 -73 17 -84 52 -11 35 -29 25 -55 -28
3191+-13 -28 -28 -50 -33 -50 -4 0 -8 -7 -8 -15 0 -8 5 -15 10 -15 6 0 10 3 10 8 0
3192+4 11 19 23 33 13 13 27 31 30 39 4 12 6 11 6 -2 1 -10 9 -18 19 -18 12 0 13
3193+-3 5 -8 -21 -13 -3 -50 30 -63 18 -7 40 -22 49 -33 19 -23 24 -66 8 -66 -5 0
3194+-10 -9 -10 -19 0 -10 -7 -21 -15 -25 -8 -3 -15 -17 -15 -31 0 -17 -12 -38 -35
3195+-59 -19 -19 -35 -38 -35 -43 0 -5 -19 -16 -42 -24 -51 -19 -57 -32 -21 -46
3196+l28 -11 -36 -1 c-41 -1 -99 -23 -129 -48 -16 -14 -20 -30 -20 -75 0 -54 2 -58
3197+23 -58 13 0 27 4 32 9 6 5 19 12 30 15 17 5 20 2 20 -19 -1 -14 -5 -28 -8 -32
3198+-4 -3 -7 -15 -7 -25 0 -18 -16 -59 -62 -156 -11 -23 -24 -39 -30 -36 -6 4 -8
3199+-1 -3 -15 3 -11 3 -21 -2 -21 -5 0 -14 -13 -20 -30 -6 -16 -18 -30 -27 -30 -9
3200+0 -16 -4 -16 -10 0 -5 -6 -10 -14 -10 -7 0 -19 -6 -26 -14 -6 -8 -19 -12 -28
3201+-9 -14 6 -15 4 -5 -9 11 -12 9 -17 -10 -26 -12 -6 -31 -13 -42 -15 -14 -3 -11
3202+-5 9 -6 24 -1 26 -3 16 -15 -6 -8 -19 -12 -27 -9 -12 5 -15 2 -10 -10 3 -9 1
3203+-19 -5 -23 -7 -4 -8 -3 -4 4 4 7 1 12 -8 12 -9 0 -16 5 -16 10 0 6 -8 5 -20
3204+-2 -17 -11 -22 -10 -30 2 -6 10 -10 11 -10 3 0 -7 -9 -13 -20 -13 -11 0 -20 6
3205+-20 13 0 9 -3 8 -9 -2 -13 -21 -292 -3 -331 21 -11 7 -7 8 12 5 16 -2 28 -1
3206+28 2 0 3 95 5 212 3 117 -1 209 0 205 4 -4 4 -2 13 4 21 9 10 8 13 -5 13 -9 0
3207+-16 -7 -16 -15 0 -14 -23 -15 -188 -11 -103 2 -229 10 -279 16 -51 6 -97 9
3208+-102 6 -17 -11 -65 23 -66 45 0 12 -11 29 -25 38 -14 9 -21 11 -16 4 4 -9 1
3209+-13 -10 -13 -12 0 -15 -7 -12 -30 5 -30 4 -31 -36 -26 -23 3 -62 5 -88 5 -37
3210+1 -46 4 -42 15 4 11 12 13 31 5 38 -14 68 -11 88 11 17 19 17 20 -1 21 -10 1
3211+-29 0 -42 -1 -13 -1 -32 6 -43 16 -12 11 -19 13 -19 5 0 -7 -6 -11 -12 -8 -7
3212+2 -21 -2 -30 -11 -16 -14 -18 -13 -18 2 0 9 -11 34 -25 54 -17 25 -25 31 -25
3213+19 0 -10 -5 -15 -11 -12 -5 4 -9 17 -8 28 0 12 1 26 0 30 -1 10 -25 -13 -34
3214+-33 -4 -8 -5 -1 -2 15 3 17 2 25 -2 19 -14 -20 -79 -11 -107 15 -14 13 -24 28
3215+-23 34 1 6 -15 11 -36 12 -22 1 -42 6 -45 12 -4 5 -14 13 -22 16 -8 4 1 4 20
3216+1 l35 -5 -33 17 c-28 14 -35 15 -42 4 -5 -8 -9 -164 -10 -347 l-1 -333 3201 0
3217+c3133 0 3200 0 3200 19 0 10 -7 21 -15 25 -8 3 -15 17 -15 30 0 18 4 24 15 20
3218+10 -4 15 0 15 15 0 12 -6 21 -15 21 -10 0 -15 10 -15 30 0 20 5 30 15 30 8 0
3219+15 9 15 20 0 13 -5 18 -15 14 -12 -5 -15 2 -15 30 0 25 4 36 15 36 8 0 15 7
3220+15 15 0 8 -9 15 -20 15 -15 0 -19 5 -16 23 3 12 5 25 5 30 1 4 8 7 16 7 8 0
3221+15 7 15 16 0 9 -6 14 -13 11 -14 -5 -39 18 -29 28 4 4 8 11 8 16 1 5 2 13 3
3222+19 0 5 8 7 16 4 9 -4 15 0 15 9 0 8 -8 17 -19 20 -10 2 -20 16 -23 31 -4 22
3223+-2 26 18 26 15 0 24 6 24 15 0 8 -6 15 -14 15 -8 0 -20 17 -27 37 -16 52 -27
3224+63 -60 63 -25 0 -29 4 -29 28 -1 38 -22 62 -57 62 -27 0 -30 3 -30 32 0 35
3225+-32 68 -67 68 -16 0 -21 7 -22 26 -2 28 -30 64 -51 64 -7 0 -22 6 -33 12 -17
3226+11 -22 10 -30 -2 -8 -12 -14 -12 -44 -2 -24 9 -41 10 -54 3 -11 -6 -23 -6 -33
3227+0 -7 5 -35 7 -61 3 -44 -5 -48 -4 -48 15 0 21 0 21 -20 1 -24 -24 -43 -25 -60
3228+-5 -15 18 -56 16 -52 -3 1 -6 -7 -12 -18 -12 -13 0 -20 7 -20 20 0 12 -7 20
3229+-16 20 -9 0 -18 -9 -21 -20 -3 -12 -14 -20 -27 -20 -19 1 -19 2 -3 11 21 12
3230+23 33 2 25 -8 -3 -21 1 -29 9 -8 8 -31 15 -50 15 -24 0 -36 5 -36 14 0 11 10
3231+11 63 0 139 -29 192 -35 217 -25 22 9 20 10 -22 10 -26 1 -49 5 -52 10 -4 5
3232+-41 12 -84 16 -42 3 -86 10 -97 15 -21 9 -115 29 -175 38 -19 2 -38 9 -41 14
3233+-3 5 -46 10 -95 12 -72 3 -111 11 -195 41 -57 20 -111 39 -119 42 -9 2 -31 -9
3234+-50 -26 -19 -17 -39 -31 -43 -31 -5 0 -28 -14 -51 -30 -39 -28 -76 -33 -76
3235+-10 0 16 -79 59 -116 63 -22 2 -10 4 25 3 41 0 65 -5 68 -13 3 -7 11 -13 19
3236+-13 8 0 14 -5 14 -12 0 -6 3 -9 6 -6 8 8 -17 46 -36 55 -8 4 -100 10 -205 13
3237+l-190 6 197 2 c108 1 199 6 202 11 8 13 -46 19 -149 15 -87 -2 -88 -2 -25 6
3238+36 4 81 12 100 18 29 7 32 11 17 17 -10 4 -29 3 -43 -4 -29 -13 -98 -15 -90
3239+-2 3 4 16 6 30 4 13 -3 27 0 30 6 4 6 18 11 31 11 12 0 25 7 29 15 4 12 0 14
3240+-19 9 -14 -3 -31 -2 -38 4 -6 5 -31 13 -55 17 -23 4 -40 11 -36 16 3 5 9 7 14
3241+4 5 -3 11 -1 15 5 3 5 -1 10 -9 10 -9 0 -16 5 -16 10 0 6 7 10 15 10 8 0 15
3242+-4 15 -10 0 -5 10 -10 23 -10 12 0 49 -14 82 -30 33 -16 67 -30 76 -30 8 0 19
3243+-4 25 -8 5 -4 34 -16 64 -26 30 -10 70 -25 88 -33 32 -14 72 -10 72 7 0 5 8
3244+11 18 14 10 4 27 14 38 24 20 18 109 89 165 132 18 14 38 30 44 36 6 6 21 15
3245+33 18 12 4 22 12 22 17 0 5 5 9 11 9 6 0 16 6 23 13 14 13 5 28 -24 40 -10 4
3246+-8 6 6 6 12 1 27 -6 34 -14 15 -18 39 -20 45 -2 4 8 30 13 74 14 64 1 69 0 66
3247+-18 -2 -12 2 -19 11 -19 8 0 14 -3 14 -8 0 -10 66 -33 113 -39 22 -3 37 -11
3248+37 -19 0 -18 35 -49 82 -74 46 -24 48 -24 48 -5 0 9 9 15 25 15 21 0 25 -5 25
3249+-29 0 -17 -5 -33 -11 -36 -19 -12 33 -39 71 -36 34 2 35 1 36 -34 1 -41 15
3250+-55 57 -55 23 0 27 -4 27 -30 0 -23 6 -33 25 -42 14 -6 25 -15 25 -19 0 -5 10
3251+-8 23 -6 14 1 21 -3 19 -12 -4 -19 8 -51 19 -51 6 0 18 -7 26 -16 14 -13 30
3252+-15 92 -9 42 4 77 8 78 9 7 6 -12 56 -24 60 -12 5 -14 1 -11 -18 6 -28 -7 -36
3253+-44 -29 -37 7 -37 57 0 78 l27 14 -27 1 c-25 0 -28 4 -28 35 0 19 -5 35 -10
3254+35 -6 0 -10 -6 -9 -13 6 -46 -1 -57 -36 -57 -33 0 -35 2 -35 35 0 34 2 35 38
3255+36 20 1 55 1 77 1 22 -1 43 4 47 11 6 9 11 8 18 -3 9 -13 10 -13 10 0 0 13
3256+-15 16 -83 15 -45 -1 -88 -4 -95 -9 -9 -5 -12 6 -12 42 l0 49 42 -7 c24 -5 50
3257+-5 58 0 8 4 20 5 27 3 6 -2 14 1 18 7 5 8 -4 11 -31 10 -82 -5 -104 -1 -113
3258+22 l-8 22 -5 -22 c-5 -16 -14 -22 -36 -22 -26 0 -30 4 -35 33 -2 17 -4 33 -2
3259+35 1 1 32 3 69 4 36 0 66 5 66 11 0 5 -6 7 -14 4 -7 -3 -19 0 -25 6 -8 8 -14
3260+9 -19 1 -8 -12 -64 -13 -73 -2 -3 4 -3 23 -1 42 3 29 9 36 31 39 17 3 12 5
3261+-16 6 -42 1 -43 1 -39 -31 5 -46 -1 -56 -35 -53 -40 3 -43 8 -30 46 8 24 8 35
3262+0 39 -6 4 -9 14 -7 23 2 9 -1 16 -7 16 -5 0 -9 -7 -7 -15 2 -8 -1 -15 -5 -15
3263+-65 -10 -64 -10 -61 29 3 32 6 37 28 36 14 0 31 -3 39 -5 11 -3 15 6 15 33 1
3264+21 -2 38 -6 38 -5 0 -8 -9 -8 -19 0 -46 -65 -38 -72 8 -4 25 -1 30 22 35 15 3
3265+37 2 49 -1 21 -5 22 -3 15 33 -8 48 -14 56 -14 22 0 -29 -12 -37 -46 -30 -28
3266+5 -33 38 -27 161 3 64 1 91 -6 86 -6 -3 -11 -17 -11 -30 0 -43 -58 -44 -78 -2
3267+l-11 22 0 -23 c-1 -20 -5 -23 -33 -20 -29 3 -33 7 -36 36 -2 24 1 32 12 32 20
3268+0 21 19 1 26 -8 4 -15 12 -15 20 0 8 -5 14 -11 14 -7 0 -9 -10 -5 -27 5 -22 4
3269+-25 -4 -13 -8 11 -13 12 -16 3 -8 -19 -54 6 -54 29 0 11 -5 16 -11 13 -6 -4
3270+-8 -13 -5 -20 5 -14 -25 -22 -63 -17 -17 3 -20 6 -11 12 14 9 7 40 -10 40 -5
3271+0 -10 -11 -10 -25 0 -21 -5 -25 -30 -25 -25 0 -30 4 -30 25 0 16 -6 25 -15 25
3272+-9 0 -15 -9 -15 -25 0 -21 -5 -25 -31 -25 -22 0 -30 4 -26 13 7 19 -8 41 -22
3273+33 -6 -4 -11 -16 -11 -27 0 -14 -7 -19 -30 -19 -20 0 -30 5 -30 15 0 8 -7 15
3274+-15 15 -8 0 -15 -7 -15 -15 0 -9 -9 -15 -25 -15 -16 0 -25 6 -25 15 0 8 -4 15
3275+-10 15 -5 0 -10 4 -10 9 0 5 23 9 50 9 28 1 54 3 59 7 5 3 92 8 192 11 101 3
3276+185 7 188 9 2 3 -5 5 -17 5 -18 0 -22 6 -22 30 0 17 -4 30 -10 30 -5 0 -7 -6
3277+-4 -13 8 -22 -20 -50 -44 -43 -17 6 -22 15 -22 42 0 24 -5 34 -15 34 -10 0
3278+-15 -11 -15 -35 0 -32 -3 -35 -29 -35 -31 0 -43 16 -34 49 4 16 1 21 -13 21
3279+-15 0 -19 -7 -19 -32 0 -29 -3 -33 -25 -33 -21 0 -26 5 -28 33 -2 19 -9 32
3280+-17 32 -8 0 -15 -13 -17 -32 -2 -28 -7 -33 -28 -33 -20 0 -26 6 -28 28 -4 32
3281+-25 31 -30 -1 -5 -30 -52 -31 -52 -2 0 13 -7 20 -20 20 -13 0 -20 -7 -20 -20
3282+0 -15 -7 -20 -25 -20 -15 0 -24 5 -23 13 2 7 -7 12 -22 12 -16 0 -24 -5 -22
3283+-14 2 -10 -4 -12 -25 -7 -38 9 -43 9 -82 1 -29 -7 -33 -6 -29 11 3 16 15 19
3284+96 21 51 1 101 7 112 13 10 5 37 10 59 10 43 0 56 18 21 27 -13 3 -20 14 -20
3285+29 0 19 5 24 25 24 23 0 25 -4 23 -35 -3 -42 7 -53 32 -37 11 7 43 13 72 13
3286+29 1 45 3 36 6 -11 3 -18 14 -18 29 0 20 5 24 30 24 27 0 30 -3 30 -30 0 -22
3287+5 -30 18 -30 15 0 18 6 14 30 -4 27 -2 30 24 31 29 1 29 1 -4 9 -45 11 -282
3288+11 -318 0 -16 -4 -24 -9 -18 -9 6 -1 12 -12 12 -26 0 -20 -6 -25 -24 -25 -19
3289+0 -24 5 -24 24 0 13 5 26 12 28 9 3 9 6 0 12 -7 4 -12 2 -12 -3 0 -6 -9 -11
3290+-20 -11 -15 0 -20 -7 -20 -26 0 -21 -4 -25 -22 -22 -13 2 -23 10 -23 18 0 23
3291+-32 24 -51 1 -13 -15 -21 -18 -31 -9 -28 23 -12 34 65 46 118 19 132 23 132
3292+33 0 6 -8 9 -17 7 -13 -2 -17 3 -15 17 7 40 54 46 57 8 1 -13 -2 -23 -7 -23
3293+-4 0 -8 -4 -8 -10 0 -5 11 -10 24 -10 21 0 24 4 22 33 -1 28 2 32 24 32 18 0
3294+26 -6 28 -22 2 -13 10 -23 17 -23 7 0 15 10 17 23 2 17 10 22 33 22 25 0 30
3295+-3 27 -22 -2 -16 2 -23 13 -23 11 0 15 7 13 23 -3 19 1 22 32 22 31 0 35 -3
3296+32 -22 -2 -13 2 -23 7 -23 11 0 15 13 12 38 -1 9 21 12 81 13 76 1 79 2 43 11
3297+-47 11 -430 14 -527 4 -63 -7 -74 -13 -69 -40 3 -15 -20 -35 -34 -30 -8 3 -15
3298+15 -17 27 -4 27 -19 27 -33 0 -8 -16 -15 -18 -38 -10 -15 5 -27 12 -27 16 0
3299+11 72 31 113 31 20 0 39 5 42 10 3 6 14 10 23 10 13 0 18 8 17 28 0 21 5 28
3300+23 30 18 3 22 -1 22 -23 0 -20 4 -26 18 -23 9 2 18 9 18 16 1 6 2 17 3 22 1
3301+13 31 13 51 0 12 -8 13 -12 2 -19 -11 -7 -11 -9 0 -13 21 -8 38 2 38 23 0 14
3302+7 19 25 19 16 0 25 -6 25 -15 0 -8 7 -15 15 -15 8 0 15 7 15 15 0 10 11 15 35
3303+15 26 0 33 -3 29 -15 -4 -9 0 -15 9 -15 8 0 17 13 21 32 7 36 -7 59 -26 40
3304+-14 -14 -68 -16 -68 -2 0 6 -7 10 -15 10 -8 0 -15 -4 -15 -10 0 -5 -11 -10
3305+-25 -10 -14 0 -25 5 -25 10 0 6 -9 10 -20 10 -11 0 -20 -4 -20 -8 0 -5 -61
3306+-12 -136 -15 -143 -7 -174 0 -174 35 0 27 38 23 42 -4 4 -31 31 -29 38 2 7 29
3307+47 37 42 8 -2 -13 4 -18 23 -18 18 0 25 5 25 19 0 28 47 34 54 7 l6 -21 19 23
3308+c22 25 49 29 57 7 8 -19 33 -20 40 -1 6 15 54 19 54 5 0 -5 7 -9 15 -9 8 0 15
3309+5 15 10 0 6 14 10 30 10 17 0 30 -4 30 -10 0 -5 7 -10 16 -10 10 0 13 6 10 18
3310+-4 13 -1 19 9 19 8 0 15 -4 15 -9 0 -4 5 -8 10 -8 6 0 10 7 10 15 0 8 -9 15
3311+-20 15 -10 0 -24 8 -29 18 -10 16 -10 16 -11 0 0 -14 -8 -18 -35 -18 -24 0
3312+-35 5 -35 15 0 8 -7 15 -16 15 -10 0 -14 -6 -11 -14 4 -10 -4 -15 -24 -18 -23
3313+-4 -29 -1 -29 14 0 10 -7 18 -15 18 -8 0 -15 -7 -15 -15 0 -19 -66 -21 -73 -2
3314+-3 9 -8 9 -18 1 -8 -6 -59 -11 -113 -12 -54 -1 -104 -6 -110 -11 -6 -5 -28 -8
3315+-49 -7 -20 0 -37 -2 -37 -6 0 -5 -11 -8 -24 -8 -18 0 -25 -7 -29 -30 -4 -19
3316+-13 -30 -24 -30 -13 0 -14 3 -5 12 19 19 14 28 -13 28 -30 0 -79 -21 -66 -29
3317+5 -3 -23 -6 -62 -7 -40 0 -63 2 -52 4 11 2 25 8 31 13 6 5 18 7 27 3 8 -3 18
3318+-1 22 5 3 6 19 11 36 11 16 0 29 4 29 9 0 4 20 11 45 15 63 8 90 23 75 41 -15
3319+18 -5 35 21 35 12 0 19 -7 19 -19 0 -20 17 -31 38 -24 6 3 12 13 12 24 0 12 7
3320+19 20 19 11 0 20 -7 20 -15 0 -21 23 -19 43 5 14 17 21 19 38 10 11 -7 28 -8
3321+37 -4 9 3 54 6 99 6 87 -2 139 10 128 29 -4 6 -12 8 -19 6 -6 -3 -17 1 -23 9
3322+-9 9 -9 14 -1 16 6 2 8 10 4 16 -12 20 -26 13 -26 -13 0 -18 -7 -26 -24 -31
3323+-31 -7 -46 1 -46 27 0 10 -7 19 -15 19 -9 0 -15 -9 -15 -24 0 -22 -3 -23 -27
3324+-17 -16 4 -28 14 -28 22 0 8 -7 14 -15 14 -8 0 -14 -5 -13 -12 4 -17 -35 -27
3325+-51 -14 -8 7 -31 9 -52 6 -22 -3 -57 -7 -79 -10 -62 -8 -126 -21 -176 -38 -26
3326+-8 -52 -11 -58 -8 -6 4 12 14 40 21 27 8 52 18 55 22 3 4 16 8 29 8 34 0 55
3327+10 55 27 0 12 9 14 50 8 30 -4 50 -3 50 3 0 5 19 9 43 9 23 0 102 4 175 8 100
3328+6 132 11 132 22 0 7 -4 13 -9 13 -5 0 -12 10 -14 23 -4 18 -4 17 -6 -6 -1 -26
3329+-4 -28 -33 -25 -28 2 -34 8 -36 31 -4 34 -27 31 -27 -4 0 -20 -5 -24 -30 -24
3330+-26 0 -30 3 -28 28 1 18 -3 27 -13 27 -8 0 -14 -10 -14 -24 0 -41 -53 -45 -63
3331+-4 -7 23 -32 19 -32 -5 0 -9 -3 -17 -7 -17 -45 -1 -50 1 -44 15 7 20 -18 20
3332+-34 0 -10 -12 -35 -14 -60 -5 -3 2 -9 1 -15 0 -15 -4 -137 -30 -167 -37 -16
3333+-3 -28 -9 -28 -13 0 -4 -19 -10 -42 -14 -23 -4 -48 -12 -55 -18 -7 -6 -31 -12
3334+-53 -13 -21 -2 -45 -7 -52 -12 -21 -13 -78 -31 -78 -24 0 8 80 41 100 41 8 0
3335+24 7 34 15 11 8 35 15 53 15 18 0 33 5 33 10 0 6 11 10 24 10 14 0 28 5 31 10
3336+3 6 15 10 26 10 17 0 23 12 22 48 -1 6 8 12 19 12 16 0 19 -5 15 -21 -5 -19
3337+-3 -21 25 -15 17 3 35 6 41 6 6 0 2 7 -9 15 -18 14 -18 14 6 15 15 0 31 -5 38
3338+-12 9 -9 15 -9 24 0 7 7 36 12 64 12 29 0 55 4 58 8 3 5 26 9 53 10 90 4 101
3339+9 99 45 -1 29 2 32 29 32 26 0 30 -3 30 -29 1 -16 6 -31 13 -34 8 -2 12 8 12
3340+32 0 30 4 35 28 39 15 2 -28 5 -96 6 -90 1 -124 -2 -126 -11 -3 -7 -7 -25 -10
3341+-40 -4 -19 -13 -28 -26 -28 -19 0 -36 32 -25 50 4 6 -5 10 -20 10 -21 0 -26
3342+-4 -23 -22 2 -19 -2 -24 -25 -26 -15 -2 -27 0 -26 5 4 21 -2 33 -16 33 -8 0
3343+-15 -6 -15 -14 0 -19 -40 -32 -50 -17 -5 9 -18 9 -51 1 -24 -6 -66 -16 -94
3344+-21 -27 -6 -65 -19 -83 -30 -19 -11 -38 -17 -43 -13 -22 13 -71 -22 -95 -68
3345+-40 -78 -41 -78 -376 -78 -239 1 -297 3 -312 15 -10 8 -22 12 -27 10 -4 -3 -7
3346+-93 -8 -201 0 -168 -3 -200 -17 -223 -38 -58 -28 -56 -298 -59 -263 -3 -296
3347+-1 -296 23 0 21 18 23 265 24 156 1 237 6 255 14 l25 12 3 314 c2 311 2 315
3348+-20 338 -21 22 -26 23 -205 23 -101 0 -183 -1 -183 -2z"/>
3349+<path d="M812 2208 c-7 -7 -12 -20 -12 -29 0 -9 -7 -19 -15 -23 -9 -3 -15 -18
3350+-15 -40 0 -19 -6 -36 -12 -39 -23 -7 9 -52 39 -54 14 0 21 2 16 5 -6 4 -13 21
3351+-15 37 -3 17 -3 24 -1 18 3 -7 8 -13 13 -13 5 0 10 -6 13 -12 2 -7 2 -2 -1 12
3352+-2 14 -4 32 -3 40 1 8 2 31 3 50 1 19 3 27 5 17 3 -13 11 -15 29 -11 19 5 23
3353+3 18 -10 -4 -12 0 -16 15 -16 12 0 21 -6 21 -15 0 -19 11 -19 36 0 37 28 72
3354+18 172 -49 23 -16 45 -26 48 -23 7 7 -48 57 -63 57 -7 0 -13 3 -13 8 0 29
3355+-139 58 -155 32 -9 -15 -25 -12 -25 5 0 9 -7 18 -16 22 -12 4 -13 7 -3 14 18
3356+10 11 15 -31 23 -23 4 -40 2 -48 -6z"/>
3357+<path d="M333 2153 c-7 -3 -13 -18 -13 -33 0 -16 6 -33 13 -37 6 -4 17 -17 23
3358+-28 6 -11 28 -29 50 -40 67 -34 68 -35 44 -52 -15 -11 -18 -18 -11 -27 8 -9 7
3359+-21 -2 -39 -16 -35 -28 -34 -21 2 5 23 0 34 -32 65 -20 20 -41 36 -45 36 -15
3360+0 -60 44 -75 73 -20 38 -36 37 -89 -11 -8 -7 -30 -12 -50 -10 -35 2 -54 -11
3361+-55 -39 0 -7 -16 -24 -35 -39 -35 -26 -35 -27 -35 -105 l0 -79 29 0 c17 0 33
3362+4 36 10 3 5 20 10 38 9 48 0 100 6 120 15 22 10 50 0 44 -17 -2 -6 -1 -22 4
3363+-33 5 -14 3 -28 -6 -40 -8 -11 -15 -22 -15 -26 0 -11 76 -48 99 -48 32 0 52
3364+-12 62 -36 6 -17 16 -24 34 -24 14 0 37 -7 50 -16 37 -24 59 -12 51 30 -5 28
3365+-3 37 15 49 34 25 15 34 -73 36 -115 3 -112 11 5 11 85 0 97 2 98 18 1 19 3
3366+34 14 72 4 19 1 31 -15 45 -14 13 -17 21 -9 26 8 5 4 15 -14 32 -15 13 -27 29
3367+-27 35 0 5 -7 12 -15 16 -9 3 -15 18 -15 40 0 36 -21 66 -46 66 -8 0 -14 5
3368+-14 10 0 6 -6 10 -13 10 -8 0 -24 11 -37 25 -13 14 -29 25 -36 25 -7 0 -14 6
3369+-16 13 -2 8 -9 12 -15 10z"/>
3370+<path d="M2653 2043 c-7 -2 -13 -16 -13 -29 0 -24 8 -28 44 -24 11 1 38 -1 62
3371+-5 79 -11 63 -74 -23 -90 -18 -3 -33 -10 -33 -15 0 -6 -6 -10 -13 -10 -31 0
3372+-47 -35 -47 -103 l0 -67 80 -1 c160 -2 150 -3 150 20 0 11 6 23 13 28 7 5 -27
3373+10 -78 13 -85 5 -90 6 -93 28 -4 25 21 51 48 52 8 0 34 7 57 16 37 14 45 23
3374+53 56 16 58 -3 103 -52 123 -36 14 -128 19 -155 8z"/>
3375+<path d="M2517 2013 c-3 -15 1 -23 9 -23 10 0 14 -16 14 -61 0 -47 4 -65 18
3376+-75 15 -12 15 -13 1 -14 -20 0 -29 -20 -29 -66 0 -45 16 -74 39 -74 24 0 29
3377+25 26 130 -2 47 -4 113 -4 148 l-1 63 -34 -3 c-27 -1 -35 -7 -39 -25z"/>
3378+<path d="M645 1970 c-14 -28 -14 -31 5 -50 21 -21 19 -40 -4 -40 -7 0 -12 -10
3379+-11 -22 1 -13 -1 -27 -5 -33 -5 -5 -9 -28 -10 -50 -4 -81 -12 -75 108 -74 59
3380+1 97 4 84 6 -12 2 -27 13 -32 24 -6 10 -17 19 -25 19 -8 0 -15 7 -15 15 0 18
3381+12 19 29 3 10 -11 12 -9 9 7 -2 15 3 21 25 23 15 2 27 -1 27 -7 0 -17 18 -13
3382+38 9 18 20 52 19 52 -1 0 -14 28 -11 54 6 13 9 28 15 32 14 19 -3 34 2 34 11
3383+0 16 -52 11 -72 -7 -19 -17 -21 -17 -50 0 -37 21 -48 21 -63 0 -10 -13 -16
3384+-15 -26 -6 -8 6 -28 14 -45 17 -25 6 -31 11 -27 25 6 22 -16 39 -27 21 -5 -8
3385+-9 -7 -13 5 -4 9 -3 14 1 12 4 -3 13 1 20 9 10 11 8 16 -13 30 -18 12 -22 20
3386+-15 29 6 8 6 15 -2 23 -21 21 -47 13 -63 -18z"/>
3387+<path d="M1120 1338 c0 -8 9 -27 20 -41 20 -25 20 -25 0 -20 -14 4 -20 0 -20
3388+-10 0 -20 17 -31 23 -15 4 9 6 10 6 1 1 -6 -3 -14 -7 -17 -5 -3 -5 -34 0 -68
3389+7 -46 15 -69 33 -85 13 -11 32 -44 41 -73 l17 -51 56 3 c69 4 74 17 29 84 -18
3390+27 -40 61 -47 77 -8 15 -20 27 -27 27 -18 0 -44 46 -44 80 0 30 -15 41 -23 18
3391+-2 -7 -2 -1 0 14 3 20 -4 35 -26 59 -20 21 -31 27 -31 17z"/>
3392+<path d="M1290 939 c-25 -3 -38 -7 -30 -7 8 -1 36 -25 62 -53 39 -43 46 -55
3393+37 -70 -7 -15 -6 -21 5 -25 8 -3 18 -15 21 -26 5 -15 13 -18 33 -13 15 3 37 7
3394+50 10 12 2 27 7 32 10 11 7 13 48 4 92 -5 26 -9 29 -35 25 -15 -2 -34 -10 -40
3395+-18 -6 -8 -19 -14 -28 -14 -17 0 -41 42 -41 71 0 22 -15 26 -70 18z"/>
3396+</g>
3397+</svg>
3398
3399=== added file 'client/share/ltsp/init-ltsp.d/00-overlay'
3400--- client/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
3401+++ client/share/ltsp/init-ltsp.d/00-overlay 2013-07-22 07:06:30 +0000
3402@@ -0,0 +1,123 @@
3403+#!/bin/sh
3404+#
3405+# Overlay filesystem mounting -*- overlay-module -*-
3406+#
3407+# 2013, Joshua Trimm <enslaver@enslaver.com>
3408+#
3409+# Derived from previously modified scripts written by:
3410+# 2008, Stephane Graber <stgraber@ubuntu.com>
3411+# 2009, Vagrant Cascadian <vagrant@freegeek.org>
3412+#
3413+# This program is free software; you can redistribute it and/or
3414+# modify it under the terms of the GNU General Public License as
3415+# published by the Free Software Foundation; either version 2 of the
3416+# License, or (at your option) any later version.
3417+#
3418+# This program is distributed in the hope that it will be useful,
3419+# but WITHOUT ANY WARRANTY; without even the implied warranty of
3420+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3421+# GNU General Public License for more details.
3422+#
3423+# You should have received a copy of the GNU General Public License
3424+# along with this program. If not, you can find it on the World Wide
3425+# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
3426+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
3427+# MA 02110-1301, USA.
3428+#
3429+# The idea is to make this a double script, running from init-ltsp
3430+# and also be installed to the initramfs using either dracut or
3431+# initramfs-tools.
3432+
3433+#set -x
3434+
3435+[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
3436+
3437+# On by default
3438+OVERLAY=${OVERLAY:-Y}
3439+
3440+if [ -f /.inside-cow ]; then
3441+ # Already inside copy-on-write filesystem
3442+ return
3443+fi
3444+
3445+if [ ! $OVERLAY ]; then
3446+ # Someone doesnt love me
3447+ return
3448+fi
3449+
3450+
3451+
3452+# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
3453+OVERLAYFS=${OVERLAYFS:-unionfs}
3454+
3455+panic() { echo "Error: $@"; exit 1; }
3456+
3457+
3458+# Try to give us some tmp space in userland
3459+test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
3460+
3461+[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
3462+[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
3463+[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
3464+[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
3465+
3466+if modprobe -q overlayfs; then
3467+ # For kernel overlays
3468+ if [ "$DETECT_MODULE_INCOMPLETE" ]; then
3469+ UNION_TYPE=overlayfs
3470+ UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
3471+ fi
3472+elif modprobe -q fuse; then
3473+ # For fuse overlays
3474+ FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
3475+ if [ "$INSIDE_DRACUT" ]; then
3476+ . /tmp/root.info
3477+ [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
3478+ CHROOT_PATH="/tmp/unionfs"
3479+ UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
3480+ NEWROOT=${NEWROOT:-/sysroot}
3481+ OLDROOT="$NEWROOT"
3482+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
3483+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
3484+ mount --move /sysroot /tmp/sysroot
3485+ mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
3486+ unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
3487+ echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
3488+ [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
3489+ cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
3490+ elif [ "$INSIDE_INITRAMFS" ]; then
3491+ # This is for initramfs-tools that include the fuse module.
3492+ # it is incomplete but should be similar to above, just set
3493+ # NEWROOT to where it mounts the nfsroot
3494+ NEWROOT="${rootmnt}"
3495+ . /tmp/root.info
3496+ [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
3497+ CHROOT_PATH="/tmp/unionfs"
3498+ UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
3499+ NEWROOT=${NEWROOT:-/sysroot}
3500+ OLDROOT="$NEWROOT"
3501+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
3502+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
3503+ mount --move /sysroot /tmp/sysroot
3504+ mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
3505+ unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
3506+ echo inside-cow-initramfs > /sysroot/.inside-cow
3507+ [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
3508+ cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
3509+ elif [ "$INSIDE_LTSP_INIT" ]; then
3510+ CHROOT_PATH="/tmp/unionfs"
3511+ UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
3512+ UBIN=/usr/bin/unionfs
3513+ mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
3514+ [ -e "/proc/cmdline" ] || mount -t proc proc /proc
3515+ mount -t tmpfs tmpfs $CHROOT_PATH/cow
3516+ mount --bind / $CHROOT_PATH/rofs
3517+ $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
3518+ mount -t proc proc /tmp/union/proc
3519+ echo inside-cow-ltsp-init > /tmp/union/.inside-cow
3520+ cd /tmp/union
3521+ mkdir oldroot
3522+ pivot_root . oldroot
3523+ init q
3524+ fi
3525+fi
3526
3527=== modified file 'client/share/ltsp/init-ltsp.d/09-hostname'
3528--- client/share/ltsp/init-ltsp.d/09-hostname 2012-05-14 13:28:11 +0000
3529+++ client/share/ltsp/init-ltsp.d/09-hostname 2013-07-22 07:06:30 +0000
3530@@ -1,4 +1,4 @@
3531-if [ -z "$HOSTNAME" ]; then
3532+if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
3533 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
3534 case "$HOSTNAME_EXTRA" in
3535 mac)
3536
3537=== modified file 'client/share/ltsp/init-ltsp.d/50-opengl'
3538--- client/share/ltsp/init-ltsp.d/50-opengl 2013-02-05 10:35:02 +0000
3539+++ client/share/ltsp/init-ltsp.d/50-opengl 2013-07-22 07:06:30 +0000
3540@@ -1,4 +1,5 @@
3541 if boolean_is_true "$LDM_DIRECTX" && ! boolean_is_true "$LTSP_FATCLIENT"; then
3542 # Work around LP bug #1072711
3543 rm -f /usr/lib/i386-linux-gnu/dri/nouveau_vieux_dri.so
3544+ #rm -f /usr/lib/xorg/modules/drivers/nouveau_drv.so
3545 fi
3546
3547=== modified file 'client/share/ltsp/screen-x-common'
3548--- client/share/ltsp/screen-x-common 2012-10-29 19:34:41 +0000
3549+++ client/share/ltsp/screen-x-common 2013-07-22 07:06:30 +0000
3550@@ -37,8 +37,14 @@
3551 #
3552
3553 TTY=$(tty)
3554-TTY=${TTY#/dev/tty}
3555-DISPLAY=":$TTY"
3556+TTY=${TTY##*[!0-9]}
3557+
3558+if [[ -n "$SCREEN_NUM" ]]; then
3559+ DISPLAY=":$TTY"
3560+elif [ -n "$DISPLAY" ]; then
3561+ DISPLAY=":$SCREEN_NUM"
3562+fi
3563+
3564 # set DISP for backwards compatibility with older screen scripts
3565 DISP="$DISPLAY"
3566
3567
3568=== added file 'client/share/ltsp/screen.d/x2goclient'
3569--- client/share/ltsp/screen.d/x2goclient 1970-01-01 00:00:00 +0000
3570+++ client/share/ltsp/screen.d/x2goclient 2013-07-22 07:06:30 +0000
3571@@ -0,0 +1,30 @@
3572+#!/bin/sh
3573+#
3574+# Screen script that launches x2goclient. Can be called from lts.conf
3575+# like this:
3576+# SCREEN_07="x2goclient"
3577+#
3578+# Copyright (c) 2013 Joshua Trimm <enslaver@enslaver.com>
3579+#
3580+# This software is licensed under the GNU General Public License version 2,
3581+# the full text of which can be found in the COPYING file.
3582+
3583+. /usr/share/ltsp/screen-x-common
3584+export HOME=${HOME:-/root}
3585+
3586+# Make XINITRC_DAEMON default to "True", to prevent X from restarting after
3587+# logout. If you don't want that, force XINITRC_DAEMON=False in lts.conf.
3588+export XINITRC_DAEMON="${XINITRC_DAEMON-True}"
3589+
3590+. /usr/share/ltsp/x2gothinclient_init
3591+
3592+#COMMAND="/usr/bin/x2goclient"
3593+#ARGS="--no-menu --maximize --link=lan --geometry=fullscreen \
3594+#--thinclient --haltbt --read-exports-from=/usr/share/ltsp/x2goclient/export \
3595+#--background=/usr/share/ltsp/background.svg --no-session-edit \
3596+#--session=X2Go.Example --add-to-known-hosts"
3597+
3598+# The following logic is described at the top of xinitrc.
3599+if [ -x /usr/share/ltsp/xinitrc ]; then
3600+ exec xinit /usr/share/ltsp/xinitrc "/usr/share/ltsp/x2gothinclient_start" -- "$DISPLAY" "vt${TTY}" $X_ARGS >/dev/null
3601+fi
3602
3603=== added file 'client/share/ltsp/x2gothinclient_sessions'
3604--- client/share/ltsp/x2gothinclient_sessions 1970-01-01 00:00:00 +0000
3605+++ client/share/ltsp/x2gothinclient_sessions 2013-07-22 07:06:30 +0000
3606@@ -0,0 +1,38 @@
3607+[20100623163928371]
3608+defsndport = false
3609+useiconv = false
3610+iconvfrom = ISO8859-15
3611+height = 768
3612+export =
3613+speed = 4
3614+fullscreen = true
3615+layout = us
3616+width = 1024
3617+quality = 9
3618+xdmcpserver = localhost
3619+soundtunnel = 1
3620+rdpoptions =
3621+soundsystem = pulse
3622+print = 1
3623+type = pc104/us
3624+sndport = 4713
3625+usekbd = true
3626+fstunnel = true
3627+applications = OFFICE, WWWBROWSER, MAILCLIENT, TERMINAL
3628+host = server
3629+link = ADSL
3630+user =
3631+key =
3632+startsoundsystem = false
3633+icon =
3634+sound = true
3635+rootless = false
3636+name = server
3637+iconvto = UTF-8
3638+rdpserver =
3639+useexports = true
3640+command = GNOME
3641+dpi = 96
3642+sshport = 22
3643+setdpi = false
3644+pack = 16m-jpeg
3645
3646=== added file 'client/share/ltsp/x2gothinclient_start'
3647--- client/share/ltsp/x2gothinclient_start 1970-01-01 00:00:00 +0000
3648+++ client/share/ltsp/x2gothinclient_start 2013-07-22 07:06:30 +0000
3649@@ -0,0 +1,61 @@
3650+#!/bin/bash
3651+#
3652+# Modified for use with LTSP by Joshua Trimm <enslaver@enslaver.com>
3653+#
3654+
3655+# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
3656+# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
3657+# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
3658+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
3659+
3660+# X2Go is free software; you can redistribute it and/or modify
3661+# it under the terms of the GNU General Public License as published by
3662+# the Free Software Foundation; either version 2 of the License, or
3663+# (at your option) any later version.
3664+#
3665+# X2Go is distributed in the hope that it will be useful,
3666+# but WITHOUT ANY WARRANTY; without even the implied warranty of
3667+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3668+# GNU General Public License for more details.
3669+#
3670+# You should have received a copy of the GNU General Public License
3671+# along with this program; if not, write to the
3672+# Free Software Foundation, Inc.,
3673+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
3674+
3675+[ ! -x /usr/bin/x2goclient ] && echo You must install x2goclient in the chroot
3676+
3677+if ! `getent passwd |grep -q "^x2goclient:" >/dev/null` ; then
3678+/usr/sbin/useradd x2goclient -r -d /tmp/x2goclient
3679+mkdir -p /tmp/x2goclient
3680+mkdir -p /tmp/x2goclient/.x2goclient
3681+
3682+#TODO: have this built by lts.conf
3683+test -e /usr/share/ltsp/x2gothinclient_sessions && cp /usr/share/ltsp/x2gothinclient_sessions /tmp/x2goclient/.x2goclient/sessions
3684+
3685+mkdir -p /tmp/x2goclient/.kde
3686+mkdir -p /tmp/x2goclient/.kde/socket-`cat /etc/hostname`
3687+mkdir -p /tmp/x2goclient/export
3688+mkdir -p /tmp/x2goclient/logins
3689+mkdir -p /tmp/x2goclient/.ssh
3690+cp -a /etc/ssh/ssh_known_hosts /tmp/x2goclient/.ssh
3691+mkdir -p /tmp/x2goclient/.x2go
3692+chown x2goclient:x2goclient /tmp/x2goclient -Rf
3693+chmod go-rwx /tmp/x2goclient -Rf
3694+fi
3695+
3696+su - x2goclient -c 'DISPLAY=$DISPLAY bash -c \"/usr/bin/x2goclient --no-menu \
3697+ --maximize \
3698+ --link=lan \
3699+#TODO: add keyboard support from lts.conf
3700+ # --kbd-layout=us \
3701+ # --kbd-type=pc104/us \
3702+ # --set-kbd=1 \
3703+ --geometry=fullscreen \
3704+ --thinclient \
3705+ --haltbt \
3706+ --read-exports-from=/tmp/x2goclient/export \
3707+ --background=/usr/share/ltsp/background.svg \
3708+ --no-session-edit \
3709+ --session=X2Go.Example \
3710+ --add-to-known-hosts \"'
3711
3712=== modified file 'common/ltsp-common-functions'
3713--- common/ltsp-common-functions 2013-01-14 20:18:23 +0000
3714+++ common/ltsp-common-functions 2013-07-22 07:06:30 +0000
3715@@ -97,8 +97,7 @@
3716 }
3717
3718 detect_vendor() {
3719- if [ -e /etc/sysconfig/ltspdist ]; then
3720- . /etc/sysconfig/ltspdist
3721+ if [ -n "$VENDORDEF" ]; then
3722 echo "$VENDORDEF"
3723 else
3724 echo $(lsb_release --id --short | tr " " "_")
3725@@ -111,6 +110,20 @@
3726 echo $(uname -m)
3727 }
3728
3729+# copied from ltsp-build-kernel
3730+detect_latest_kernel() {
3731+ ROOT=$BASE/$arch
3732+
3733+ # If not already specified by the command line, try to find the latest kernel automatically
3734+ unset kernelversion
3735+ kernelversion="`ls -d $ROOT/lib/modules/2* | sort -nr | head -n1 | xargs basename`"
3736+ if [ ! -d $ROOT/lib/modules/$kernelversion ]; then
3737+ echo "ERROR: $0: Unable to detect installed kernel version."
3738+ exit 1
3739+ fi
3740+ return 0
3741+}
3742+
3743 require_root()
3744 {
3745 if [ ${UID:-$(id -u)} -ne 0 ]; then
3746@@ -175,6 +188,10 @@
3747
3748 debug "Started"
3749
3750+if [ -e /etc/sysconfig/ltspdist ]; then
3751+ . /etc/sysconfig/ltspdist
3752+fi
3753+
3754 # Source tool-specific settings and functions, if they're provided
3755 ltsp_tool=${0##*/}
3756 if [ -f "/usr/share/ltsp/$ltsp_tool-functions" ]; then
3757
3758=== added directory 'server/Fedora'
3759=== removed directory 'server/Fedora'
3760=== added directory 'server/Fedora/configs'
3761=== removed directory 'server/Fedora/configs'
3762=== added file 'server/Fedora/configs/dhcpd.conf'
3763--- server/Fedora/configs/dhcpd.conf 1970-01-01 00:00:00 +0000
3764+++ server/Fedora/configs/dhcpd.conf 2013-07-22 07:06:30 +0000
3765@@ -0,0 +1,36 @@
3766+#
3767+# Default LTSP dhcpd.conf config file.
3768+#
3769+ddns-update-style interim;
3770+ignore client-updates;
3771+allow booting;
3772+allow bootp;
3773+
3774+option option-128 code 128 = string;
3775+option option-129 code 129 = string;
3776+
3777+use-host-decl-names on;
3778+
3779+next-server 192.168.67.1;
3780+
3781+authoritative;
3782+
3783+subnet 192.168.67.0 netmask 255.255.255.0 {
3784+ range 192.168.67.20 192.168.67.250;
3785+ option domain-name "ltsp";
3786+ option domain-name-servers 192.168.67.1;
3787+ option broadcast-address 192.168.67.255;
3788+ option routers 192.168.67.1;
3789+ get-lease-hostnames true;
3790+ option subnet-mask 255.255.255.0;
3791+ option root-path "nfs:/opt/ltsp/i386";
3792+# Use this root-path line instead for NBD clients. Dont forget to run
3793+# ltsp-update-image!
3794+# option root-path "nbd:192.168.67.1:2000:squashfs:ro";
3795+ if substring( option vendor-class-identifier, 0, 9 ) = "PXEClient" {
3796+ filename "/ltsp/i386/pxelinux.0";
3797+ } else {
3798+ filename "/ltsp/i386/nbi.img";
3799+ }
3800+
3801+}
3802
3803=== added directory 'server/Fedora/configs/dracut'
3804=== added file 'server/Fedora/configs/dracut/ifcfg-eth0'
3805--- server/Fedora/configs/dracut/ifcfg-eth0 1970-01-01 00:00:00 +0000
3806+++ server/Fedora/configs/dracut/ifcfg-eth0 2013-07-22 07:06:30 +0000
3807@@ -0,0 +1,3 @@
3808+DEVICE=eth0
3809+BOOTPROTO=dhcp
3810+ONBOOT=no
3811
3812=== added file 'server/Fedora/configs/dracut/ltsp-dracut.conf'
3813--- server/Fedora/configs/dracut/ltsp-dracut.conf 1970-01-01 00:00:00 +0000
3814+++ server/Fedora/configs/dracut/ltsp-dracut.conf 2013-07-22 07:06:30 +0000
3815@@ -0,0 +1,28 @@
3816+logfile=/var/log/dracut.log
3817+fileloglvl=6
3818+
3819+# Specific list of dracut modules to use
3820+#dracutmodules+=""
3821+
3822+# Dracut modules to omit
3823+omit_dracutmodules+="xen crypt dmcrypt dmraid lvm multipath dasd dasd_mod resume uswsusp zfcp znet"
3824+
3825+# Dracut modules to add to the default
3826+add_dracutmodules+="unionfs nfs nbd iscsi dmsquash-live"
3827+
3828+# additional kernel modules to the default
3829+add_drivers+="fuse nbd nfsv4 nfs iscsi"
3830+
3831+# list of kernel filesystem modules to be included in the generic initramfs
3832+#filesystems+=""
3833+
3834+# build initrd only to boot current hardware
3835+hostonly="no"
3836+#
3837+
3838+# install local /etc/mdadm.conf
3839+mdadmconf="no"
3840+
3841+# install local /etc/lvm/lvm.conf
3842+lvmconf="no"
3843+
3844
3845=== added file 'server/Fedora/configs/dracut/ltsp-postinst.d'
3846--- server/Fedora/configs/dracut/ltsp-postinst.d 1970-01-01 00:00:00 +0000
3847+++ server/Fedora/configs/dracut/ltsp-postinst.d 2013-07-22 07:06:30 +0000
3848@@ -0,0 +1,57 @@
3849+#!/bin/bash
3850+
3851+# Skip first time (optimization)
3852+if [ -f /etc/dracut.conf.d/skip-first-time.conf ]; then
3853+ rm -f /etc/dracut.conf.d/skip-first-time.conf
3854+ exit 0
3855+fi
3856+
3857+if [ -f /boot/initramfs-$1.img ]; then
3858+ INITRD=initramfs-$1.img
3859+ rm -f /boot/initrd-$1.img
3860+else
3861+ INITRD=initrd-$1.img
3862+fi
3863+
3864+# Prep kernel and initrd for various types of LTSP netboot
3865+[ ! -e /etc/ltsp_chroot ] && exit 0
3866+KERNELOPTS="ro quiet selinux=0 rhgb"
3867+
3868+# Image for ELF and coreboot, Etherboot-5.4
3869+# Not using wraplinux for ELF because it cannot boot on coreboot.
3870+if [ -x /usr/sbin/mkelfImage ]; then
3871+ rm -f /boot/elf-$1.img
3872+ /usr/sbin/mkelfImage --kernel=/boot/vmlinuz-$1 --initrd=/boot/$INITRD --output=/boot/elf-$1.img --append="$KERNELOPTS"
3873+ ln -sf elf-$1.img /boot/elf.ltsp
3874+fi
3875+
3876+# Wraplinux NBI
3877+if [ -x /usr/bin/wraplinux ]; then
3878+ rm -f /boot/wraplinux-nbi-$1.img
3879+ /usr/bin/wraplinux --nbi /boot/vmlinuz-$1 --initrd /boot/$INITRD -o /boot/wraplinux-nbi-$1.img
3880+ ln -sf wraplinux-nbi-$1.img /boot/wraplinux-nbi.ltsp
3881+fi
3882+
3883+# PPC: Copy yaboot into /boot
3884+if [ -e /usr/lib/yaboot/yaboot ]; then
3885+ cp /usr/lib/yaboot/yaboot /boot/yaboot
3886+ chmod 644 /boot/yaboot
3887+fi
3888+
3889+# SPARC: Convert ELF to AOUT for OFW netboot, and use piggyback to add System.map and initrd to the image
3890+if [ -x /usr/bin/elftoaout ]; then
3891+ elftoaout /boot/vmlinuz-$1 -o /boot/aout-$1
3892+fi
3893+if [ -x /usr/bin/piggyback64 ]; then
3894+ if file /boot/vmlinuz-$1 |grep -q "ELF 64-bit"; then
3895+ PIGGY=/usr/bin/piggyback64
3896+ else
3897+ PIGGY=/usr/bin/piggyback
3898+ fi
3899+ $PIGGY /boot/aout-$1 /boot/System.map-$1 /boot/$INITRD
3900+fi
3901+
3902+# Symlink vmlinuz.ltsp and initrd.ltsp and set permissions for tftp server
3903+ln -sf vmlinuz-$1 /boot/vmlinuz.ltsp
3904+ln -sf $INITRD /boot/initrd.ltsp
3905+chmod 644 /boot/$INITRD
3906
3907=== added file 'server/Fedora/configs/dracut/ltsp-prerm.d'
3908--- server/Fedora/configs/dracut/ltsp-prerm.d 1970-01-01 00:00:00 +0000
3909+++ server/Fedora/configs/dracut/ltsp-prerm.d 2013-07-22 07:06:30 +0000
3910@@ -0,0 +1,7 @@
3911+#!/bin/bash
3912+
3913+# Remove netboot images
3914+[ ! -e /etc/ltsp_chroot ] && exit 0
3915+
3916+rm -f /boot/elf-$1.img
3917+rm -f /boot/wraplinux-nbi-$1.img
3918
3919=== added file 'server/Fedora/configs/dracut/sysconfig-dracut'
3920--- server/Fedora/configs/dracut/sysconfig-dracut 1970-01-01 00:00:00 +0000
3921+++ server/Fedora/configs/dracut/sysconfig-dracut 2013-07-22 07:06:30 +0000
3922@@ -0,0 +1,28 @@
3923+logfile=/var/log/dracut.log
3924+fileloglvl=6
3925+
3926+# Specific list of dracut modules to use
3927+#dracutmodules+=""
3928+
3929+# Dracut modules to omit
3930+omit_dracutmodules+="xen crypt dmcrypt dmraid lvm multipath dasd dasd_mod resume uswsusp zfcp znet"
3931+
3932+# Dracut modules to add to the default
3933+add_dracutmodules+="unionfs nfs nbd iscsi dmsquash-live"
3934+
3935+# additional kernel modules to the default
3936+add_drivers+="fuse nbd nfsv4 nfs"
3937+
3938+# list of kernel filesystem modules to be included in the generic initramfs
3939+#filesystems+=""
3940+
3941+# build initrd only to boot current hardware
3942+hostonly="no"
3943+#
3944+
3945+# install local /etc/mdadm.conf
3946+mdadmconf="no"
3947+
3948+# install local /etc/lvm/lvm.conf
3949+lvmconf="no"
3950+
3951
3952=== added file 'server/Fedora/configs/dracut/sysconfig-dracut-skip-first-time'
3953--- server/Fedora/configs/dracut/sysconfig-dracut-skip-first-time 1970-01-01 00:00:00 +0000
3954+++ server/Fedora/configs/dracut/sysconfig-dracut-skip-first-time 2013-07-22 07:06:30 +0000
3955@@ -0,0 +1,3 @@
3956+# Skip dracut on the first run, avoid running it twice during install
3957+# This file is deleted by chroot-creator kickstart prior to ltsp-rewrap-latest-kernel
3958+exit 0
3959
3960=== added file 'server/Fedora/configs/dracut/sysconfig-mkinitrd'
3961--- server/Fedora/configs/dracut/sysconfig-mkinitrd 1970-01-01 00:00:00 +0000
3962+++ server/Fedora/configs/dracut/sysconfig-mkinitrd 2013-07-22 07:06:30 +0000
3963@@ -0,0 +1,26 @@
3964+# OBSOLETE: Fedora 12+ and RHEL6 use dracut instead of mkinitrd
3965+# /etc/sysconfig/mkinitrd configuration directs mkinitrd to generate a netboot capable image
3966+# initrd obtains from netboot the IP address and rootfs type
3967+unset MODESETTING
3968+for name in modesetting drm; do
3969+ if [ -e /lib/modules/`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`/modules.$name ]; then
3970+ MODESETTING=$name
3971+ break
3972+ fi
3973+done
3974+if [ -n "$MODESETTING" ]; then
3975+ # F10+ has modesetting drivers, include them if they exist
3976+ availmodules="=networking =$MODESETTING"
3977+else
3978+ availmodules="=networking"
3979+fi
3980+# exclude wireless drivers because they cannot netboot, and they can often cause boot problems because of missing firmware
3981+excludemodules="rtl8187 iwl3945 iwlcore iwl4965 p54pci p54common p54usb zd1201 netwave_cs atmel zd1211rw hermes wl3501_cs rtl8180 libertas_cs libertas usb8xxx libertas_sdio spectrum_cs b43 airo_cs orinoco_nortel b43legacy atmel_pci mac80211_hwsim adm8211 hostap hostap_cs hostap_pci hostap_plx ipw2200 rndis_wlan orinoco_pci orinoco_plx orinoco_tmd orinoco airo at76_usb wavelan_cs ipw2100 rt2500usb rt61pci rt73usb rt2400pci rt2x00lib rt2x00usb rt2x00pci rt2500pci orinoco_cs ath5k atmel_cs prism54"
3982+NET_LIST="eth0"
3983+# These parameters are overridden by root="dhcp" in newer versions of mkinitrd
3984+rootfs="nfs"
3985+rootdev="server:/opt/ltsp/i386"
3986+rootopts="noatime,dhcp"
3987+BOOTPROTO="dhcp"
3988+# This option is recognized only by newer mkinitrd, but it doesn't harm older versions.
3989+root="dhcp"
3990
3991=== added file 'server/Fedora/configs/dracut/sysconfig-network'
3992--- server/Fedora/configs/dracut/sysconfig-network 1970-01-01 00:00:00 +0000
3993+++ server/Fedora/configs/dracut/sysconfig-network 2013-07-22 07:06:30 +0000
3994@@ -0,0 +1,1 @@
3995+NETWORKING=yes
3996
3997=== added file 'server/Fedora/configs/fat-client-groups'
3998--- server/Fedora/configs/fat-client-groups 1970-01-01 00:00:00 +0000
3999+++ server/Fedora/configs/fat-client-groups 2013-07-22 07:06:30 +0000
4000@@ -0,0 +1,7 @@
4001+Desktop
4002+Desktop Platform
4003+General Purpose Desktop
4004+Internet Browser
4005+Office Suite and Productivity
4006+SNMP Support
4007+Virtualization Client
4008
4009=== removed directory 'server/Fedora/configs/kickstart'
4010=== removed directory 'server/Fedora/configs/kickstart/11'
4011=== removed file 'server/Fedora/configs/kickstart/11/ltsp-i386.ks'
4012--- server/Fedora/configs/kickstart/11/ltsp-i386.ks 2011-08-12 06:17:12 +0000
4013+++ server/Fedora/configs/kickstart/11/ltsp-i386.ks 1970-01-01 00:00:00 +0000
4014@@ -1,18 +0,0 @@
4015-# Kickstart Definition for Client Chroot for i386
4016-
4017-# we are going to install into a chroot, such as /opt/ltsp/i386
4018-install
4019-
4020-repo --name=released-11-i386 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=i386
4021-repo --name=updates-11-i386 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=i386
4022-repo --name=temporary-11-i386 --baseurl=http://mplug.org/~k12linux/rpm/f11/i386/
4023-
4024-%include ../common/common.ks
4025-%include ../common/arch/i586.ks
4026-%include ../common/release/11.ks
4027-
4028-%packages --excludedocs
4029-dracut
4030-dracut-network
4031-%end
4032-
4033
4034=== removed directory 'server/Fedora/configs/kickstart/14'
4035=== removed file 'server/Fedora/configs/kickstart/14/ltsp-i386.ks'
4036--- server/Fedora/configs/kickstart/14/ltsp-i386.ks 2011-07-13 02:48:43 +0000
4037+++ server/Fedora/configs/kickstart/14/ltsp-i386.ks 1970-01-01 00:00:00 +0000
4038@@ -1,12 +0,0 @@
4039-# Kickstart Definition for Client Chroot for i686
4040-
4041-# we are going to install into a chroot, such as /opt/ltsp/i386
4042-install
4043-
4044-repo --name=released-14-i686 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386
4045-repo --name=updates-14-i686 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386
4046-repo --name=temporary-14-i686 --baseurl=http://mplug.org/~k12linux/rpm/f14/i686/
4047-
4048-%include ../common/common.ks
4049-%include ../common/arch/i686.ks
4050-%include ../common/release/14.ks
4051
4052=== removed file 'server/Fedora/configs/kickstart/14/ltsp-x86_64.ks'
4053--- server/Fedora/configs/kickstart/14/ltsp-x86_64.ks 2011-07-13 02:48:43 +0000
4054+++ server/Fedora/configs/kickstart/14/ltsp-x86_64.ks 1970-01-01 00:00:00 +0000
4055@@ -1,12 +0,0 @@
4056-# Kickstart Definition for Client Chroot for i686 and generic x86_64
4057-
4058-# we are going to install into a chroot, such as /opt/ltsp/x86_64
4059-install
4060-
4061-repo --name=released-14-x86_64 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=x86_64
4062-repo --name=updates-14-x86_64 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=x86_64
4063-repo --name=temporary-14-x86_64 --baseurl=http://mplug.org/~k12linux/rpm/f14/x86_64/
4064-
4065-%include ../common/common.ks
4066-%include ../common/arch/x86_64.ks
4067-%include ../common/release/14.ks
4068
4069=== removed directory 'server/Fedora/configs/kickstart/common'
4070=== removed directory 'server/Fedora/configs/kickstart/common/arch'
4071=== removed file 'server/Fedora/configs/kickstart/common/arch/i586.ks'
4072--- server/Fedora/configs/kickstart/common/arch/i586.ks 2011-08-12 06:17:12 +0000
4073+++ server/Fedora/configs/kickstart/common/arch/i586.ks 1970-01-01 00:00:00 +0000
4074@@ -1,7 +0,0 @@
4075-%packages --excludedocs
4076-kernel.i586
4077-glibc.i586
4078-openssl.i586
4079-wraplinux
4080-mkelfimage
4081-%end
4082
4083=== removed file 'server/Fedora/configs/kickstart/common/arch/i686.ks'
4084--- server/Fedora/configs/kickstart/common/arch/i686.ks 2011-08-09 08:47:49 +0000
4085+++ server/Fedora/configs/kickstart/common/arch/i686.ks 1970-01-01 00:00:00 +0000
4086@@ -1,7 +0,0 @@
4087-%packages --excludedocs
4088-kernel.i686
4089-glibc.i686
4090-openssl.i686
4091-wraplinux
4092-mkelfimage
4093-%end
4094
4095=== removed file 'server/Fedora/configs/kickstart/common/arch/ppc.ks'
4096--- server/Fedora/configs/kickstart/common/arch/ppc.ks 2009-01-22 03:46:50 +0000
4097+++ server/Fedora/configs/kickstart/common/arch/ppc.ks 1970-01-01 00:00:00 +0000
4098@@ -1,6 +0,0 @@
4099-%packages --excludedocs
4100-kernel.ppc
4101-glibc.ppc
4102-openssl.ppc
4103-yaboot
4104-%end
4105
4106=== removed file 'server/Fedora/configs/kickstart/common/arch/x86_64.ks'
4107--- server/Fedora/configs/kickstart/common/arch/x86_64.ks 2009-01-22 03:46:50 +0000
4108+++ server/Fedora/configs/kickstart/common/arch/x86_64.ks 1970-01-01 00:00:00 +0000
4109@@ -1,7 +0,0 @@
4110-%packages --excludedocs
4111-kernel.x86_64
4112-glibc.x86_64
4113-openssl.x86_64
4114-wraplinux
4115-mkelfimage
4116-%end
4117
4118=== removed file 'server/Fedora/configs/kickstart/common/common.ks'
4119--- server/Fedora/configs/kickstart/common/common.ks 2011-08-09 10:12:33 +0000
4120+++ server/Fedora/configs/kickstart/common/common.ks 1970-01-01 00:00:00 +0000
4121@@ -1,200 +0,0 @@
4122-### Include this from other .ks files
4123-
4124-# this is just garbage, it is not used, but if left empty the user is prompted
4125-rootpw --iscrypted $1$7RBvKHQ2$gozxTbUdO9.xBncKZQ9760
4126-
4127-# should be selectable...
4128-lang en_US.UTF-8
4129-keyboard us
4130-firewall --enabled --port=22:tcp
4131-network --bootproto=dhcp --device=eth0
4132-authconfig --enableshadow --enablemd5
4133-selinux --disabled
4134-timezone --utc America/Los_Angeles
4135-
4136-# cookie-cutter stuff from here
4137-bootloader --location=none
4138-reboot
4139-
4140-# this could probably be slimmed-down quite a bit
4141-%packages --excludedocs
4142-k12linux-release
4143-ltsp-client
4144-ltspfsd
4145-ldm
4146-alsa-utils
4147-alsa-plugins-pulseaudio
4148-atk
4149-audit-libs
4150-audit-libs-python
4151-basesystem
4152-bash
4153-bind-libs
4154-bind-utils
4155-bitmap-fonts
4156-bzip2-libs
4157-cairo
4158-chkconfig
4159-coreutils
4160-cpio
4161-cpp
4162-cracklib
4163-cracklib-dicts
4164-cups-libs
4165-cyrus-sasl-lib
4166-db4
4167-dbus
4168-device-mapper
4169-diffutils
4170-dmraid
4171-e2fsprogs
4172-e2fsprogs-libs
4173-pulseaudio-esound-compat
4174-elfutils-libelf
4175-ethtool
4176-expat
4177-filesystem
4178-findutils
4179-fontconfig
4180-freetype
4181-fuse-sshfs
4182-gawk
4183-gdbm
4184-glib2
4185-glibc-common
4186-gnutls
4187-#gphoto2
4188-grep
4189-gzip
4190-hpijs
4191-hwdata
4192-info
4193-initscripts
4194-iproute
4195-iputils
4196-kpartx
4197-krb5-libs
4198-#kudzu
4199-less
4200-libacl
4201-libattr
4202-libcap
4203-libdmx
4204-libdrm
4205-libexif
4206-libfontenc
4207-#libFS
4208-libgcc
4209-libgcrypt
4210-libgpg-error
4211-libICE
4212-libieee1284
4213-libjpeg
4214-libpng
4215-libsane-hpaio
4216-libselinux
4217-libselinux-python
4218-libsemanage
4219-libsepol
4220-libSM
4221-libstdc++
4222-libtiff
4223-libusb
4224-libuser
4225-libX11
4226-libXau
4227-libXaw
4228-libXdmcp
4229-libXext
4230-libXfont
4231-libXft
4232-libXi
4233-libXinerama
4234-libxkbfile
4235-libxml2
4236-libxml2-python
4237-libXmu
4238-libXpm
4239-libXrandr
4240-libXrender
4241-libXt
4242-libXtst
4243-libXv
4244-libXxf86dga
4245-libXxf86misc
4246-libXxf86vm
4247-lockdev
4248-lvm2
4249-MAKEDEV
4250-mcstrans
4251-mesa-libGL
4252-mingetty
4253-module-init-tools
4254-nbd
4255-nc
4256-ncurses
4257-neon
4258-net-snmp-libs
4259-net-tools
4260-openldap
4261-openssh-clients
4262-pam
4263-passwd
4264-pcre
4265-perl
4266-popt
4267-rpcbind
4268-plymouth-plugin-solar
4269-procps
4270-psmisc
4271-pulseaudio-utils
4272-pulseaudio-module-x11
4273-python
4274-#python-sqlite2
4275-python-urlgrabber
4276-readline
4277-rpm
4278-rpm-libs
4279-rpm-python
4280-sane-backends
4281-sane-backends-libs
4282-sed
4283-setup
4284-shadow-utils
4285-sqlite
4286-system-release
4287-rsyslog
4288-#system-config-display
4289-system-config-firewall-tui
4290-tar
4291-tftp
4292-time
4293-ttmkfdir
4294-tzdata
4295-udev
4296-util-linux-ng
4297-which
4298-xkeyboard-config
4299-xorg-x11-drivers
4300-xorg-x11-fonts-100dpi
4301-xorg-x11-server-utils
4302-xorg-x11-server-Xorg
4303-xorg-x11-xauth
4304-#xorg-x11-xfs
4305-xorg-x11-xkb-utils
4306-xorg-x11-xinit
4307-xterm
4308-ypbind
4309-yp-tools
4310-yum
4311-yum-metadata-parser
4312-zlib
4313-%end
4314-
4315-%post
4316-if [ -f /usr/sbin/plymouth-set-default-theme ]; then
4317- /usr/sbin/plymouth-set-default-theme -r
4318- /usr/sbin/ltsp-rewrap-latest-kernel
4319-fi
4320-%end
4321-
4322
4323=== removed directory 'server/Fedora/configs/kickstart/common/release'
4324=== removed file 'server/Fedora/configs/kickstart/common/release/11.ks'
4325--- server/Fedora/configs/kickstart/common/release/11.ks 2011-08-12 06:17:12 +0000
4326+++ server/Fedora/configs/kickstart/common/release/11.ks 1970-01-01 00:00:00 +0000
4327@@ -1,5 +0,0 @@
4328-%packages --excludedocs
4329-dejavu-sans-fonts
4330-dejavu-sans-mono-fonts
4331-dejavu-serif-fonts
4332-%end
4333
4334=== removed file 'server/Fedora/configs/kickstart/common/release/14.ks'
4335--- server/Fedora/configs/kickstart/common/release/14.ks 2011-08-09 00:59:16 +0000
4336+++ server/Fedora/configs/kickstart/common/release/14.ks 1970-01-01 00:00:00 +0000
4337@@ -1,11 +0,0 @@
4338-%packages --excludedocs
4339-# needed for lspci
4340-pciutils
4341-plymouth-system-theme
4342-dejavu-sans-fonts
4343-dejavu-sans-mono-fonts
4344-dejavu-serif-fonts
4345-dracut-network
4346-# needed for lokkit which is needed by livecd-creator
4347-system-config-firewall-base
4348-%end
4349
4350=== removed file 'server/Fedora/configs/kickstart/common/release/el6.ks'
4351--- server/Fedora/configs/kickstart/common/release/el6.ks 2011-08-10 09:30:25 +0000
4352+++ server/Fedora/configs/kickstart/common/release/el6.ks 1970-01-01 00:00:00 +0000
4353@@ -1,12 +0,0 @@
4354-%packages --excludedocs
4355-epel-release
4356-# needed for lspci
4357-pciutils
4358-plymouth-system-theme
4359-dejavu-sans-fonts
4360-dejavu-sans-mono-fonts
4361-dejavu-serif-fonts
4362-dracut-network
4363-# needed for lokkit which is needed by livecd-creator
4364-system-config-firewall-base
4365-%end
4366
4367=== removed directory 'server/Fedora/configs/kickstart/el6'
4368=== removed file 'server/Fedora/configs/kickstart/el6/ltsp-i386.ks'
4369--- server/Fedora/configs/kickstart/el6/ltsp-i386.ks 2011-08-10 11:31:24 +0000
4370+++ server/Fedora/configs/kickstart/el6/ltsp-i386.ks 1970-01-01 00:00:00 +0000
4371@@ -1,27 +0,0 @@
4372-# Kickstart Definition for Client Chroot for i686
4373-
4374-# we are going to install into a chroot, such as /opt/ltsp/i386
4375-install
4376-
4377-repo --name=sl6-os-i686 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/i386/os/
4378-repo --name=sl6-fastbugs-i686 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/i386/updates/fastbugs/
4379-repo --name=sl6-security-i686 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/i386/updates/security/
4380-repo --name=epel6-i686 --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=i386
4381-repo --name=temporary-el6-i686 --baseurl=http://mplug.org/~k12linux/rpm/el6/i686/
4382-
4383-%include ../common/common.ks
4384-#%include ../common/arch/i686.ks
4385-%include ../common/release/el6.ks
4386-
4387-# EL6 i686 uses a custom kernel
4388-# * Disable PAE
4389-# * Enable nbd.ko
4390-# * Turn off many other drivers to make it smaller
4391-%packages --excludedocs
4392-kernel-thinclient.i686
4393-glibc.i686
4394-openssl.i686
4395-wraplinux
4396-mkelfimage
4397-%end
4398-
4399
4400=== removed file 'server/Fedora/configs/kickstart/el6/ltsp-x86_64.ks'
4401--- server/Fedora/configs/kickstart/el6/ltsp-x86_64.ks 2011-07-26 21:45:15 +0000
4402+++ server/Fedora/configs/kickstart/el6/ltsp-x86_64.ks 1970-01-01 00:00:00 +0000
4403@@ -1,14 +0,0 @@
4404-# Kickstart Definition for Client Chroot for x86_64
4405-
4406-# we are going to install into a chroot, such as /opt/ltsp/x86_64
4407-install
4408-
4409-repo --name=sl6-os-x86_64 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/x86_64/os/
4410-repo --name=sl6-fastbugs-x86_64 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/x86_64/updates/fastbugs/
4411-repo --name=sl6-security-x86_64 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/x86_64/updates/security/
4412-repo --name=epel6-x86_64 --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=x86_64
4413-repo --name=temporary-el6-x86_64 --baseurl=http://mplug.org/~k12linux/rpm/el6/x86_64/
4414-
4415-%include ../common/common.ks
4416-%include ../common/arch/x86_64.ks
4417-%include ../common/release/el6.ks
4418
4419=== added file 'server/Fedora/configs/lts.conf'
4420--- server/Fedora/configs/lts.conf 1970-01-01 00:00:00 +0000
4421+++ server/Fedora/configs/lts.conf 2013-07-22 07:06:30 +0000
4422@@ -0,0 +1,81 @@
4423+# If using NFS, lts.conf goes in /opt/ltsp/<arch>/etc/lts.conf.
4424+# For NBD (the default in Ubuntu), /var/lib/tftpboot/ltsp/<arch>/lts.conf
4425+# is used instead.
4426+# A list of directives is available at http://manpages.ubuntu.com/lts.conf
4427+# or your installed lts.conf man page.
4428+# Lines starting with '#' are comments.
4429+# Avoid empty [Sections] as they're considered syntax errors.
4430+
4431+
4432+# This section applies to all clients and is overriden by the other sections.
4433+[Default]
4434+#SERVER=192.168.67.1
4435+# For troubleshooting, the following open a local console with Alt+Ctrl+F2.
4436+#SCREEN_02=shell
4437+SCREEN_07=ldm
4438+
4439+# Don't encrypt X traffic. Gives much faster graphics at a security cost.
4440+LDM_DIRECTX=True
4441+
4442+# If you're using Unity, you might want to install gnome-session-fallback and
4443+# use it by default instead, as it performs better on LTSP thin clients.
4444+#LDM_SESSION="gnome-fallback"
4445+
4446+# Force all clients to a specific resolution.
4447+#XRANDR_MODE_0=1024x768
4448+
4449+# If the default 16bit color mode is giving you problems on thin clients:
4450+#X_SMART_COLOR_DEPTH=False
4451+
4452+# A space separated list of services to disable on thin/fat clients.
4453+RM_SYSTEM_SERVICES="dnsmasq nbd-server iptables"
4454+
4455+# An additional list of services to disable on thin clients only.
4456+RM_THIN_SYSTEM_SERVICES="qemu-kvm virtualbox iptables"
4457+
4458+# Use any local swap partitions on the clients.
4459+USE_LOCAL_SWAP=True
4460+
4461+# Provide a "Login as Guest" button, which uses LDM_USERNAME/LDM_PASSWORD.
4462+#LDM_GUESTLOGIN=False
4463+
4464+# Automatically login clients with the specified LDM_USERNAME/LDM_PASSWORD.
4465+#LDM_AUTOLOGIN=False
4466+
4467+# Some other frequently used directives, described in the lts.conf manpage.
4468+# For really low RAM clients, disable SOUND, LOCAL_APPS and LOCALDEV.
4469+#SOUND=False
4470+#VOLUME=50
4471+#LOCAL_APPS=True
4472+#LOCAL_APPS_EXTRAMOUNTS=/srv
4473+#LOCALDEV=False
4474+#LOCALDEV_DENY_INTERNAL_DISKS=False
4475+#FSTAB_1="server:/home /home nfs defaults,nolock 0 0"
4476+#XSERVER=vesa
4477+#X_BLANKING=0
4478+#X_NUMLOCK=True
4479+#XKBLAYOUT="us,gr"
4480+#XKBOPTIONS="grp:alt_shift_toggle,grp_led:scroll"
4481+#LDM_LIMIT_ONE_SESSION=True
4482+#LDM_LIMIT_ONE_SESSION_PROMPT=True
4483+#LDM_PRINTER_DEFAULT="psc-1310-series"
4484+#OVERLAY="yes"
4485+
4486+# You can define sections to be included later on with "LIKE" directives.
4487+[OLD_MONITOR]
4488+# The following directives are useful in cases where the driver can't detect
4489+# the (possibly old CRT) monitor timings and only offers low resolutions.
4490+# Consult your monitor manual for the correct values, those are for 1024x768.
4491+X_HORZSYNC=30.0-88.0
4492+X_VERTREFRESH=50.0-88.0
4493+
4494+
4495+# You can specify directives per client with MAC address (or IP or hostname)
4496+# based sections.
4497+# One way to get their MAC addresses is to run `arp -n` when they're at LDM.
4498+#[A1:B1:C2:D4:E5:F6]
4499+#HOSTNAME=pc01
4500+#LDM_USERNAME=user01
4501+#LDM_PASSWORD=pass01
4502+# Include another section.
4503+#LIKE=OLD_MONITOR
4504
4505=== added file 'server/Fedora/configs/ltsp-build-client.conf'
4506--- server/Fedora/configs/ltsp-build-client.conf 1970-01-01 00:00:00 +0000
4507+++ server/Fedora/configs/ltsp-build-client.conf 2013-07-22 07:06:30 +0000
4508@@ -0,0 +1,10 @@
4509+### Redhat EL6 Build Client Configuration ###
4510+#
4511+# By default ltsp-build-client will install a chroot matching your OS into /opt/ltsp/i386.
4512+# You can either override options using --option=value or override them here in this config file.
4513+# See /usr/share/ltsp/plugins/ltsp-build-client for more possible options.
4514+#
4515+## Persistent RPM Cache Directory --cachedir=/path/to/cachedir
4516+# option_cache_value=/var/cache/chroot
4517+## Target Architecture --arch=i386|x86_64|ppc|ppc64 etc.
4518+option_arch_value=i386
4519
4520=== added file 'server/Fedora/configs/ltsp-server.conf'
4521--- server/Fedora/configs/ltsp-server.conf 1970-01-01 00:00:00 +0000
4522+++ server/Fedora/configs/ltsp-server.conf 2013-07-22 07:06:30 +0000
4523@@ -0,0 +1,23 @@
4524+# /etc/ltsp/ltsp-server.conf
4525+# Contains variables which are shared by ltsp-tools.
4526+#VENDORDEF="Fedora"
4527+#RELEASEDEF=18
4528+
4529+VENDORDEF="RHEL"
4530+RELEASEDEF=el6
4531+
4532+# The LTSP base directory. Defaults to "/opt/ltsp".
4533+#BASE="/opt/ltsp"
4534+
4535+# Space-separated list of TFTP directories to update kernels and initrd's to.
4536+# Defaults to "/var/lib/tftpboot /tftpboot /srv/tftp".
4537+TFTP_DIRS="/var/lib/tftpboot"
4538+
4539+# The LTSP subdirectory within the TFTP base directory.
4540+# Defaults to "ltsp".
4541+#TFTP_BOOT_DIR="students"
4542+
4543+# The default network device that the server will be using for ltsp-dhcpd.
4544+LTSP_DEV=eth1
4545+# Changes this to the IP address of the server
4546+LTSP_DEFAULTIP="192.168.67.1"
4547
4548=== added directory 'server/Fedora/configs/mock'
4549=== added file 'server/Fedora/configs/mock/fat-groups.list'
4550--- server/Fedora/configs/mock/fat-groups.list 1970-01-01 00:00:00 +0000
4551+++ server/Fedora/configs/mock/fat-groups.list 2013-07-22 07:06:30 +0000
4552@@ -0,0 +1,7 @@
4553+Desktop
4554+Desktop Platform
4555+General Purpose Desktop
4556+Internet Browser
4557+Office Suite and Productivity
4558+SNMP Support
4559+Virtualization Client
4560
4561=== added file 'server/Fedora/configs/mock/logging.ini'
4562--- server/Fedora/configs/mock/logging.ini 1970-01-01 00:00:00 +0000
4563+++ server/Fedora/configs/mock/logging.ini 2013-07-22 07:06:30 +0000
4564@@ -0,0 +1,84 @@
4565+[formatters]
4566+keys: detailed,simple,unadorned,state
4567+
4568+[handlers]
4569+keys: simple_console,detailed_console,unadorned_console,simple_console_warnings_only
4570+
4571+[loggers]
4572+keys: root,build,state,mockbuild
4573+
4574+[formatter_state]
4575+format: %(asctime)s - %(message)s
4576+
4577+[formatter_unadorned]
4578+format: %(message)s
4579+
4580+[formatter_simple]
4581+format: %(levelname)s: %(message)s
4582+
4583+;useful for debugging:
4584+[formatter_detailed]
4585+format: %(levelname)s %(filename)s:%(lineno)d: %(message)s
4586+
4587+[handler_unadorned_console]
4588+class: StreamHandler
4589+args: []
4590+formatter: unadorned
4591+level: INFO
4592+
4593+[handler_simple_console]
4594+class: StreamHandler
4595+args: []
4596+formatter: simple
4597+level: INFO
4598+
4599+[handler_simple_console_warnings_only]
4600+class: StreamHandler
4601+args: []
4602+formatter: simple
4603+level: WARNING
4604+
4605+[handler_detailed_console]
4606+class: StreamHandler
4607+args: []
4608+formatter: detailed
4609+level: WARNING
4610+
4611+; usually dont want to set a level for loggers
4612+; this way all handlers get all messages, and messages can be filtered
4613+; at the handler level
4614+;
4615+; all these loggers default to a console output handler
4616+;
4617+[logger_root]
4618+level: NOTSET
4619+handlers: simple_console
4620+
4621+; mockbuild logger normally has no output
4622+; catches stuff like mockbuild.trace_decorator and mockbuild.util
4623+; dont normally want to propagate to root logger, either
4624+[logger_mockbuild]
4625+level: NOTSET
4626+handlers:
4627+qualname: mockbuild
4628+propagate: 1
4629+
4630+[logger_state]
4631+level: NOTSET
4632+; unadorned_console only outputs INFO or above
4633+handlers: unadorned_console
4634+qualname: mockbuild.Root.state
4635+propagate: 0
4636+
4637+[logger_build]
4638+level: NOTSET
4639+handlers: simple_console_warnings_only
4640+qualname: mockbuild.Root.build
4641+propagate: 0
4642+
4643+; the following is a list mock logger qualnames used within the code:
4644+;
4645+; qualname: mockbuild.util
4646+; qualname: mockbuild.uid
4647+; qualname: mockbuild.trace_decorator
4648+
4649
4650=== added file 'server/Fedora/configs/mock/ltsp-template.cfg'
4651--- server/Fedora/configs/mock/ltsp-template.cfg 1970-01-01 00:00:00 +0000
4652+++ server/Fedora/configs/mock/ltsp-template.cfg 2013-07-22 07:06:30 +0000
4653@@ -0,0 +1,58 @@
4654+config_opts['basedir'] = '/opt/ltsp/mock/'
4655+config_opts['cache_topdir'] = '/var/cache/mock'
4656+config_opts['root'] = 'i386'
4657+config_opts['target_arch'] = 'i686'
4658+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
4659+config_opts['chroot_setup_cmd'] = 'groupinstall Base'
4660+config_opts['dist'] = 'el6' # only useful for --resultdir variable subst
4661+
4662+config_opts['yum.conf'] = """
4663+[main]
4664+cachedir=/var/cache/mock
4665+debuglevel=1
4666+reposdir=/dev/null
4667+logfile=/var/log/ltsp-build-client.log
4668+retries=20
4669+obsoletes=1
4670+gpgcheck=0
4671+assumeyes=1
4672+syslog_ident=ltsp
4673+syslog_device=
4674+
4675+# repos
4676+[base]
4677+name=BaseOS
4678+enabled=1
4679+baseurl=http://mirror.lstn.net/scientific/6.3/i386/os/
4680+failovermethod=priority
4681+
4682+[fastbugs]
4683+name=updates
4684+enabled=1
4685+baseurl=http://mirror.lstn.net/scientific/6.3/i386/updates/fastbugs/
4686+failovermethod=priority
4687+
4688+[epel]
4689+name=epel
4690+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=i386
4691+failovermethod=priority
4692+
4693+[security]
4694+name=security
4695+enabled=1
4696+baseurl=http://mirror.lstn.net/scientific/6.3/i386/updates/security/
4697+failovermethod=priority
4698+
4699+# do something like this if you want to point to a local repo
4700+[local]
4701+name=local
4702+baseurl=http://192.168.67.1/repo/rpm/el6/i686/
4703+cost=2000
4704+enabled=0
4705+
4706+[ltsp]
4707+name=ltsp
4708+baseurl=http://mirror.ancl.hawaii.edu/~k12linux/rpm/el6/i386/
4709+failovermethod=priority
4710+enabled=1
4711+"""
4712
4713=== added file 'server/Fedora/configs/mock/ltsp.cfg'
4714--- server/Fedora/configs/mock/ltsp.cfg 1970-01-01 00:00:00 +0000
4715+++ server/Fedora/configs/mock/ltsp.cfg 2013-07-22 07:06:30 +0000
4716@@ -0,0 +1,17 @@
4717+[ltsp]
4718+name=ltsp
4719+#baseurl=http://ltsprepo.s3.amazonaws.com/rpm/DIST/ARCH/
4720+mirrorlist=http://ltsp.repo.inode0.com/mirrorlist.php?dist=DIST&arch=ARCH&repo=ltsp
4721+failovermethod=priority
4722+enabled=1
4723+
4724+[X11_RemoteDesktop_x2go]
4725+name=X2go - after NoMachine ditched the open version (Fedora_18)
4726+type=rpm-md
4727+baseurl=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_18/
4728+gpgcheck=1
4729+gpgkey=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_18/repodata/repomd.xml.key
4730+enabled=1
4731+
4732+"""
4733+
4734
4735=== added file 'server/Fedora/configs/mock/site-defaults.cfg'
4736--- server/Fedora/configs/mock/site-defaults.cfg 1970-01-01 00:00:00 +0000
4737+++ server/Fedora/configs/mock/site-defaults.cfg 2013-07-22 07:06:30 +0000
4738@@ -0,0 +1,153 @@
4739+# mock defaults
4740+# vim:tw=0:ts=4:sw=4:et:
4741+#
4742+# This config file is for site-specific default values that apply across all
4743+# configurations. Options specified in this config file can be overridden in
4744+# the individual mock config files.
4745+#
4746+# The site-defaults.cfg delivered by default has NO options set. Only set
4747+# options here if you want to override the defaults.
4748+#
4749+# Entries in this file follow the same format as other mock config files.
4750+# config_opts['foo'] = bar
4751+
4752+#############################################################################
4753+#
4754+# Things that we recommend you set in site-defaults.cfg:
4755+#
4756+config_opts['basedir'] = '/opt/ltsp/mock/'
4757+config_opts['cache_topdir'] = '/var/cache/mock'
4758+# Note: the path pointed to by basedir and cache_topdir must be owned
4759+# by group 'mock' and must have mode: g+rws
4760+# config_opts['rpmbuild_timeout'] = 0
4761+# config_opts['use_host_resolv'] = True
4762+
4763+# You can configure log format to pull from logging.ini formats of these names:
4764+# config_opts['build_log_fmt_name'] = "unadorned"
4765+# config_opts['root_log_fmt_name'] = "detailed"
4766+# config_opts['state_log_fmt_name'] = "state"
4767+#
4768+# mock will normally set up a minimal chroot /dev.
4769+# If you want to use a pre-configured /dev, disable this and use the bind-mount
4770+# plugin to mount your special /dev
4771+# config_opts['internal_dev_setup'] = True
4772+#
4773+# internal_setarch defaults to 'True' if the python 'ctypes' package is
4774+# available. It is in the python std lib on >= python 2.5. On older versions,
4775+# it is available as an addon. On systems w/o ctypes, it will default to 'False'
4776+# config_opts['internal_setarch'] = False
4777+#
4778+# the cleanup_on_* options allow you to automatically clean and remove the
4779+# mock build directory, but only take effect if --resultdir is used.
4780+# config_opts provides fine-grained control. cmdline only has big hammer
4781+#
4782+config_opts['cleanup_on_success'] = 0
4783+# config_opts['cleanup_on_failure'] = 1
4784+
4785+# if you want mock to automatically run createrepo on the rpms in your
4786+# resultdir.
4787+# config_opts['createrepo_on_rpms'] = False
4788+# config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
4789+
4790+#############################################################################
4791+#
4792+# plugin related. Below are the defaults. Change to suit your site
4793+# policy. site-defaults.cfg is a good place to do this.
4794+#
4795+# NOTE: Some of the caching options can theoretically affect build
4796+# reproducability. Change with care.
4797+#
4798+# config_opts['plugin_conf']['package_state_enable'] = True
4799+# config_opts['plugin_conf']['ccache_enable'] = True
4800+# config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '4G'
4801+# config_opts['plugin_conf']['ccache_opts']['compress'] = None
4802+# config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/%(root)s/ccache/"
4803+# config_opts['plugin_conf']['yum_cache_enable'] = True
4804+# config_opts['plugin_conf']['yum_cache_opts']['max_age_days'] = 30
4805+# config_opts['plugin_conf']['yum_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/yum_cache/"
4806+# config_opts['plugin_conf']['root_cache_enable'] = True
4807+# config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 15
4808+# config_opts['plugin_conf']['root_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/root_cache/"
4809+# config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "pigz"
4810+# config_opts['plugin_conf']['root_cache_opts']['extension'] = ".gz"
4811+# config_opts['plugin_conf']['root_cache_opts']['exclude_dirs'] = ["./proc", "./sys", "./dev",
4812+# "./tmp/ccache", "./var/cache/yum" ]
4813+#
4814+# bind mount plugin is enabled by default but has no configured directories to
4815+# mount
4816+# config_opts['plugin_conf']['bind_mount_enable'] = True
4817+# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/host/path', '/bind/mount/path/in/chroot/' ))
4818+#
4819+# config_opts['plugin_conf']['tmpfs_enable'] = False
4820+# config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
4821+# config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '512m'
4822+
4823+#############################################################################
4824+#
4825+# environment for chroot
4826+#
4827+# config_opts['environment']['TERM'] = 'vt100'
4828+# config_opts['environment']['SHELL'] = '/bin/bash'
4829+# config_opts['environment']['HOME'] = '/builddir'
4830+# config_opts['environment']['HOSTNAME'] = 'mock'
4831+# config_opts['environment']['PATH'] = '/usr/bin:/bin:/usr/sbin:/sbin'
4832+# config_opts['environment']['PROMPT_COMMAND'] = 'echo -n "<mock-chroot>"'
4833+config_opts['environment']['LANG'] = os.environ.setdefault('LANG', 'en_US.UTF-8')
4834+#config_opts['environment']['TZ'] = os.environ.setdefault('TZ', 'CST6CDT')
4835+
4836+#############################################################################
4837+#
4838+# Things that you can change, but we dont recommend it:
4839+# config_opts['chroothome'] = '/var/cache/mock'
4840+# config_opts['clean'] = False
4841+
4842+#############################################################################
4843+#
4844+# Things that must be adjusted if SCM integration is used:
4845+#
4846+# config_opts['scm'] = True
4847+# config_opts['scm_opts']['method'] = 'git'
4848+# config_opts['scm_opts']['cvs_get'] = 'cvs -d /srv/cvs co SCM_BRN SCM_PKG'
4849+# config_opts['scm_opts']['git_get'] = 'git clone SCM_BRN git://localhost/SCM_PKG.git SCM_PKG'
4850+# config_opts['scm_opts']['svn_get'] = 'svn co file:///srv/svn/SCM_PKG/SCM_BRN SCM_PKG'
4851+# config_opts['scm_opts']['spec'] = 'SCM_PKG.spec'
4852+# config_opts['scm_opts']['ext_src_dir'] = '/dev/null'
4853+# config_opts['scm_opts']['write_tar'] = True
4854+# config_opts['scm_opts']['git_timestamps'] = True
4855+
4856+# These options are also recognized but usually defined in cmd line
4857+# with --scm-option package=<pkg> --scm-option branch=<branch>
4858+# config_opts['scm_opts']['package'] = 'mypkg'
4859+# config_opts['scm_opts']['branch'] = 'master'
4860+
4861+#############################################################################
4862+#
4863+# Things that are best suited for individual chroot config files:
4864+#
4865+# MUST SET (in individual chroot cfg file):
4866+# config_opts['root'] = 'name-of-yum-build-dir'
4867+# config_opts['target_arch'] = 'i386'
4868+# config_opts['yum.conf'] = ''
4869+# config_opts['yum_common_opts'] = []
4870+#
4871+# CAN SET, defaults usually work ok:
4872+# config_opts['chroot_setup_cmd'] = 'install buildsys-build'
4873+# config_opts['log_config_file'] = 'logging.ini'
4874+# config_opts['more_buildreqs']['srpm_name-version-release'] = 'dependencies'
4875+# config_opts['macros']['%Add_your_macro_name_here'] = "add macro value here"
4876+# config_opts['files']['path/name/no/leading/slash'] = "put file contents here."
4877+# config_opts['chrootuid'] = os.getuid()
4878+
4879+# If you change chrootgid, you must also change "mock" to the correct group
4880+# name in this line of the mock PAM config:
4881+# auth sufficient pam_succeed_if.so user ingroup mock use_uid quiet
4882+# config_opts['chrootgid'] = grp.getgrnam("mock")[2]
4883+
4884+# config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s -n %(user)s' # Fedora/RedHat
4885+#
4886+# Security related
4887+# config_opts['no_root_shells'] = False
4888+#
4889+# Proxy settings (https_proxy, ftp_proxy, and no_proxy can also be set)
4890+# config_opts['http_proxy'] = 'http://localhost:3128'
4891+
4892
4893=== added file 'server/Fedora/configs/nbdswapd.conf'
4894--- server/Fedora/configs/nbdswapd.conf 1970-01-01 00:00:00 +0000
4895+++ server/Fedora/configs/nbdswapd.conf 2013-07-22 07:06:30 +0000
4896@@ -0,0 +1,4 @@
4897+
4898+SWAPDIR=/var/lib/ltsp/swapfiles
4899+SIZE=64
4900+
4901
4902=== added file 'server/Fedora/configs/pxe-default.conf'
4903--- server/Fedora/configs/pxe-default.conf 1970-01-01 00:00:00 +0000
4904+++ server/Fedora/configs/pxe-default.conf 2013-07-22 07:06:30 +0000
4905@@ -0,0 +1,5 @@
4906+DEFAULT linux
4907+ LABEL linux
4908+ SAY Booting Linux
4909+ KERNEL vmlinuz.ltsp
4910+ APPEND rw initrd=initrd.ltsp init=/sbin/init-ltsp selinux=0 root=dhcp rhgb video=LVDS-1:d rdshell
4911
4912=== added directory 'server/Fedora/configs/services'
4913=== removed directory 'server/Fedora/configs/services'
4914=== added file 'server/Fedora/configs/services/ltsp-dhcpd.init'
4915--- server/Fedora/configs/services/ltsp-dhcpd.init 1970-01-01 00:00:00 +0000
4916+++ server/Fedora/configs/services/ltsp-dhcpd.init 2013-07-22 07:06:30 +0000
4917@@ -0,0 +1,156 @@
4918+#!/bin/sh
4919+#
4920+### BEGIN INIT INFO
4921+# Provides: ltsp-dhcpd
4922+# Default-Start:
4923+# Default-Stop: 0 1 6
4924+# Should-Start:
4925+# Required-Start: $network
4926+# Required-Stop:
4927+# Short-Description: Start and stop the DHCP server
4928+# Description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP)
4929+# server.
4930+### END INIT INFO
4931+#
4932+# The fields below are left around for legacy tools (will remove later).
4933+#
4934+# chkconfig: - 98 35
4935+# description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP) \
4936+# server
4937+# processname: dhcpd
4938+# config: /etc/ltsp/dhcpd.conf
4939+# config: /var/lib/dhcpd/dhcpd.leases
4940+# pidfile: /var/run/dhcpd.pid
4941+
4942+. /etc/init.d/functions
4943+
4944+RETVAL=0
4945+
4946+prog=dhcpd
4947+dhcpd=/usr/sbin/dhcpd
4948+lockfile=/var/lock/subsys/ltsp-dhcpd
4949+pidfile=/var/run/ltsp-dhcpd.pid
4950+
4951+[ -f /etc/sysconfig/ltsp-dhcpd ] && . /etc/sysconfig/ltsp-dhcpd
4952+
4953+# if the user specified a different config file, make sure we reference it
4954+findConfig() {
4955+ for arg in $DHCPDARGS ; do
4956+ if [ "$found" = 1 ]; then
4957+ [ -f "$arg" ] && echo "$arg"
4958+ return
4959+ fi
4960+ if [ "$arg" = "-cf" ]; then
4961+ found=1
4962+ continue
4963+ fi
4964+ done
4965+ echo "/etc/ltsp/dhcpd.conf"
4966+}
4967+
4968+conf="$(findConfig "$DHCPDARGS")"
4969+if [ ! "$found" ]; then
4970+ DHCPDARGS="$DHCPARGS -cf $conf"
4971+fi
4972+
4973+if [ ! -f /var/lib/dhcpd/dhcpd.leases ] ; then
4974+ mkdir -p /var/lib/dhcpd
4975+ touch /var/lib/dhcpd/dhcpd.leases
4976+ [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcp/dhcpd.leases >/dev/null 2>&1
4977+fi
4978+
4979+configtest() {
4980+ [ -x $dhcpd ] || return 5
4981+ [ -f $conf ] || return 6
4982+ $dhcpd -q -t -cf $conf
4983+ RETVAL=$?
4984+ return $RETVAL
4985+}
4986+
4987+start() {
4988+ [ -x $dhcpd ] || return 5
4989+ [ -f $conf ] || return 6
4990+
4991+ pidofproc $prog >/dev/null 2>&1
4992+ RETVAL=$?
4993+ [ $RETVAL -eq 0 ] && return $RETVAL
4994+
4995+ echo -n "Starting ltsp-$prog:"
4996+ daemon $dhcpd $DHCPDARGS 2>/dev/null
4997+ RETVAL=$?
4998+ echo
4999+ [ $RETVAL = 0 ] && touch $lockfile
5000+
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: