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
=== modified file '.bzrignore'
--- .bzrignore 2008-12-11 07:01:43 +0000
+++ .bzrignore 2013-07-22 07:06:30 +0000
@@ -4,3 +4,7 @@
4*.rpm4*.rpm
5rpmbuild.log5rpmbuild.log
6ltsp.spec6ltsp.spec
7junk.sh
8build.sh
9.git
10
711
=== added file '.gitignore'
--- .gitignore 1970-01-01 00:00:00 +0000
+++ .gitignore 2013-07-22 07:06:30 +0000
@@ -0,0 +1,11 @@
1messages.mo
2*.tar.gz
3*.tar.bz2
4*.rpm
5rpmbuild.log
6ltsp.spec
7junk.sh
8build.sh
9.git
10.bzr
11
012
=== added symlink 'README.md'
=== target is u'server/doc/README.rpminstall'
=== modified file 'autogen.sh' (properties changed: +x to -x)
=== added directory 'client/Fedora'
=== removed directory 'client/Fedora'
=== added directory 'client/Fedora/chroot-setup'
=== added directory 'client/Fedora/chroot-setup/chroot-setup.d'
=== added file 'client/Fedora/chroot-setup/chroot-setup.d/000-pre-mount-proc'
--- client/Fedora/chroot-setup/chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
+++ client/Fedora/chroot-setup/chroot-setup.d/000-pre-mount-proc 2013-07-22 07:06:30 +0000
@@ -0,0 +1,3 @@
1#!/bin/sh
2
3mount /proc 2> /dev/null ||:
04
=== added file 'client/Fedora/chroot-setup/chroot-setup.d/010-cleanup-consoles'
--- client/Fedora/chroot-setup/chroot-setup.d/010-cleanup-consoles 1970-01-01 00:00:00 +0000
+++ client/Fedora/chroot-setup/chroot-setup.d/010-cleanup-consoles 2013-07-22 07:06:30 +0000
@@ -0,0 +1,15 @@
1#!/bin/sh
2
3### Set Runlevel 5 and turn off the mingetty's
4# Fedora 8 and previous, and RHEL5
5[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
6# Fedora 9+ with Upstart
7if [ -e /etc/event.d/tty1 ]; then
8 for NUM in 1 2 3 4 5 6; do
9 echo > /etc/event.d/tty$NUM
10 done
11fi
12# Fedora 13+ and EL6 with Upstart
13if [ -e /etc/init/start-ttys.conf ]; then
14 echo > /etc/init/start-ttys.conf
15fi
016
=== added file 'client/Fedora/chroot-setup/chroot-setup.d/020-dracut-config'
--- client/Fedora/chroot-setup/chroot-setup.d/020-dracut-config 1970-01-01 00:00:00 +0000
+++ client/Fedora/chroot-setup/chroot-setup.d/020-dracut-config 2013-07-22 07:06:30 +0000
@@ -0,0 +1,15 @@
1#!/bin/bash
2
3if [ -f /etc/dracut.conf ]; then
4 echo Generating initramfs
5 [ -e "/usr/share/ltsp/template/sysconfig-dracut" ] && cp /usr/share/ltsp/template/sysconfig-dracut /etc/dracut.conf.d/ltsp-dracut.conf
6 NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
7 unset DRACUTARG
8 [ -x /sbin/dracut ] && DRACUTARG=--dracut
9 /sbin/dracut -f 2>/dev/null
10 /sbin/new-kernel-pkg --mkinitrd $DRACUTARG --add-plymouth-initrd --install $NAME 2>/dev/null
11 /sbin/new-kernel-pkg --rpmposttrans $NAME 2>/dev/null
12else
13 echo Warning: Dracut not installed or no /etc/dracut.conf found
14fi
15
016
=== added file 'client/Fedora/chroot-setup/chroot-setup.d/030-configure-client'
--- client/Fedora/chroot-setup/chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
+++ client/Fedora/chroot-setup/chroot-setup.d/030-configure-client 2013-07-22 07:06:30 +0000
@@ -0,0 +1,57 @@
1#!/bin/sh
2
3# Disable services we don't want
4for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
5 iscsid kudzu lvm2-monitor mcstrans mdmonitor nfs NetworkManager named\
6 pcscd rpcbind rpcgssd rpcidmapd rpcsvcgssd kdump nfslock; do
7 if [ ! -e /etc/init.d/$service ]; then
8 continue
9 fi
10 #echo "Disabling Service: $service"
11 /sbin/chkconfig $service off
12done
13
14# Enable services we do want
15for service in haldaemon messagebus rsyslog udev-post ltsp-core ; do
16 if [ ! -e /etc/init.d/$service ]; then
17 continue
18 fi
19 #echo "Enabling Service: $service"
20 /sbin/chkconfig $service on
21done
22
23# Setup readonly-root Mode
24#sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
25
26# Set ltsp-launch-client as DM
27#echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
28
29# Link /etc/mtab to /proc/mounts
30# This is not perfect, but it enables fuse mounts to work.
31rm -f /etc/mtab 2>/dev/null
32ln -sf /proc/mounts /etc/mtab
33
34# Files to silence warning messages
35#touch /etc/alsa/asound.state
36#touch /etc/asound.state
37
38# Silence /etc/mtab rwtab error message during bootup
39sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
40
41# Silence /etc/mtab* removal errors
42#sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
43
44# Silence local filesystems mount errors during bootup
45sed -i '/^sysfs/d' /etc/fstab
46#sed -i '/sysroot/d' /etc/mtab
47#sed -i '/unionfs/d' /etc/mtab
48
49# F10+: install default boot-duration so plymouth can guess the startup progress bar better
50if [ -e /usr/share/plymouth/default-boot-duration ]; then
51 cp /usr/share/ltsp/template/default-boot-duration /usr/share/plymouth/default-boot-duration
52fi
53
54# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
55#sed -i 's/^kill_all $"Sending all processes/#kill_all $"Sending all processes/' /etc/init.d/halt
56#sed -i 's/sleep 2/#sleep 2/' /etc/init.d/halt
57#sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
058
=== added file 'client/Fedora/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config'
--- client/Fedora/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
+++ client/Fedora/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 2013-07-22 07:06:30 +0000
@@ -0,0 +1,7 @@
1#!/bin/sh
2
3# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
4# Not needed for CentOS 6
5if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
6 cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
7fi
08
=== added file 'client/Fedora/chroot-setup/chroot-setup.d/090-post-umount-proc'
--- client/Fedora/chroot-setup/chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
+++ client/Fedora/chroot-setup/chroot-setup.d/090-post-umount-proc 2013-07-22 07:06:30 +0000
@@ -0,0 +1,3 @@
1#!/bin/sh
2
3umount /proc 2> /dev/null ||:
04
=== added file 'client/Fedora/chroot-setup/ltsp-chroot-setup'
--- client/Fedora/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
+++ client/Fedora/chroot-setup/ltsp-chroot-setup 2013-07-22 07:06:30 +0000
@@ -0,0 +1,11 @@
1#!/bin/sh
2
3# Exit immediately if this is not a LTSP client chroot.
4[ ! -e /etc/ltsp_chroot ] && exit 0
5
6for i in /usr/share/ltsp/chroot-setup.d/* ; do
7 [ -d $i ] && continue
8 if [ -x $i ]; then
9 $i
10 fi
11done
012
=== added directory 'client/Fedora/initscripts'
=== removed directory 'client/Fedora/initscripts'
=== added file 'client/Fedora/initscripts/ltsp-client-launch'
--- client/Fedora/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
+++ client/Fedora/initscripts/ltsp-client-launch 2013-07-22 07:06:30 +0000
@@ -0,0 +1,91 @@
1#!/bin/bash
2#
3# ltsp-client-launch LTSP Client Launcher
4#
5# description: This launches the LTSP clients defined in /etc/lts.conf
6# along with sound server and other configured devices.
7#
8
9# Gracefully exit if ltsp_chroot file is not present
10test -f /etc/ltsp_chroot || exit 0
11
12# Make sure LANG is set
13if [ -z "$LANG" ]
14then
15 if [ -f /etc/sysconfig/i18n ]
16 then
17 . /etc/sysconfig/i18n
18 export LANG
19 fi
20fi
21
22if [ -z "$LC_MESSAGES" ]
23then
24 if [ -z "$LC_ALL" ]
25 then
26 LC_MESSAGES=$LANG
27 export LC_MESSAGES
28 fi
29fi
30
31# Grab lts.conf from the same IP address as the mount server.
32# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
33
34# check for NBD devices
35NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
36if [ -n "$NBD_DEVICES" ]; then
37 for DEVICE in $NBD_DEVICES ; do
38 SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
39 test -n "$SERVER" && break
40 done
41else
42 # check for NFS root
43 SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
44fi
45
46SERVER="${SERVER:-172.31.100.254}"
47export SERVER
48
49ARCH=$(uname -m)
50[ "$ARCH" = "i586" ] && ARCH=i386
51[ "$ARCH" = "i686" ] && ARCH=i386
52TFTPPATH="/ltsp/$ARCH/lts.conf"
53
54# Attempt to get lts.conf via tftp
55cd /var/run
56(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
57if [ -s ./lts.conf ];then
58 cp ./lts.conf /etc/lts.conf
59fi
60cd - > /dev/null
61
62# Source function libraries.
63. /usr/share/ltsp/ltsp-init-common
64
65teardown() {
66 killall -g screen_session pulseaudio ldm ltspfsd
67}
68trap "teardown" TERM
69
70# Start Screen Sessions defined in /etc/lts.conf
71for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
72eval num=\$SCREEN_$screen
73if [ -n "$num" ]; then
74 /usr/share/ltsp/screen_session "$screen" &
75fi
76done
77
78# TODO: Move these into service ltsp-client-setup
79configure_localdev
80configure_swap
81configure_serial_mouse
82configure_printer
83
84# /dev/dsp must be owned by pulse
85chown pulse /dev/dsp
86start_sound
87configure_sound_volume
88
89while :; do
90 sleep 365d
91done
092
=== removed file 'client/Fedora/initscripts/ltsp-client-launch'
--- client/Fedora/initscripts/ltsp-client-launch 2012-05-13 15:39:01 +0000
+++ client/Fedora/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
1#!/bin/bash
2#
3# ltsp-client-launch LTSP Client Launcher
4#
5# description: This launches the LTSP clients defined in /etc/lts.conf
6# along with sound server and other configured devices.
7#
8
9# Gracefully exit if ltsp_chroot file is not present
10test -f /etc/ltsp_chroot || exit 0
11
12# Make sure LANG is set
13if [ -z "$LANG" ]
14then
15 if [ -f /etc/sysconfig/i18n ]
16 then
17 . /etc/sysconfig/i18n
18 export LANG
19 fi
20fi
21
22if [ -z "$LC_MESSAGES" ]
23then
24 if [ -z "$LC_ALL" ]
25 then
26 LC_MESSAGES=$LANG
27 export LC_MESSAGES
28 fi
29fi
30
31# Grab lts.conf from the same IP address as the mount server.
32# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
33
34# check for NBD devices
35NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
36if [ -n "$NBD_DEVICES" ]; then
37 for DEVICE in $NBD_DEVICES ; do
38 SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
39 test -n "$SERVER" && break
40 done
41else
42 # check for NFS root
43 SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
44fi
45
46SERVER="${SERVER:-172.31.100.254}"
47export SERVER
48
49ARCH=$(uname -m)
50[ "$ARCH" = "i586" ] && ARCH=i386
51[ "$ARCH" = "i686" ] && ARCH=i386
52TFTPPATH="/ltsp/$ARCH/lts.conf"
53
54# Attempt to get lts.conf via tftp
55cd /var/run
56(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
57if [ -s ./lts.conf ];then
58 cp ./lts.conf /etc/lts.conf
59fi
60cd - > /dev/null
61
62# Source function libraries.
63. /usr/share/ltsp/ltsp-init-common
64
65teardown() {
66 killall -g screen_session pulseaudio ldm ltspfsd
67}
68trap "teardown" TERM
69
70# Start Screen Sessions defined in /etc/lts.conf
71for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
72eval num=\$SCREEN_$screen
73if [ -n "$num" ]; then
74 /usr/share/ltsp/screen_session "$screen" &
75fi
76done
77
78# TODO: Move these into service ltsp-client-setup
79configure_localdev
80configure_swap
81configure_serial_mouse
82configure_printer
83
84# /dev/dsp must be owned by pulse
85chown pulse /dev/dsp
86start_sound
87configure_sound_volume
88
89while :; do
90 sleep 365d
91done
920
=== added file 'client/Fedora/initscripts/ltsp-core'
--- client/Fedora/initscripts/ltsp-core 1970-01-01 00:00:00 +0000
+++ client/Fedora/initscripts/ltsp-core 2013-07-22 07:06:30 +0000
@@ -0,0 +1,72 @@
1#! /bin/sh
2#
3# Author: Matt Zimmerman <mdz@ubuntu.com>
4#
5### BEGIN INIT INFO
6# Provides: ltsp-client ltsp-client-core ltsp-client-setup
7# Required-Start: $remote_fs $network $syslog
8# Should-Start:
9# Required-Stop:
10# Default-Start: 2 3 4 5
11# Default-Stop: 0 6
12# Short-Description: Script for LTSP client initialization
13# Description:
14### END INIT INFO
15
16set -e
17
18PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
19DESC="LTSP client"
20NAME=ltsp-client
21SCRIPTNAME=/etc/init.d/$NAME
22
23# Gracefully exit if an LTSP boot was not requested
24grep -Eqsw "init=/sbin/init-ltsp|ltsp" /proc/cmdline || exit 0
25
26# handle localization settings
27if [ -r /etc/default/locale ]; then
28 . /etc/default/locale
29 export LANG LANGUAGE
30elif [ -r /etc/environment ]; then
31 . /etc/environment
32 export LANG LANGUAGE
33fi
34
35. /lib/lsb/init-functions
36. /usr/share/ltsp/ltsp-init-common
37
38case "$1" in
39 start)
40 log_success_msg "Starting LTSP client..."
41
42 if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then
43 # Tell the control center that we are booting and get lts.conf
44 eval $(getltscfg-cluster -a -l boot) || true
45 fi
46
47 if [ -x /bin/plymouth ]; then
48 /bin/plymouth quit --retain-splash || true
49 fi
50
51 start_screen_sessions || true
52 start_sound || true
53
54 ;;
55 stop)
56 # This means that an LTSP client is shutting down or rebooting.
57 # Try to cleanly close any open network connections.
58 if [ -x /usr/share/ltsp/nbd-disconnect ]; then
59 /usr/share/ltsp/nbd-disconnect &
60 fi
61 ;;
62 restart|force-reload)
63 echo "$NAME does not support restarting, reboot your client instead." >&2
64 exit 1
65 ;;
66 *)
67 echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
68 exit 1
69 ;;
70esac
71
72exit 0
073
=== added directory 'client/Fedora/rwtab.d'
=== added file 'client/Fedora/rwtab.d/ltsp.rwtab'
--- client/Fedora/rwtab.d/ltsp.rwtab 1970-01-01 00:00:00 +0000
+++ client/Fedora/rwtab.d/ltsp.rwtab 2013-07-22 07:06:30 +0000
@@ -0,0 +1,27 @@
1# Already in F12 /etc/rwtab
2empty /var/log/ConsoleKit/
3empty /var/lib/dbus/
4empty /var/cache/hald/
5empty /var/lib/pulse/
6files /.viminfo
7files /etc/alsa/asound.state
8# Already in F11 /etc/rwtab
9dirs /var/lib/xkb/
10
11# BUG: Directories that need to be writable but contain files we don't want to disappear
12# (Although somehow this wasn't harmful to LTSP in the past?)
13dirs /etc/udev/rules.d/
14
15# LTSP specific
16dirs /var/cache/ldm/
17dirs /home
18empty /var/cache/ltsp-localapps/
19empty /root
20files /etc/lts.conf
21files /etc/X11/xorg.conf
22files /etc/passwd
23files /etc/group
24files /etc/localtime
25files /etc/cups/client.conf
26# Old versions of Fedora only
27files /etc/asound.state
028
=== added directory 'client/Fedora/scripts'
=== added file 'client/Fedora/scripts/ltsp-rewrap-latest-kernel'
--- client/Fedora/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
+++ client/Fedora/scripts/ltsp-rewrap-latest-kernel 2013-07-22 07:06:30 +0000
@@ -0,0 +1,10 @@
1#!/bin/bash
2# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
3echo "Re-wrapping vmlinuz and initrd, Please be patient."
4
5NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
6unset DRACUTARG
7[ -x /sbin/dracut ] && DRACUTARG=--dracut
8/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
9/sbin/new-kernel-pkg --rpmposttrans $NAME
10/sbin/depmod -au "$NAME" -F "/boot/System.map-$NAME"
011
=== added directory 'client/Fedora/share'
=== added directory 'client/Fedora/share/ltsp'
=== added directory 'client/Fedora/share/ltsp/init-ltsp.d'
=== added file 'client/Fedora/share/ltsp/init-ltsp.d/00-overlay'
--- client/Fedora/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
+++ client/Fedora/share/ltsp/init-ltsp.d/00-overlay 2013-07-22 07:06:30 +0000
@@ -0,0 +1,123 @@
1#!/bin/sh
2#
3# Overlay filesystem mounting -*- overlay-module -*-
4#
5# 2013, Joshua Trimm <enslaver@enslaver.com>
6#
7# Derived from previously modified scripts written by:
8# 2008, Stephane Graber <stgraber@ubuntu.com>
9# 2009, Vagrant Cascadian <vagrant@freegeek.org>
10#
11# This program is free software; you can redistribute it and/or
12# modify it under the terms of the GNU General Public License as
13# published by the Free Software Foundation; either version 2 of the
14# License, or (at your option) any later version.
15#
16# This program is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with this program. If not, you can find it on the World Wide
23# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
24# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
25# MA 02110-1301, USA.
26#
27# The idea is to make this a double script, running from init-ltsp
28# and also be installed to the initramfs using either dracut or
29# initramfs-tools.
30
31#set -x
32
33[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
34
35# On by default
36OVERLAY=${OVERLAY:-Y}
37
38if [ -f /.inside-cow ]; then
39 # Already inside copy-on-write filesystem
40 return
41fi
42
43if [ ! $OVERLAY ]; then
44 # Someone doesnt love me
45 return
46fi
47
48
49
50# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
51OVERLAYFS=${OVERLAYFS:-unionfs}
52
53panic() { echo "Error: $@"; exit 1; }
54
55
56# Try to give us some tmp space in userland
57test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
58
59[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
60[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
61[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
62[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
63
64if modprobe -q overlayfs; then
65 # For kernel overlays
66 if [ "$DETECT_MODULE_INCOMPLETE" ]; then
67 UNION_TYPE=overlayfs
68 UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
69 fi
70elif modprobe -q fuse; then
71 # For fuse overlays
72 FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
73 if [ "$INSIDE_DRACUT" ]; then
74 . /tmp/root.info
75 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
76 CHROOT_PATH="/tmp/unionfs"
77 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
78 NEWROOT=${NEWROOT:-/sysroot}
79 OLDROOT="$NEWROOT"
80 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
81 mount -t tmpfs tmpfs $CHROOT_PATH/cow
82 mount --move /sysroot /tmp/sysroot
83 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
84 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
85 echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
86 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
87 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
88 elif [ "$INSIDE_INITRAMFS" ]; then
89 # This is for initramfs-tools that include the fuse module.
90 # it is incomplete but should be similar to above, just set
91 # NEWROOT to where it mounts the nfsroot
92 NEWROOT="${rootmnt}"
93 . /tmp/root.info
94 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
95 CHROOT_PATH="/tmp/unionfs"
96 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
97 NEWROOT=${NEWROOT:-/sysroot}
98 OLDROOT="$NEWROOT"
99 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
100 mount -t tmpfs tmpfs $CHROOT_PATH/cow
101 mount --move /sysroot /tmp/sysroot
102 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
103 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
104 echo inside-cow-initramfs > /sysroot/.inside-cow
105 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
106 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
107 elif [ "$INSIDE_LTSP_INIT" ]; then
108 CHROOT_PATH="/tmp/unionfs"
109 UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
110 UBIN=/usr/bin/unionfs
111 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
112 [ -e "/proc/cmdline" ] || mount -t proc proc /proc
113 mount -t tmpfs tmpfs $CHROOT_PATH/cow
114 mount --bind / $CHROOT_PATH/rofs
115 $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
116 mount -t proc proc /tmp/union/proc
117 echo inside-cow-ltsp-init > /tmp/union/.inside-cow
118 cd /tmp/union
119 mkdir oldroot
120 pivot_root . oldroot
121 init q
122 fi
123fi
0124
=== added file 'client/Fedora/share/ltsp/init-ltsp.d/09-hostname'
--- client/Fedora/share/ltsp/init-ltsp.d/09-hostname 1970-01-01 00:00:00 +0000
+++ client/Fedora/share/ltsp/init-ltsp.d/09-hostname 2013-07-22 07:06:30 +0000
@@ -0,0 +1,35 @@
1if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
2 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
3 IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
4 IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
5 case "$HOSTNAME_EXTRA" in
6 mac)
7 HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
8 ;;
9 ip|"")
10 HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
11 ;;
12 esac
13 HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
14fi
15
16hostname "$HOSTNAME"
17echo "$HOSTNAME" > /etc/hostname
18
19cat <<EOF > /etc/hosts
20127.0.0.1 localhost
21127.0.0.2 $HOSTNAME
22$SERVER server
23
24# The following lines are desirable for IPv6 capable hosts
25::1 ip6-localhost ip6-loopback
26fe00::0 ip6-localnet
27ff00::0 ip6-mcastprefix
28ff02::1 ip6-allnodes
29ff02::2 ip6-allrouters
30EOF
31
32if [ -f /etc/hosts.ltsp ]; then
33 cat /etc/hosts.ltsp >> /etc/hosts
34fi
35env | sed -n '/^HOSTS_[0-9][0-9]=/s///p' >> /etc/hosts
036
=== added file 'client/Fedora/share/ltsp/ltsp-client-launch'
--- client/Fedora/share/ltsp/ltsp-client-launch 1970-01-01 00:00:00 +0000
+++ client/Fedora/share/ltsp/ltsp-client-launch 2013-07-22 07:06:30 +0000
@@ -0,0 +1,91 @@
1#!/bin/bash
2#
3# ltsp-client-launch LTSP Client Launcher
4#
5# description: This launches the LTSP clients defined in /etc/lts.conf
6# along with sound server and other configured devices.
7#
8
9# Gracefully exit if ltsp_chroot file is not present
10test -f /etc/ltsp_chroot || exit 0
11
12# Make sure LANG is set
13if [ -z "$LANG" ]
14then
15 if [ -f /etc/sysconfig/i18n ]
16 then
17 . /etc/sysconfig/i18n
18 export LANG
19 fi
20fi
21
22if [ -z "$LC_MESSAGES" ]
23then
24 if [ -z "$LC_ALL" ]
25 then
26 LC_MESSAGES=$LANG
27 export LC_MESSAGES
28 fi
29fi
30
31# Grab lts.conf from the same IP address as the mount server.
32# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
33
34# check for NBD devices
35NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
36if [ -n "$NBD_DEVICES" ]; then
37 for DEVICE in $NBD_DEVICES ; do
38 SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
39 test -n "$SERVER" && break
40 done
41else
42 # check for NFS root
43 SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
44fi
45
46SERVER="${SERVER:-172.31.100.254}"
47export SERVER
48
49ARCH=$(uname -m)
50[ "$ARCH" = "i586" ] && ARCH=i386
51[ "$ARCH" = "i686" ] && ARCH=i386
52TFTPPATH="/ltsp/$ARCH/lts.conf"
53
54# Attempt to get lts.conf via tftp
55cd /var/run
56(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
57if [ -s ./lts.conf ];then
58 cp ./lts.conf /etc/lts.conf
59fi
60cd - > /dev/null
61
62# Source function libraries.
63. /usr/share/ltsp/ltsp-init-common
64
65teardown() {
66 killall -g screen_session pulseaudio ldm ltspfsd
67}
68trap "teardown" TERM
69
70# Start Screen Sessions defined in /etc/lts.conf
71for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
72eval num=\$SCREEN_$screen
73if [ -n "$num" ]; then
74 /usr/share/ltsp/screen_session "$screen" &
75fi
76done
77
78# TODO: Move these into service ltsp-client-setup
79configure_localdev
80configure_swap
81configure_serial_mouse
82configure_printer
83
84# /dev/dsp must be owned by pulse
85chown pulse /dev/dsp
86start_sound
87configure_sound_volume
88
89while :; do
90 sleep 365d
91done
092
=== added file 'client/Fedora/share/ltsp/ltsp-client-vendor-functions'
--- client/Fedora/share/ltsp/ltsp-client-vendor-functions 1970-01-01 00:00:00 +0000
+++ client/Fedora/share/ltsp/ltsp-client-vendor-functions 2013-07-22 07:06:30 +0000
@@ -0,0 +1,108 @@
1# Fedora-specific function overrides for the common functions
2
3detect_arch() {
4 echo $(uname -m | sed -e s/i.86/i386/)
5}
6
7if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost.localdomain" ] || [ "$HOSTNAME" = "localhost" ]; then
8 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
9 IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
10 IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
11 case "$HOSTNAME_EXTRA" in
12 mac)
13 HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
14 ;;
15 ip|"")
16 HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
17 ;;
18 esac
19 HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
20fi
21
22# Taken from dracut lib
23# returns OK if $1 contains $2
24strstr() {
25 [ "${1#*$2*}" != "$1" ]
26}
27
28getarg() {
29 set +x
30 local o line
31 if [ -z "$CMDLINE" ]; then
32 if [ -e /etc/cmdline ]; then
33 while read line; do
34 CMDLINE_ETC="$CMDLINE_ETC $line";
35 done </etc/cmdline;
36 fi
37 read CMDLINE </proc/cmdline;
38 CMDLINE="$CMDLINE $CMDLINE_ETC"
39 fi
40 for o in $CMDLINE; do
41 [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
42 [ "${o%%=*}" = "${1%=}" ] && { echo ${o#*=}; [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
43 done
44 [ "$RDDEBUG" = "yes" ] && set -x
45 return 1
46}
47
48getargs() {
49 set +x
50 local o line found
51 if [ -z "$CMDLINE" ]; then
52 if [ -e /etc/cmdline ]; then
53 while read line; do
54 CMDLINE_ETC="$CMDLINE_ETC $line";
55 done </etc/cmdline;
56 fi
57 read CMDLINE </proc/cmdline;
58 CMDLINE="$CMDLINE $CMDLINE_ETC"
59 fi
60 for o in $CMDLINE; do
61 [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
62 if [ "${o%%=*}" = "${1%=}" ]; then
63 echo -n "${o#*=} ";
64 found=1;
65 fi
66 done
67 [ -n "$found" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
68 [ "$RDDEBUG" = "yes" ] && set -x
69 return 1;
70}
71
72nfsroot_to_var() {
73 # strip nfs[4]:
74 local arg="$@:"
75 nfs="${arg%%:*}"
76 arg="${arg##$nfs:}"
77
78 # check if we have a server
79 if strstr "$arg" ':/*' ; then
80 server="${arg%%:/*}"
81 arg="/${arg##*:/}"
82 fi
83
84 path="${arg%%:*}"
85
86 # rest are options
87 options="${arg##$path}"
88 # strip leading ":"
89 options="${options##:}"
90 # strip ":"
91 options="${options%%:}"
92
93 # Does it really start with '/'?
94 [ -n "${path%%/*}" ] && path="error";
95
96 #Fix kernel legacy style separating path and options with ','
97 if [ "$path" != "${path#*,}" ] ; then
98 options=${path#*,}
99 path=${path%%,*}
100 fi
101}
102
103[ -z "$root" ] && root=$(getarg root=)
104[ -z "$netroot" ] && netroot=$(getarg netroot=)
105[ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
106[ -z "$nbdroot" ] && nbdroot=$(getarg nbdroot=)
107
108
0109
=== added directory 'client/Fedora/template'
=== added file 'client/Fedora/template/20-xinitrc-badprocs.sh'
--- client/Fedora/template/20-xinitrc-badprocs.sh 1970-01-01 00:00:00 +0000
+++ client/Fedora/template/20-xinitrc-badprocs.sh 2013-07-22 07:06:30 +0000
@@ -0,0 +1,6 @@
1PATTERN="(vmtoolsd.*vmusr|vmware-user)"
2
3# Signal all running instances of the user daemon.
4# Our pattern ensures that we won't touch the system daemon.
5 pkill -$1 -f "$PATTERN"
6 return 0
07
=== added file 'client/Fedora/template/plymouth-default-boot-duration'
--- client/Fedora/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
+++ client/Fedora/template/plymouth-default-boot-duration 2013-07-22 07:06:30 +0000
@@ -0,0 +1,11 @@
10.788:RCkernelparam
20.789:RChostname
30.867:RCmountfs
40.876:RCswap
50.888:portreserve
60.895:rsyslog
70.901:nfslock
80.928:messagebus
90.937:haldaemon
100.990:udev-post
110.996:local
012
=== added file 'client/Fedora/template/sl-other.repo'
--- client/Fedora/template/sl-other.repo 1970-01-01 00:00:00 +0000
+++ client/Fedora/template/sl-other.repo 2013-07-22 07:06:30 +0000
@@ -0,0 +1,42 @@
1[sl-fastbugs]
2name=Scientific Linux $releasever - $basearch - fastbug updates
3baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
4 http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
5 http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
6 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
7#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
8enabled=1
9gpgcheck=1
10gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
11
12[sl-debuginfo]
13name=Scientific Linux Debuginfo
14baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
15 http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
16 http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
17 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
18enabled=0
19gpgcheck=1
20gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
21
22
23[sl-testing]
24name=Scientific Linux Testing - $basearch
25baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
26 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
27 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
28 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
29enabled=0
30gpgcheck=0
31gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
32
33[sl-testing-source]
34name=Scientific Linux Testing - Source
35baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
36 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
37 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
38 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
39enabled=0
40gpgcheck=0
41gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
42
043
=== added file 'client/Fedora/template/x2go.repo'
--- client/Fedora/template/x2go.repo 1970-01-01 00:00:00 +0000
+++ client/Fedora/template/x2go.repo 2013-07-22 07:06:30 +0000
@@ -0,0 +1,7 @@
1[X11_RemoteDesktop_x2go]
2name=X2go - after NoMachine ditched the open version (RHEL_6)
3type=rpm-md
4baseurl=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/
5gpgcheck=1
6gpgkey=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/repodata/repomd.xml.key
7enabled=1
08
=== added directory 'client/RHEL'
=== added directory 'client/RHEL/chroot-setup'
=== added directory 'client/RHEL/chroot-setup/chroot-setup.d'
=== added file 'client/RHEL/chroot-setup/chroot-setup.d/000-pre-mount-proc'
--- client/RHEL/chroot-setup/chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
+++ client/RHEL/chroot-setup/chroot-setup.d/000-pre-mount-proc 2013-07-22 07:06:30 +0000
@@ -0,0 +1,3 @@
1#!/bin/sh
2
3mount /proc 2> /dev/null ||:
04
=== added file 'client/RHEL/chroot-setup/chroot-setup.d/015-install-nbd'
--- client/RHEL/chroot-setup/chroot-setup.d/015-install-nbd 1970-01-01 00:00:00 +0000
+++ client/RHEL/chroot-setup/chroot-setup.d/015-install-nbd 2013-07-22 07:06:30 +0000
@@ -0,0 +1,8 @@
1#!/bin/bash
2KERN_DIR=$(find /lib/modules/ -maxdepth 1 -type d -name 2.* |tail -1)
3if [ -d "$KERN_DIR" ]; then
4 [ `echo $KERN_DIR | grep x86_64` ] && cp /usr/share/ltsp/template/nbd.ko.x86_64 $KERN_DIR/kernel/drivers/block/nbd.ko
5 [ `echo $KERN_DIR | grep i686` ] && cp /usr/share/ltsp/template/nbd.ko.i686 $KERN_DIR/kernel/drivers/block/nbd.ko
6fi
7current_kernel=$(basename $KERN_DIR)
8depmod -ae -F /boot/System.map-${current_kernel} ${current_kernel}
09
=== added file 'client/RHEL/chroot-setup/chroot-setup.d/020-dracut-config'
--- client/RHEL/chroot-setup/chroot-setup.d/020-dracut-config 1970-01-01 00:00:00 +0000
+++ client/RHEL/chroot-setup/chroot-setup.d/020-dracut-config 2013-07-22 07:06:30 +0000
@@ -0,0 +1,15 @@
1#!/bin/bash
2
3if [ -f /etc/dracut.conf ]; then
4 echo Generating initramfs
5 [ -e "/usr/share/ltsp/template/sysconfig-dracut" ] && cp /usr/share/ltsp/template/sysconfig-dracut /etc/dracut.conf.d/ltsp-dracut.conf
6 NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
7 unset DRACUTARG
8 [ -x /sbin/dracut ] && DRACUTARG=--dracut
9 /sbin/dracut -f 2>/dev/null
10 /sbin/new-kernel-pkg --mkinitrd $DRACUTARG --add-plymouth-initrd --install $NAME 2>/dev/null
11 /sbin/new-kernel-pkg --rpmposttrans $NAME 2>/dev/null
12else
13 echo Warning: Dracut not installed or no /etc/dracut.conf found
14fi
15
016
=== added file 'client/RHEL/chroot-setup/chroot-setup.d/030-configure-client'
--- client/RHEL/chroot-setup/chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
+++ client/RHEL/chroot-setup/chroot-setup.d/030-configure-client 2013-07-22 07:06:30 +0000
@@ -0,0 +1,59 @@
1#!/bin/sh
2
3# Disable services we don't want
4for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
5 iscsid kudzu lvm2-monitor mcstrans mdmonitor nfs NetworkManager named\
6 pcscd rpcgssd rpcidmapd rpcsvcgssd kdump nfslock; do
7 if [ ! -e /etc/init.d/$service ]; then
8 continue
9 fi
10 #echo "Disabling Service: $service"
11 /sbin/chkconfig $service off
12done
13
14# Enable services we do want
15for service in haldaemon messagebus rsyslog udev-post ltsp-core rpcbind nfslock epoptes-client; do
16 if [ ! -e /etc/init.d/$service ]; then
17 continue
18 fi
19 #echo "Enabling Service: $service"
20 /sbin/chkconfig $service on
21done
22
23# Setup readonly-root Mode
24#sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
25
26# Set ltsp-launch-client as DM
27#echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
28
29# Link /etc/mtab to /proc/mounts
30# This is not perfect, but it enables fuse mounts to work.
31rm -f /etc/mtab 2>/dev/null
32#ln -sf /proc/mounts /etc/mtab
33cat /proc/mounts > /etc/mtab
34
35# Files to silence warning messages
36#touch /etc/alsa/asound.state
37touch /etc/asound.state
38
39# Silence /etc/mtab rwtab error message during bootup
40sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
41
42# Silence /etc/mtab* removal errors
43sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
44
45# Silence local filesystems mount errors during bootup
46sed -i '/^sysfs/d' /etc/fstab
47sed -i '/sysroot/d' /etc/mtab
48sed -i '/unionfs/d' /etc/mtab
49sed -i '/cgroup/d' /etc/mtab
50
51# F10+: install default boot-duration so plymouth can guess the startup progress bar better
52if [ -e /usr/share/plymouth/default-boot-duration ]; then
53 cp /usr/share/ltsp/template/default-boot-duration /usr/share/plymouth/default-boot-duration
54fi
55
56# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
57sed -i 's/^kill_all $"Sending all processes/#kill_all $"Sending all processes/' /etc/init.d/halt
58sed -i 's/sleep 2/#sleep 2/' /etc/init.d/halt
59sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
060
=== added file 'client/RHEL/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config'
--- client/RHEL/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
+++ client/RHEL/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 2013-07-22 07:06:30 +0000
@@ -0,0 +1,7 @@
1#!/bin/sh
2
3# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
4# Not needed for CentOS 6
5if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
6 cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
7fi
08
=== added file 'client/RHEL/chroot-setup/chroot-setup.d/090-post-umount-proc'
--- client/RHEL/chroot-setup/chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
+++ client/RHEL/chroot-setup/chroot-setup.d/090-post-umount-proc 2013-07-22 07:06:30 +0000
@@ -0,0 +1,3 @@
1#!/bin/sh
2
3umount /proc 2> /dev/null ||:
04
=== added file 'client/RHEL/chroot-setup/ltsp-chroot-setup'
--- client/RHEL/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
+++ client/RHEL/chroot-setup/ltsp-chroot-setup 2013-07-22 07:06:30 +0000
@@ -0,0 +1,11 @@
1#!/bin/sh
2
3# Exit immediately if this is not a LTSP client chroot.
4[ ! -e /etc/ltsp_chroot ] && exit 0
5
6for i in /usr/share/ltsp/chroot-setup.d/* ; do
7 [ -d $i ] && continue
8 if [ -x $i ]; then
9 $i
10 fi
11done
012
=== added directory 'client/RHEL/initscripts'
=== added file 'client/RHEL/initscripts/ltsp-client-launch'
--- client/RHEL/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
+++ client/RHEL/initscripts/ltsp-client-launch 2013-07-22 07:06:30 +0000
@@ -0,0 +1,91 @@
1#!/bin/bash
2#
3# ltsp-client-launch LTSP Client Launcher
4#
5# description: This launches the LTSP clients defined in /etc/lts.conf
6# along with sound server and other configured devices.
7#
8
9# Gracefully exit if ltsp_chroot file is not present
10test -f /etc/ltsp_chroot || exit 0
11
12# Make sure LANG is set
13if [ -z "$LANG" ]
14then
15 if [ -f /etc/sysconfig/i18n ]
16 then
17 . /etc/sysconfig/i18n
18 export LANG
19 fi
20fi
21
22if [ -z "$LC_MESSAGES" ]
23then
24 if [ -z "$LC_ALL" ]
25 then
26 LC_MESSAGES=$LANG
27 export LC_MESSAGES
28 fi
29fi
30
31# Grab lts.conf from the same IP address as the mount server.
32# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
33
34# check for NBD devices
35NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
36if [ -n "$NBD_DEVICES" ]; then
37 for DEVICE in $NBD_DEVICES ; do
38 SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
39 test -n "$SERVER" && break
40 done
41else
42 # check for NFS root
43 SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
44fi
45
46SERVER="${SERVER:-172.31.100.254}"
47export SERVER
48
49ARCH=$(uname -m)
50[ "$ARCH" = "i586" ] && ARCH=i386
51[ "$ARCH" = "i686" ] && ARCH=i386
52TFTPPATH="/ltsp/$ARCH/lts.conf"
53
54# Attempt to get lts.conf via tftp
55cd /var/run
56(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
57if [ -s ./lts.conf ];then
58 cp ./lts.conf /etc/lts.conf
59fi
60cd - > /dev/null
61
62# Source function libraries.
63. /usr/share/ltsp/ltsp-init-common
64
65teardown() {
66 killall -g screen_session pulseaudio ldm ltspfsd
67}
68trap "teardown" TERM
69
70# Start Screen Sessions defined in /etc/lts.conf
71for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
72eval num=\$SCREEN_$screen
73if [ -n "$num" ]; then
74 /usr/share/ltsp/screen_session "$screen" &
75fi
76done
77
78# TODO: Move these into service ltsp-client-setup
79configure_localdev
80configure_swap
81configure_serial_mouse
82configure_printer
83
84# /dev/dsp must be owned by pulse
85chown pulse /dev/dsp
86start_sound
87configure_sound_volume
88
89while :; do
90 sleep 365d
91done
092
=== added file 'client/RHEL/initscripts/ltsp-core'
--- client/RHEL/initscripts/ltsp-core 1970-01-01 00:00:00 +0000
+++ client/RHEL/initscripts/ltsp-core 2013-07-22 07:06:30 +0000
@@ -0,0 +1,72 @@
1#! /bin/sh
2#
3# Author: Matt Zimmerman <mdz@ubuntu.com>
4#
5### BEGIN INIT INFO
6# Provides: ltsp-client ltsp-client-core ltsp-client-setup
7# Required-Start: $remote_fs $network $syslog
8# Should-Start:
9# Required-Stop:
10# Default-Start: 2 3 4 5
11# Default-Stop: 0 6
12# Short-Description: Script for LTSP client initialization
13# Description:
14### END INIT INFO
15
16set -e
17
18PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
19DESC="LTSP client"
20NAME=ltsp-client
21SCRIPTNAME=/etc/init.d/$NAME
22
23# Gracefully exit if an LTSP boot was not requested
24grep -Eqsw "init=/sbin/init-ltsp|ltsp" /proc/cmdline || exit 0
25
26# handle localization settings
27if [ -r /etc/default/locale ]; then
28 . /etc/default/locale
29 export LANG LANGUAGE
30elif [ -r /etc/environment ]; then
31 . /etc/environment
32 export LANG LANGUAGE
33fi
34
35. /lib/lsb/init-functions
36. /usr/share/ltsp/ltsp-init-common
37
38case "$1" in
39 start)
40 log_success_msg "Starting LTSP client..."
41
42 if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then
43 # Tell the control center that we are booting and get lts.conf
44 eval $(getltscfg-cluster -a -l boot) || true
45 fi
46
47 if [ -x /bin/plymouth ]; then
48 /bin/plymouth quit --retain-splash || true
49 fi
50
51 start_screen_sessions || true
52 start_sound || true
53
54 ;;
55 stop)
56 # This means that an LTSP client is shutting down or rebooting.
57 # Try to cleanly close any open network connections.
58 if [ -x /usr/share/ltsp/nbd-disconnect ]; then
59 /usr/share/ltsp/nbd-disconnect &
60 fi
61 ;;
62 restart|force-reload)
63 echo "$NAME does not support restarting, reboot your client instead." >&2
64 exit 1
65 ;;
66 *)
67 echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
68 exit 1
69 ;;
70esac
71
72exit 0
073
=== added directory 'client/RHEL/rwtab.d'
=== added file 'client/RHEL/rwtab.d/ltsp.rwtab'
--- client/RHEL/rwtab.d/ltsp.rwtab 1970-01-01 00:00:00 +0000
+++ client/RHEL/rwtab.d/ltsp.rwtab 2013-07-22 07:06:30 +0000
@@ -0,0 +1,27 @@
1# Already in F12 /etc/rwtab
2empty /var/log/ConsoleKit/
3empty /var/lib/dbus/
4empty /var/cache/hald/
5empty /var/lib/pulse/
6files /.viminfo
7files /etc/alsa/asound.state
8# Already in F11 /etc/rwtab
9dirs /var/lib/xkb/
10
11# BUG: Directories that need to be writable but contain files we don't want to disappear
12# (Although somehow this wasn't harmful to LTSP in the past?)
13dirs /etc/udev/rules.d/
14
15# LTSP specific
16dirs /var/cache/ldm/
17dirs /home
18empty /var/cache/ltsp-localapps/
19empty /root
20files /etc/lts.conf
21files /etc/X11/xorg.conf
22files /etc/passwd
23files /etc/group
24files /etc/localtime
25files /etc/cups/client.conf
26# Old versions of Fedora only
27files /etc/asound.state
028
=== added directory 'client/RHEL/scripts'
=== added file 'client/RHEL/scripts/ltsp-rewrap-latest-kernel'
--- client/RHEL/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
+++ client/RHEL/scripts/ltsp-rewrap-latest-kernel 2013-07-22 07:06:30 +0000
@@ -0,0 +1,10 @@
1#!/bin/bash
2# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
3echo "Re-wrapping vmlinuz and initrd, Please be patient."
4
5NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
6unset DRACUTARG
7[ -x /sbin/dracut ] && DRACUTARG=--dracut
8/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
9/sbin/new-kernel-pkg --rpmposttrans $NAME
10/sbin/depmod -au "$NAME" -F "/boot/System.map-$NAME"
011
=== added directory 'client/RHEL/share'
=== added directory 'client/RHEL/share/ltsp'
=== added directory 'client/RHEL/share/ltsp/init-ltsp.d'
=== added file 'client/RHEL/share/ltsp/init-ltsp.d/00-overlay'
--- client/RHEL/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
+++ client/RHEL/share/ltsp/init-ltsp.d/00-overlay 2013-07-22 07:06:30 +0000
@@ -0,0 +1,123 @@
1#!/bin/sh
2#
3# Overlay filesystem mounting -*- overlay-module -*-
4#
5# 2013, Joshua Trimm <enslaver@enslaver.com>
6#
7# Derived from previously modified scripts written by:
8# 2008, Stephane Graber <stgraber@ubuntu.com>
9# 2009, Vagrant Cascadian <vagrant@freegeek.org>
10#
11# This program is free software; you can redistribute it and/or
12# modify it under the terms of the GNU General Public License as
13# published by the Free Software Foundation; either version 2 of the
14# License, or (at your option) any later version.
15#
16# This program is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with this program. If not, you can find it on the World Wide
23# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
24# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
25# MA 02110-1301, USA.
26#
27# The idea is to make this a double script, running from init-ltsp
28# and also be installed to the initramfs using either dracut or
29# initramfs-tools.
30
31#set -x
32
33[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
34
35# On by default
36OVERLAY=${OVERLAY:-Y}
37
38if [ -f /.inside-cow ]; then
39 # Already inside copy-on-write filesystem
40 return
41fi
42
43if [ ! $OVERLAY ]; then
44 # Someone doesnt love me
45 return
46fi
47
48
49
50# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
51OVERLAYFS=${OVERLAYFS:-unionfs}
52
53panic() { echo "Error: $@"; exit 1; }
54
55
56# Try to give us some tmp space in userland
57test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
58
59[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
60[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
61[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
62[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
63
64if modprobe -q overlayfs; then
65 # For kernel overlays
66 if [ "$DETECT_MODULE_INCOMPLETE" ]; then
67 UNION_TYPE=overlayfs
68 UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
69 fi
70elif modprobe -q fuse; then
71 # For fuse overlays
72 FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
73 if [ "$INSIDE_DRACUT" ]; then
74 . /tmp/root.info
75 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
76 CHROOT_PATH="/tmp/unionfs"
77 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
78 NEWROOT=${NEWROOT:-/sysroot}
79 OLDROOT="$NEWROOT"
80 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
81 mount -t tmpfs tmpfs $CHROOT_PATH/cow
82 mount --move /sysroot /tmp/sysroot
83 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
84 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
85 echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
86 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
87 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
88 elif [ "$INSIDE_INITRAMFS" ]; then
89 # This is for initramfs-tools that include the fuse module.
90 # it is incomplete but should be similar to above, just set
91 # NEWROOT to where it mounts the nfsroot
92 NEWROOT="${rootmnt}"
93 . /tmp/root.info
94 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
95 CHROOT_PATH="/tmp/unionfs"
96 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
97 NEWROOT=${NEWROOT:-/sysroot}
98 OLDROOT="$NEWROOT"
99 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
100 mount -t tmpfs tmpfs $CHROOT_PATH/cow
101 mount --move /sysroot /tmp/sysroot
102 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
103 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
104 echo inside-cow-initramfs > /sysroot/.inside-cow
105 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
106 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
107 elif [ "$INSIDE_LTSP_INIT" ]; then
108 CHROOT_PATH="/tmp/unionfs"
109 UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
110 UBIN=/usr/bin/unionfs
111 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
112 [ -e "/proc/cmdline" ] || mount -t proc proc /proc
113 mount -t tmpfs tmpfs $CHROOT_PATH/cow
114 mount --bind / $CHROOT_PATH/rofs
115 $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
116 mount -t proc proc /tmp/union/proc
117 echo inside-cow-ltsp-init > /tmp/union/.inside-cow
118 cd /tmp/union
119 mkdir oldroot
120 pivot_root . oldroot
121 init q
122 fi
123fi
0124
=== added file 'client/RHEL/share/ltsp/init-ltsp.d/09-hostname'
--- client/RHEL/share/ltsp/init-ltsp.d/09-hostname 1970-01-01 00:00:00 +0000
+++ client/RHEL/share/ltsp/init-ltsp.d/09-hostname 2013-07-22 07:06:30 +0000
@@ -0,0 +1,35 @@
1if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
2 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
3 IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
4 IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
5 case "$HOSTNAME_EXTRA" in
6 mac)
7 HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
8 ;;
9 ip|"")
10 HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
11 ;;
12 esac
13 HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
14fi
15
16hostname "$HOSTNAME"
17echo "$HOSTNAME" > /etc/hostname
18
19cat <<EOF > /etc/hosts
20127.0.0.1 localhost
21127.0.0.2 $HOSTNAME
22$SERVER server
23
24# The following lines are desirable for IPv6 capable hosts
25::1 ip6-localhost ip6-loopback
26fe00::0 ip6-localnet
27ff00::0 ip6-mcastprefix
28ff02::1 ip6-allnodes
29ff02::2 ip6-allrouters
30EOF
31
32if [ -f /etc/hosts.ltsp ]; then
33 cat /etc/hosts.ltsp >> /etc/hosts
34fi
35env | sed -n '/^HOSTS_[0-9][0-9]=/s///p' >> /etc/hosts
036
=== added file 'client/RHEL/share/ltsp/init-ltsp.d/10-cleanup-consoles'
--- client/RHEL/share/ltsp/init-ltsp.d/10-cleanup-consoles 1970-01-01 00:00:00 +0000
+++ client/RHEL/share/ltsp/init-ltsp.d/10-cleanup-consoles 2013-07-22 07:06:30 +0000
@@ -0,0 +1,15 @@
1#!/bin/sh
2
3### Set Runlevel 5 and turn off the mingetty's
4# Fedora 8 and previous, and RHEL5
5[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
6# Fedora 9+ with Upstart
7if [ -e /etc/event.d/tty1 ]; then
8 for NUM in 1 2 3 4 5 6; do
9 echo > /etc/event.d/tty$NUM
10 done
11fi
12# Fedora 13+ and EL6 with Upstart
13if [ -e /etc/init/start-ttys.conf ]; then
14 echo > /etc/init/start-ttys.conf
15fi
016
=== added file 'client/RHEL/share/ltsp/init-ltsp.d/50-gconf-settings'
--- client/RHEL/share/ltsp/init-ltsp.d/50-gconf-settings 1970-01-01 00:00:00 +0000
+++ client/RHEL/share/ltsp/init-ltsp.d/50-gconf-settings 2013-07-22 07:06:30 +0000
@@ -0,0 +1,8 @@
1# Disable Gnome notifications
2gconftool-2 -s \
3/apps/panel/global/tooltips_enabled --type bool false
4
5# Disable lockscreen
6gconftool-2 -s \
7/apps/panel/global/disable_lock_screen --type bool true
8
09
=== added file 'client/RHEL/share/ltsp/ltsp-client-launch'
--- client/RHEL/share/ltsp/ltsp-client-launch 1970-01-01 00:00:00 +0000
+++ client/RHEL/share/ltsp/ltsp-client-launch 2013-07-22 07:06:30 +0000
@@ -0,0 +1,91 @@
1#!/bin/bash
2#
3# ltsp-client-launch LTSP Client Launcher
4#
5# description: This launches the LTSP clients defined in /etc/lts.conf
6# along with sound server and other configured devices.
7#
8
9# Gracefully exit if ltsp_chroot file is not present
10test -f /etc/ltsp_chroot || exit 0
11
12# Make sure LANG is set
13if [ -z "$LANG" ]
14then
15 if [ -f /etc/sysconfig/i18n ]
16 then
17 . /etc/sysconfig/i18n
18 export LANG
19 fi
20fi
21
22if [ -z "$LC_MESSAGES" ]
23then
24 if [ -z "$LC_ALL" ]
25 then
26 LC_MESSAGES=$LANG
27 export LC_MESSAGES
28 fi
29fi
30
31# Grab lts.conf from the same IP address as the mount server.
32# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
33
34# check for NBD devices
35NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
36if [ -n "$NBD_DEVICES" ]; then
37 for DEVICE in $NBD_DEVICES ; do
38 SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
39 test -n "$SERVER" && break
40 done
41else
42 # check for NFS root
43 SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
44fi
45
46SERVER="${SERVER:-172.31.100.254}"
47export SERVER
48
49ARCH=$(uname -m)
50[ "$ARCH" = "i586" ] && ARCH=i386
51[ "$ARCH" = "i686" ] && ARCH=i386
52TFTPPATH="/ltsp/$ARCH/lts.conf"
53
54# Attempt to get lts.conf via tftp
55cd /var/run
56(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
57if [ -s ./lts.conf ];then
58 cp ./lts.conf /etc/lts.conf
59fi
60cd - > /dev/null
61
62# Source function libraries.
63. /usr/share/ltsp/ltsp-init-common
64
65teardown() {
66 killall -g screen_session pulseaudio ldm ltspfsd
67}
68trap "teardown" TERM
69
70# Start Screen Sessions defined in /etc/lts.conf
71for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
72eval num=\$SCREEN_$screen
73if [ -n "$num" ]; then
74 /usr/share/ltsp/screen_session "$screen" &
75fi
76done
77
78# TODO: Move these into service ltsp-client-setup
79configure_localdev
80configure_swap
81configure_serial_mouse
82configure_printer
83
84# /dev/dsp must be owned by pulse
85chown pulse /dev/dsp
86start_sound
87configure_sound_volume
88
89while :; do
90 sleep 365d
91done
092
=== added file 'client/RHEL/share/ltsp/ltsp-client-vendor-functions'
--- client/RHEL/share/ltsp/ltsp-client-vendor-functions 1970-01-01 00:00:00 +0000
+++ client/RHEL/share/ltsp/ltsp-client-vendor-functions 2013-07-22 07:06:30 +0000
@@ -0,0 +1,108 @@
1# Fedora-specific function overrides for the common functions
2
3detect_arch() {
4 echo $(uname -m | sed -e s/i.86/i386/)
5}
6
7if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost.localdomain" ] || [ "$HOSTNAME" = "localhost" ]; then
8 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
9 IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
10 IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
11 case "$HOSTNAME_EXTRA" in
12 mac)
13 HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
14 ;;
15 ip|"")
16 HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
17 ;;
18 esac
19 HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
20fi
21
22# Taken from dracut lib
23# returns OK if $1 contains $2
24strstr() {
25 [ "${1#*$2*}" != "$1" ]
26}
27
28getarg() {
29 set +x
30 local o line
31 if [ -z "$CMDLINE" ]; then
32 if [ -e /etc/cmdline ]; then
33 while read line; do
34 CMDLINE_ETC="$CMDLINE_ETC $line";
35 done </etc/cmdline;
36 fi
37 read CMDLINE </proc/cmdline;
38 CMDLINE="$CMDLINE $CMDLINE_ETC"
39 fi
40 for o in $CMDLINE; do
41 [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
42 [ "${o%%=*}" = "${1%=}" ] && { echo ${o#*=}; [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
43 done
44 [ "$RDDEBUG" = "yes" ] && set -x
45 return 1
46}
47
48getargs() {
49 set +x
50 local o line found
51 if [ -z "$CMDLINE" ]; then
52 if [ -e /etc/cmdline ]; then
53 while read line; do
54 CMDLINE_ETC="$CMDLINE_ETC $line";
55 done </etc/cmdline;
56 fi
57 read CMDLINE </proc/cmdline;
58 CMDLINE="$CMDLINE $CMDLINE_ETC"
59 fi
60 for o in $CMDLINE; do
61 [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
62 if [ "${o%%=*}" = "${1%=}" ]; then
63 echo -n "${o#*=} ";
64 found=1;
65 fi
66 done
67 [ -n "$found" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
68 [ "$RDDEBUG" = "yes" ] && set -x
69 return 1;
70}
71
72nfsroot_to_var() {
73 # strip nfs[4]:
74 local arg="$@:"
75 nfs="${arg%%:*}"
76 arg="${arg##$nfs:}"
77
78 # check if we have a server
79 if strstr "$arg" ':/*' ; then
80 server="${arg%%:/*}"
81 arg="/${arg##*:/}"
82 fi
83
84 path="${arg%%:*}"
85
86 # rest are options
87 options="${arg##$path}"
88 # strip leading ":"
89 options="${options##:}"
90 # strip ":"
91 options="${options%%:}"
92
93 # Does it really start with '/'?
94 [ -n "${path%%/*}" ] && path="error";
95
96 #Fix kernel legacy style separating path and options with ','
97 if [ "$path" != "${path#*,}" ] ; then
98 options=${path#*,}
99 path=${path%%,*}
100 fi
101}
102
103[ -z "$root" ] && root=$(getarg root=)
104[ -z "$netroot" ] && netroot=$(getarg netroot=)
105[ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
106[ -z "$nbdroot" ] && nbdroot=$(getarg nbdroot=)
107
108
0109
=== added directory 'client/RHEL/template'
=== added file 'client/RHEL/template/20-xinitrc-badprocs.sh'
--- client/RHEL/template/20-xinitrc-badprocs.sh 1970-01-01 00:00:00 +0000
+++ client/RHEL/template/20-xinitrc-badprocs.sh 2013-07-22 07:06:30 +0000
@@ -0,0 +1,6 @@
1PATTERN="(vmtoolsd.*vmusr|vmware-user)"
2
3# Signal all running instances of the user daemon.
4# Our pattern ensures that we won't touch the system daemon.
5 pkill -$1 -f "$PATTERN"
6 return 0
07
=== added file 'client/RHEL/template/nbd.ko.i686'
1Binary 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 differ8Binary 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
=== added file 'client/RHEL/template/nbd.ko.x86_64'
2Binary 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 differ9Binary 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
=== added file 'client/RHEL/template/plymouth-default-boot-duration'
--- client/RHEL/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
+++ client/RHEL/template/plymouth-default-boot-duration 2013-07-22 07:06:30 +0000
@@ -0,0 +1,11 @@
10.788:RCkernelparam
20.789:RChostname
30.867:RCmountfs
40.876:RCswap
50.888:portreserve
60.895:rsyslog
70.901:nfslock
80.928:messagebus
90.937:haldaemon
100.990:udev-post
110.996:local
012
=== added file 'client/RHEL/template/sl-other.repo'
--- client/RHEL/template/sl-other.repo 1970-01-01 00:00:00 +0000
+++ client/RHEL/template/sl-other.repo 2013-07-22 07:06:30 +0000
@@ -0,0 +1,42 @@
1[sl-fastbugs]
2name=Scientific Linux $releasever - $basearch - fastbug updates
3baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
4 http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
5 http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
6 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
7#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
8enabled=1
9gpgcheck=1
10gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
11
12[sl-debuginfo]
13name=Scientific Linux Debuginfo
14baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
15 http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
16 http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
17 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
18enabled=0
19gpgcheck=1
20gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
21
22
23[sl-testing]
24name=Scientific Linux Testing - $basearch
25baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
26 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
27 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
28 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
29enabled=0
30gpgcheck=0
31gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
32
33[sl-testing-source]
34name=Scientific Linux Testing - Source
35baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
36 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
37 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
38 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
39enabled=0
40gpgcheck=0
41gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
42
043
=== added file 'client/RHEL/template/x2go.repo'
--- client/RHEL/template/x2go.repo 1970-01-01 00:00:00 +0000
+++ client/RHEL/template/x2go.repo 2013-07-22 07:06:30 +0000
@@ -0,0 +1,7 @@
1[X11_RemoteDesktop_x2go]
2name=X2go - after NoMachine ditched the open version (RHEL_6)
3type=rpm-md
4baseurl=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/
5gpgcheck=1
6gpgkey=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/repodata/repomd.xml.key
7enabled=1
08
=== removed directory 'client/Redhat'
=== removed directory 'client/Redhat/chroot-setup'
=== removed directory 'client/Redhat/chroot-setup/chroot-setup.d'
=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/000-pre-mount-proc'
--- client/Redhat/chroot-setup/chroot-setup.d/000-pre-mount-proc 2013-02-27 08:22:30 +0000
+++ client/Redhat/chroot-setup/chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3mount /proc 2> /dev/null ||:
40
=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/010-cleanup-consoles'
--- client/Redhat/chroot-setup/chroot-setup.d/010-cleanup-consoles 2013-02-27 08:22:30 +0000
+++ client/Redhat/chroot-setup/chroot-setup.d/010-cleanup-consoles 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1#!/bin/sh
2
3### Set Runlevel 5 and turn off the mingetty's
4# Fedora 8 and previous, and RHEL5
5[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
6# Fedora 9+ with Upstart
7if [ -e /etc/event.d/tty1 ]; then
8 for NUM in 1 2 3 4 5 6; do
9 echo > /etc/event.d/tty$NUM
10 done
11fi
12# Fedora 13+ and EL6 with Upstart
13if [ -e /etc/init/start-ttys.conf ]; then
14 echo > /etc/init/start-ttys.conf
15fi
160
=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/020-dracut-config'
--- client/Redhat/chroot-setup/chroot-setup.d/020-dracut-config 2013-02-27 08:22:30 +0000
+++ client/Redhat/chroot-setup/chroot-setup.d/020-dracut-config 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1#!/bin/bash
2
3if [ -f /etc/dracut.conf ]; then
4 echo Generating initramfs
5 cp /usr/share/ltsp/dracut/sysconfig-dracut /etc/dracut.conf.d/ltsp-dracut.conf
6 NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
7 unset DRACUTARG
8 [ -x /sbin/dracut ] && DRACUTARG=--dracut
9 /sbin/dracut -f
10 /sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
11 /sbin/new-kernel-pkg --rpmposttrans $NAME
12else
13 echo Warning: Dracut not installed or no /etc/dracut.conf found
14fi
15
160
=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/030-configure-client'
--- client/Redhat/chroot-setup/chroot-setup.d/030-configure-client 2013-02-27 08:22:30 +0000
+++ client/Redhat/chroot-setup/chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
1#!/bin/sh
2
3# Disable services we don't want
4for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
5 iscsid kudzu lvm2-monitor mcstrans mdmonitor nfs NetworkManager named\
6 pcscd rpcbind rpcgssd rpcidmapd rpcsvcgssd; do
7 if [ ! -e /etc/init.d/$service ]; then
8 continue
9 fi
10 #echo "Disabling Service: $service"
11 /sbin/chkconfig $service off
12done
13
14# Enable services we do want
15for service in haldaemon messagebus rsyslog udev-post ltsp-core ; do
16 if [ ! -e /etc/init.d/$service ]; then
17 continue
18 fi
19 #echo "Enabling Service: $service"
20 /sbin/chkconfig $service on
21done
22
23# Setup readonly-root Mode
24#sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
25
26# Set ltsp-launch-client as DM
27#echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
28
29# Link /etc/mtab to /proc/mounts
30# This is not perfect, but it enables fuse mounts to work.
31rm -f /etc/mtab
32ln -sf ../proc/mounts /etc/mtab
33
34# Files to silence warning messages
35touch /etc/alsa/asound.state
36touch /etc/asound.state
37
38# Silence /etc/mtab rwtab error message during bootup
39sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
40
41# Silence /etc/mtab* removal errors
42sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
43
44# Silence local filesystems mount errors during bootup
45sed -i '/^sysfs/d' /etc/fstab
46sed -i '/sysroot/d' /etc/mtab
47sed -i '/unionfs/d' /etc/mtab
48
49# F10+: install default boot-duration so plymouth can guess the startup progress bar better
50if [ -e /var/lib/plymouth/boot-duration ]; then
51 cp /usr/share/ltsp/template/plymouth-default-boot-duration /var/lib/plymouth/boot-duration
52fi
53
54# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
55sed -i 's/^kill_all $"Sending all processes/#kill_all $"Sending all processes/' /etc/init.d/halt
56sed -i 's/sleep 2/#sleep 2/' /etc/init.d/halt
57sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
580
=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config'
--- client/Redhat/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 2013-02-27 08:22:30 +0000
+++ client/Redhat/chroot-setup/chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1#!/bin/sh
2
3# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
4# Not needed for CentOS 6
5if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
6 cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
7fi
80
=== removed file 'client/Redhat/chroot-setup/chroot-setup.d/090-post-umount-proc'
--- client/Redhat/chroot-setup/chroot-setup.d/090-post-umount-proc 2013-02-27 08:22:30 +0000
+++ client/Redhat/chroot-setup/chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3umount /proc 2> /dev/null ||:
40
=== removed file 'client/Redhat/chroot-setup/ltsp-chroot-setup'
--- client/Redhat/chroot-setup/ltsp-chroot-setup 2013-02-27 08:22:30 +0000
+++ client/Redhat/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1#!/bin/sh
2
3# Exit immediately if this is not a LTSP client chroot.
4[ ! -e /etc/ltsp_chroot ] && exit 0
5
6for i in /usr/share/ltsp/chroot-setup.d/* ; do
7 [ -d $i ] && continue
8 if [ -x $i ]; then
9 $i
10 fi
11done
120
=== removed directory 'client/Redhat/initscripts'
=== removed file 'client/Redhat/initscripts/ltsp-client-launch'
--- client/Redhat/initscripts/ltsp-client-launch 2013-02-27 08:22:30 +0000
+++ client/Redhat/initscripts/ltsp-client-launch 1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
1#!/bin/bash
2#
3# ltsp-client-launch LTSP Client Launcher
4#
5# description: This launches the LTSP clients defined in /etc/lts.conf
6# along with sound server and other configured devices.
7#
8
9# Gracefully exit if ltsp_chroot file is not present
10test -f /etc/ltsp_chroot || exit 0
11
12# Make sure LANG is set
13if [ -z "$LANG" ]
14then
15 if [ -f /etc/sysconfig/i18n ]
16 then
17 . /etc/sysconfig/i18n
18 export LANG
19 fi
20fi
21
22if [ -z "$LC_MESSAGES" ]
23then
24 if [ -z "$LC_ALL" ]
25 then
26 LC_MESSAGES=$LANG
27 export LC_MESSAGES
28 fi
29fi
30
31# Grab lts.conf from the same IP address as the mount server.
32# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
33
34# check for NBD devices
35NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
36if [ -n "$NBD_DEVICES" ]; then
37 for DEVICE in $NBD_DEVICES ; do
38 SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
39 test -n "$SERVER" && break
40 done
41else
42 # check for NFS root
43 SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
44fi
45
46SERVER="${SERVER:-172.31.100.254}"
47export SERVER
48
49ARCH=$(uname -m)
50[ "$ARCH" = "i586" ] && ARCH=i386
51[ "$ARCH" = "i686" ] && ARCH=i386
52TFTPPATH="/ltsp/$ARCH/lts.conf"
53
54# Attempt to get lts.conf via tftp
55cd /var/run
56(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
57if [ -s ./lts.conf ];then
58 cp ./lts.conf /etc/lts.conf
59fi
60cd - > /dev/null
61
62# Source function libraries.
63. /usr/share/ltsp/ltsp-init-common
64
65teardown() {
66 killall -g screen_session pulseaudio ldm ltspfsd
67}
68trap "teardown" TERM
69
70# Start Screen Sessions defined in /etc/lts.conf
71for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
72eval num=\$SCREEN_$screen
73if [ -n "$num" ]; then
74 /usr/share/ltsp/screen_session "$screen" &
75fi
76done
77
78# TODO: Move these into service ltsp-client-setup
79configure_localdev
80configure_swap
81configure_serial_mouse
82configure_printer
83
84# /dev/dsp must be owned by pulse
85chown pulse /dev/dsp
86start_sound
87configure_sound_volume
88
89while :; do
90 sleep 365d
91done
920
=== removed file 'client/Redhat/initscripts/ltsp-core'
--- client/Redhat/initscripts/ltsp-core 2013-02-27 08:22:30 +0000
+++ client/Redhat/initscripts/ltsp-core 1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
1#! /bin/sh
2#
3# Author: Matt Zimmerman <mdz@ubuntu.com>
4#
5### BEGIN INIT INFO
6# Provides: ltsp-client ltsp-client-core ltsp-client-setup
7# Required-Start: $remote_fs $network $syslog
8# Should-Start:
9# Required-Stop:
10# Default-Start: 2 3 4 5
11# Default-Stop: 0 6
12# Short-Description: Script for LTSP client initialization
13# Description:
14### END INIT INFO
15
16set -e
17
18PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
19DESC="LTSP client"
20NAME=ltsp-client
21SCRIPTNAME=/etc/init.d/$NAME
22
23# Gracefully exit if an LTSP boot was not requested
24grep -Eqsw "init=/sbin/init-ltsp|ltsp" /proc/cmdline || exit 0
25
26# handle localization settings
27if [ -r /etc/default/locale ]; then
28 . /etc/default/locale
29 export LANG LANGUAGE
30elif [ -r /etc/environment ]; then
31 . /etc/environment
32 export LANG LANGUAGE
33fi
34
35. /lib/lsb/init-functions
36. /usr/share/ltsp/ltsp-init-common
37
38case "$1" in
39 start)
40 log_success_msg "Starting LTSP client..."
41
42 if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then
43 # Tell the control center that we are booting and get lts.conf
44 eval $(getltscfg-cluster -a -l boot) || true
45 fi
46
47 if [ -x /bin/plymouth ]; then
48 /bin/plymouth quit --retain-splash || true
49 fi
50
51 start_screen_sessions || true
52 start_sound || true
53
54 ;;
55 stop)
56 # This means that an LTSP client is shutting down or rebooting.
57 # Try to cleanly close any open network connections.
58 if [ -x /usr/share/ltsp/nbd-disconnect ]; then
59 /usr/share/ltsp/nbd-disconnect &
60 fi
61 ;;
62 restart|force-reload)
63 echo "$NAME does not support restarting, reboot your client instead." >&2
64 exit 1
65 ;;
66 *)
67 echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
68 exit 1
69 ;;
70esac
71
72exit 0
730
=== removed directory 'client/Redhat/rwtab.d'
=== removed file 'client/Redhat/rwtab.d/ltsp.rwtab'
--- client/Redhat/rwtab.d/ltsp.rwtab 2013-02-27 08:22:30 +0000
+++ client/Redhat/rwtab.d/ltsp.rwtab 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
1# Already in F12 /etc/rwtab
2empty /var/log/ConsoleKit/
3empty /var/lib/dbus/
4empty /var/cache/hald/
5empty /var/lib/pulse/
6files /.viminfo
7files /etc/alsa/asound.state
8# Already in F11 /etc/rwtab
9dirs /var/lib/xkb/
10
11# BUG: Directories that need to be writable but contain files we don't want to disappear
12# (Although somehow this wasn't harmful to LTSP in the past?)
13dirs /etc/udev/rules.d/
14
15# LTSP specific
16dirs /var/cache/ldm/
17dirs /home
18empty /var/cache/ltsp-localapps/
19empty /root
20files /etc/lts.conf
21files /etc/X11/xorg.conf
22files /etc/passwd
23files /etc/group
24files /etc/localtime
25files /etc/cups/client.conf
26# Old versions of Fedora only
27files /etc/asound.state
280
=== removed directory 'client/Redhat/scripts'
=== removed file 'client/Redhat/scripts/ltsp-rewrap-latest-kernel'
--- client/Redhat/scripts/ltsp-rewrap-latest-kernel 2013-02-27 08:22:30 +0000
+++ client/Redhat/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
1#!/bin/bash
2# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
3echo "Re-wrapping vmlinuz and initrd, Please be patient."
4
5NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
6unset DRACUTARG
7[ -x /sbin/dracut ] && DRACUTARG=--dracut
8/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
9/sbin/new-kernel-pkg --rpmposttrans $NAME
10/sbin/depmod -au "$NAME" -F "/boot/System.map-$NAME"
110
=== removed directory 'client/Redhat/share'
=== removed directory 'client/Redhat/share/ltsp'
=== removed directory 'client/Redhat/share/ltsp/init-ltsp.d'
=== removed file 'client/Redhat/share/ltsp/init-ltsp.d/00-overlay'
--- client/Redhat/share/ltsp/init-ltsp.d/00-overlay 2013-02-27 08:22:30 +0000
+++ client/Redhat/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
1#!/bin/sh
2#
3# Overlay filesystem mounting -*- overlay-module -*-
4#
5# 2013, Joshua Trimm <enslaver@enslaver.com>
6#
7# Derived from previously modified scripts written by:
8# 2008, Stephane Graber <stgraber@ubuntu.com>
9# 2009, Vagrant Cascadian <vagrant@freegeek.org>
10#
11# This program is free software; you can redistribute it and/or
12# modify it under the terms of the GNU General Public License as
13# published by the Free Software Foundation; either version 2 of the
14# License, or (at your option) any later version.
15#
16# This program is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with this program. If not, you can find it on the World Wide
23# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
24# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
25# MA 02110-1301, USA.
26#
27# The idea is to make this a double script, running from init-ltsp
28# and also be installed to the initramfs using either dracut or
29# initramfs-tools.
30
31#set -x
32
33[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
34
35# On by default
36OVERLAY=${OVERLAY:-Y}
37
38if [ -f /.inside-cow ]; then
39 # Already inside copy-on-write filesystem
40 return
41fi
42
43if [ ! $OVERLAY ]; then
44 # Someone doesnt love me
45 return
46fi
47
48
49
50# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
51OVERLAYFS=${OVERLAYFS:-unionfs}
52
53panic() { echo "Error: $@"; exit 1; }
54
55
56# Try to give us some tmp space in userland
57test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
58
59[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
60[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
61[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
62[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
63
64if modprobe -q overlayfs; then
65 # For kernel overlays
66 if [ "$DETECT_MODULE_INCOMPLETE" ]; then
67 UNION_TYPE=overlayfs
68 UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
69 fi
70elif modprobe -q fuse; then
71 # For fuse overlays
72 FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
73 if [ "$INSIDE_DRACUT" ]; then
74 . /tmp/root.info
75 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
76 CHROOT_PATH="/tmp/unionfs"
77 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
78 NEWROOT=${NEWROOT:-/sysroot}
79 OLDROOT="$NEWROOT"
80 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
81 mount -t tmpfs tmpfs $CHROOT_PATH/cow
82 mount --move /sysroot /tmp/sysroot
83 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
84 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
85 echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
86 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
87 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
88 elif [ "$INSIDE_INITRAMFS" ]; then
89 # This is for initramfs-tools that include the fuse module.
90 # it is incomplete but should be similar to above, just set
91 # NEWROOT to where it mounts the nfsroot
92 NEWROOT="${rootmnt}"
93 . /tmp/root.info
94 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
95 CHROOT_PATH="/tmp/unionfs"
96 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
97 NEWROOT=${NEWROOT:-/sysroot}
98 OLDROOT="$NEWROOT"
99 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
100 mount -t tmpfs tmpfs $CHROOT_PATH/cow
101 mount --move /sysroot /tmp/sysroot
102 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
103 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
104 echo inside-cow-initramfs > /sysroot/.inside-cow
105 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
106 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
107 elif [ "$INSIDE_LTSP_INIT" ]; then
108 CHROOT_PATH="/tmp/unionfs"
109 UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
110 UBIN=/usr/bin/unionfs
111 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
112 [ -e "/proc/cmdline" ] || mount -t proc proc /proc
113 mount -t tmpfs tmpfs $CHROOT_PATH/cow
114 mount --bind / $CHROOT_PATH/rofs
115 $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
116 mount -t proc proc /tmp/union/proc
117 echo inside-cow-ltsp-init > /tmp/union/.inside-cow
118 cd /tmp/union
119 mkdir oldroot
120 pivot_root . oldroot
121 init q
122 fi
123fi
1240
=== removed file 'client/Redhat/share/ltsp/init-ltsp.d/09-hostname'
--- client/Redhat/share/ltsp/init-ltsp.d/09-hostname 2013-02-27 08:22:30 +0000
+++ client/Redhat/share/ltsp/init-ltsp.d/09-hostname 1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
1if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
2 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
3 case "$HOSTNAME_EXTRA" in
4 mac)
5 HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
6 ;;
7 ip|"")
8 HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
9 ;;
10 esac
11 HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
12fi
13
14hostname "$HOSTNAME"
15echo "$HOSTNAME" > /etc/hostname
16
17cat <<EOF > /etc/hosts
18127.0.0.1 localhost
19127.0.0.2 $HOSTNAME
20$SERVER server
21
22# The following lines are desirable for IPv6 capable hosts
23::1 ip6-localhost ip6-loopback
24fe00::0 ip6-localnet
25ff00::0 ip6-mcastprefix
26ff02::1 ip6-allnodes
27ff02::2 ip6-allrouters
28EOF
29
30if [ -f /etc/hosts.ltsp ]; then
31 cat /etc/hosts.ltsp >> /etc/hosts
32fi
33env | sed -n '/^HOSTS_[0-9][0-9]=/s///p' >> /etc/hosts
340
=== removed file 'client/Redhat/share/ltsp/ltsp-client-launch'
--- client/Redhat/share/ltsp/ltsp-client-launch 2013-02-27 08:22:30 +0000
+++ client/Redhat/share/ltsp/ltsp-client-launch 1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
1#!/bin/bash
2#
3# ltsp-client-launch LTSP Client Launcher
4#
5# description: This launches the LTSP clients defined in /etc/lts.conf
6# along with sound server and other configured devices.
7#
8
9# Gracefully exit if ltsp_chroot file is not present
10test -f /etc/ltsp_chroot || exit 0
11
12# Make sure LANG is set
13if [ -z "$LANG" ]
14then
15 if [ -f /etc/sysconfig/i18n ]
16 then
17 . /etc/sysconfig/i18n
18 export LANG
19 fi
20fi
21
22if [ -z "$LC_MESSAGES" ]
23then
24 if [ -z "$LC_ALL" ]
25 then
26 LC_MESSAGES=$LANG
27 export LC_MESSAGES
28 fi
29fi
30
31# Grab lts.conf from the same IP address as the mount server.
32# (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.)
33
34# check for NBD devices
35NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts)
36if [ -n "$NBD_DEVICES" ]; then
37 for DEVICE in $NBD_DEVICES ; do
38 SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}')
39 test -n "$SERVER" && break
40 done
41else
42 # check for NFS root
43 SERVER=$(sed -ne '/ltsp.*nfs/ { s/^\([^:]*\):.*$/\1/; p; q }' /proc/mounts)
44fi
45
46SERVER="${SERVER:-172.31.100.254}"
47export SERVER
48
49ARCH=$(uname -m)
50[ "$ARCH" = "i586" ] && ARCH=i386
51[ "$ARCH" = "i686" ] && ARCH=i386
52TFTPPATH="/ltsp/$ARCH/lts.conf"
53
54# Attempt to get lts.conf via tftp
55cd /var/run
56(echo "get ${TFTPPATH}"|tftp ${SERVER} >/dev/null 2>&1)
57if [ -s ./lts.conf ];then
58 cp ./lts.conf /etc/lts.conf
59fi
60cd - > /dev/null
61
62# Source function libraries.
63. /usr/share/ltsp/ltsp-init-common
64
65teardown() {
66 killall -g screen_session pulseaudio ldm ltspfsd
67}
68trap "teardown" TERM
69
70# Start Screen Sessions defined in /etc/lts.conf
71for screen in 01 02 03 04 05 06 07 08 09 10 11 12; do
72eval num=\$SCREEN_$screen
73if [ -n "$num" ]; then
74 /usr/share/ltsp/screen_session "$screen" &
75fi
76done
77
78# TODO: Move these into service ltsp-client-setup
79configure_localdev
80configure_swap
81configure_serial_mouse
82configure_printer
83
84# /dev/dsp must be owned by pulse
85chown pulse /dev/dsp
86start_sound
87configure_sound_volume
88
89while :; do
90 sleep 365d
91done
920
=== removed file 'client/Redhat/share/ltsp/ltsp-client-vendor-functions'
--- client/Redhat/share/ltsp/ltsp-client-vendor-functions 2013-02-27 08:22:30 +0000
+++ client/Redhat/share/ltsp/ltsp-client-vendor-functions 1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
1# Fedora-specific function overrides for the common functions
2
3detect_arch() {
4 echo $(uname -m | sed -e s/i.86/i386/)
5}
6
7if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost.localdomain" ] || [ "$HOSTNAME" = "localhost" ]; then
8 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
9 IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
10 IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
11 case "$HOSTNAME_EXTRA" in
12 mac)
13 HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
14 ;;
15 ip|"")
16 HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
17 ;;
18 esac
19 HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA"
20fi
21
22# Taken from dracut lib
23# returns OK if $1 contains $2
24strstr() {
25 [ "${1#*$2*}" != "$1" ]
26}
27
28getarg() {
29 set +x
30 local o line
31 if [ -z "$CMDLINE" ]; then
32 if [ -e /etc/cmdline ]; then
33 while read line; do
34 CMDLINE_ETC="$CMDLINE_ETC $line";
35 done </etc/cmdline;
36 fi
37 read CMDLINE </proc/cmdline;
38 CMDLINE="$CMDLINE $CMDLINE_ETC"
39 fi
40 for o in $CMDLINE; do
41 [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
42 [ "${o%%=*}" = "${1%=}" ] && { echo ${o#*=}; [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
43 done
44 [ "$RDDEBUG" = "yes" ] && set -x
45 return 1
46}
47
48getargs() {
49 set +x
50 local o line found
51 if [ -z "$CMDLINE" ]; then
52 if [ -e /etc/cmdline ]; then
53 while read line; do
54 CMDLINE_ETC="$CMDLINE_ETC $line";
55 done </etc/cmdline;
56 fi
57 read CMDLINE </proc/cmdline;
58 CMDLINE="$CMDLINE $CMDLINE_ETC"
59 fi
60 for o in $CMDLINE; do
61 [ "$o" = "$1" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
62 if [ "${o%%=*}" = "${1%=}" ]; then
63 echo -n "${o#*=} ";
64 found=1;
65 fi
66 done
67 [ -n "$found" ] && { [ "$RDDEBUG" = "yes" ] && set -x; return 0; }
68 [ "$RDDEBUG" = "yes" ] && set -x
69 return 1;
70}
71
72nfsroot_to_var() {
73 # strip nfs[4]:
74 local arg="$@:"
75 nfs="${arg%%:*}"
76 arg="${arg##$nfs:}"
77
78 # check if we have a server
79 if strstr "$arg" ':/*' ; then
80 server="${arg%%:/*}"
81 arg="/${arg##*:/}"
82 fi
83
84 path="${arg%%:*}"
85
86 # rest are options
87 options="${arg##$path}"
88 # strip leading ":"
89 options="${options##:}"
90 # strip ":"
91 options="${options%%:}"
92
93 # Does it really start with '/'?
94 [ -n "${path%%/*}" ] && path="error";
95
96 #Fix kernel legacy style separating path and options with ','
97 if [ "$path" != "${path#*,}" ] ; then
98 options=${path#*,}
99 path=${path%%,*}
100 fi
101}
102
103[ -z "$root" ] && root=$(getarg root=)
104[ -z "$netroot" ] && netroot=$(getarg netroot=)
105[ -z "$nfsroot" ] && nfsroot=$(getarg nfsroot=)
106[ -z "$nbdroot" ] && nbdroot=$(getarg nbdroot=)
107
108
1090
=== removed directory 'client/Redhat/template'
=== removed file 'client/Redhat/template/20-xinitrc-badprocs.sh'
--- client/Redhat/template/20-xinitrc-badprocs.sh 2013-02-27 08:22:30 +0000
+++ client/Redhat/template/20-xinitrc-badprocs.sh 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1PATTERN="(vmtoolsd.*vmusr|vmware-user)"
2
3# Signal all running instances of the user daemon.
4# Our pattern ensures that we won't touch the system daemon.
5 pkill -$1 -f "$PATTERN"
6 return 0
70
=== removed file 'client/Redhat/template/clover.png'
8Binary 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 differ1Binary 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
=== removed file 'client/Redhat/template/plymouth-default-boot-duration'
--- client/Redhat/template/plymouth-default-boot-duration 2013-02-27 08:22:30 +0000
+++ client/Redhat/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
10.788:RCkernelparam
20.789:RChostname
30.867:RCmountfs
40.876:RCswap
50.888:portreserve
60.895:rsyslog
70.901:nfslock
80.928:messagebus
90.937:haldaemon
100.990:udev-post
110.996:local
120
=== removed file 'client/Redhat/template/sl-other.repo'
--- client/Redhat/template/sl-other.repo 2013-02-27 08:22:30 +0000
+++ client/Redhat/template/sl-other.repo 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
1[sl-fastbugs]
2name=Scientific Linux $releasever - $basearch - fastbug updates
3baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
4 http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
5 http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
6 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
7#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
8enabled=1
9gpgcheck=1
10gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
11
12[sl-debuginfo]
13name=Scientific Linux Debuginfo
14baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
15 http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
16 http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
17 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
18enabled=0
19gpgcheck=1
20gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
21
22
23[sl-testing]
24name=Scientific Linux Testing - $basearch
25baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
26 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
27 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
28 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
29enabled=0
30gpgcheck=0
31gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
32
33[sl-testing-source]
34name=Scientific Linux Testing - Source
35baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
36 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
37 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
38 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
39enabled=0
40gpgcheck=0
41gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
42
430
=== removed directory 'client/k12linux'
=== removed directory 'client/k12linux/chroot-setup'
=== removed file 'client/k12linux/chroot-setup/README'
--- client/k12linux/chroot-setup/README 2008-07-16 20:21:36 +0000
+++ client/k12linux/chroot-setup/README 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1This directory contains scriptlets that run in numerical order in %post of ltsp-client.
20
=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup'
--- client/k12linux/chroot-setup/ltsp-chroot-setup 2008-07-16 20:21:36 +0000
+++ client/k12linux/chroot-setup/ltsp-chroot-setup 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1#!/bin/sh
2
3# Exit immediately if this is not a LTSP client chroot.
4[ ! -e /etc/ltsp_chroot ] && exit 0
5
6for i in /usr/share/ltsp/chroot-setup.d/* ; do
7 [ -d $i ] && continue
8 if [ -x $i ]; then
9 $i
10 fi
11done
120
=== removed directory 'client/k12linux/chroot-setup/ltsp-chroot-setup.d'
=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/000-pre-mount-proc'
--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/000-pre-mount-proc 2011-08-12 04:42:11 +0000
+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/000-pre-mount-proc 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3mount /proc 2> /dev/null ||:
40
=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-cleanup-consoles'
--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-cleanup-consoles 2011-05-23 07:03:26 +0000
+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-cleanup-consoles 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1#!/bin/sh
2
3### Set Runlevel 5 and turn off the mingetty's
4# Fedora 8 and previous, and RHEL5
5[ -e /etc/inittab ] && sed -i 's/^id:3/id:5/; /^[1-6].*/d;' /etc/inittab
6# Fedora 9+ with Upstart
7if [ -e /etc/event.d/tty1 ]; then
8 for NUM in 1 2 3 4 5 6; do
9 echo > /etc/event.d/tty$NUM
10 done
11fi
12# Fedora 13+ and EL6 with Upstart
13if [ -e /etc/init/start-ttys.conf ]; then
14 echo > /etc/init/start-ttys.conf
15fi
160
=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-etc-hosts'
--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-etc-hosts 2008-10-30 21:08:51 +0000
+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/010-etc-hosts 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
1#!/bin/sh
2
3cat <<EOF > /dev/hosts
4#This is a ltsp chroot and this file will be rewritten in boot process
5#of terminal.
6127.0.0.1 localhost
7EOF
8
9rm -f /etc/hosts
10ln -s ../dev/hosts /etc/hosts
11
12cat <<EOF > /etc/sysconfig/network
13NETWORKING=yes
14NETWORKING_IPV6=no
15HOSTNAME=localhost.localdomain
16/bin/grep -q "Generated by ltsp-client" /etc/hosts 2> /dev/null
17if [ \$? -ne 0 ]; then
18 ipaddr=\$(ip addr show scope global | awk '/[[:space:]]inet / { print gensub("/.*","","g",\$2) }')
19 echo "# Generated by ltsp-client during bootup" >> /etc/hosts
20 echo "127.0.0.1 localhost" >> /etc/hosts
21 echo "\$ipaddr client-\$ipaddr" >> /etc/hosts
22fi
23EOF
240
=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/030-configure-client'
--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/030-configure-client 2011-08-10 13:40:48 +0000
+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/030-configure-client 1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
1#!/bin/sh
2
3# Disable services we don't want
4for service in ConsoleKit avahi-daemon crond cups exim gpm iptables ip6tables \
5 iscsi iscsid kudzu lvm2-monitor mcstrans mdmonitor netfs network nfs \
6 pcscd rpcbind rpcgssd rpcidmapd rpcsvcgssd; do
7 if [ ! -e /etc/init.d/$service ]; then
8 continue
9 fi
10 #echo "Disabling Service: $service"
11 /sbin/chkconfig $service off
12done
13
14# Enable services we do want
15for service in haldaemon messagebus rsyslog udev-post; do
16 if [ ! -e /etc/init.d/$service ]; then
17 continue
18 fi
19 #echo "Enabling Service: $service"
20 /sbin/chkconfig $service on
21done
22
23# Setup readonly-root Mode
24sed -i 's/READONLY=no/READONLY=yes/' /etc/sysconfig/readonly-root
25
26# Set ltsp-launch-client as DM
27echo "DISPLAYMANAGER=/usr/sbin/ltsp-client-launch" > /etc/sysconfig/desktop
28
29# Link /etc/mtab to /proc/mounts
30# This is not perfect, but it enables fuse mounts to work.
31rm -f /etc/mtab
32ln -sf ../proc/mounts /etc/mtab
33
34# Blacklist pcspkr
35/bin/grep -q "blacklist pcspkr" /etc/modprobe.d/blacklist-pcspkr.conf 2> /dev/null
36if [ $? -ne 0 ]; then
37 echo "blacklist pcspkr" >> /etc/modprobe.d/blacklist-pcspkr.conf
38fi
39
40# Files to silence warning messages
41touch /etc/alsa/asound.state
42touch /etc/asound.state
43
44# Silence /etc/mtab rwtab error message during bootup
45sed -i 's/^files[[:space:]]\/etc\/mtab//' /etc/rwtab
46
47# Silence /etc/mtab* removal errors
48sed -i 's/^rm -f \/etc\/mtab/#rm -f \/etc\/mtab/' /etc/rc.d/rc.sysinit
49
50# Silence local filesystems mount errors during bootup
51sed -i '/^sysfs/d' /etc/fstab
52
53# F10+: install default boot-duration so plymouth can guess the startup progress bar better
54if [ -e /var/lib/plymouth/boot-duration ]; then
55 cp /usr/share/ltsp/template/plymouth-default-boot-duration /var/lib/plymouth/boot-duration
56fi
57
58# Allow clean shutdown to complete when rootfs is mounted on a nbd or iscsi block device
59sed -i 's/^action $"Sending all processes/#action $"Sending all processes/' /etc/init.d/halt
60sed -i 's/^sleep 2/#sleep 2/' /etc/init.d/halt
61sed -i 's/^rm -f/#rm -f/' /etc/init.d/halt
620
=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/085-sl6-fastbugs-yum-config'
--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/085-sl6-fastbugs-yum-config 2011-08-10 09:42:25 +0000
+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/085-sl6-fastbugs-yum-config 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1#!/bin/sh
2
3# Install SL6 "fastbugs" repo config if Scientific Linux 6 and not yet installed
4# Not needed for CentOS 6
5if [ -f /etc/yum.repos.d/sl.repo ] && [ ! -f /etc/yum.repos.d/sl-other.repo ]; then
6 cp /usr/share/ltsp/template/sl-other.repo /etc/yum.repos.d/sl-other.repo
7fi
80
=== removed file 'client/k12linux/chroot-setup/ltsp-chroot-setup.d/090-post-umount-proc'
--- client/k12linux/chroot-setup/ltsp-chroot-setup.d/090-post-umount-proc 2011-08-12 04:42:11 +0000
+++ client/k12linux/chroot-setup/ltsp-chroot-setup.d/090-post-umount-proc 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3umount /proc 2> /dev/null ||:
40
=== removed directory 'client/k12linux/rwtab.d'
=== removed file 'client/k12linux/rwtab.d/k12linux.rwtab'
--- client/k12linux/rwtab.d/k12linux.rwtab 2009-08-05 19:34:47 +0000
+++ client/k12linux/rwtab.d/k12linux.rwtab 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
1# Already in F12 /etc/rwtab
2empty /var/log/ConsoleKit/
3empty /var/lib/dbus/
4empty /var/cache/hald/
5empty /var/lib/pulse/
6files /.viminfo
7files /etc/alsa/asound.state
8# Already in F11 /etc/rwtab
9dirs /var/lib/xkb/
10
11# BUG: Directories that need to be writable but contain files we don't want to disappear
12# (Although somehow this wasn't harmful to LTSP in the past?)
13dirs /etc/udev/rules.d/
14
15# LTSP specific
16dirs /var/cache/ldm/
17dirs /home
18empty /var/cache/ltsp-localapps/
19empty /root
20files /etc/lts.conf
21files /etc/X11/xorg.conf
22files /etc/passwd
23files /etc/group
24files /etc/localtime
25files /etc/cups/client.conf
26# Old versions of Fedora only
27files /etc/asound.state
280
=== removed directory 'client/k12linux/scripts'
=== removed file 'client/k12linux/scripts/ltsp-rewrap-latest-kernel'
--- client/k12linux/scripts/ltsp-rewrap-latest-kernel 2011-08-12 06:17:12 +0000
+++ client/k12linux/scripts/ltsp-rewrap-latest-kernel 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1#!/bin/bash
2# Run dracut or mkinitrd and postinst.d/* on the latest installed kernel again
3
4NAME=`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`
5unset DRACUTARG
6[ -x /sbin/dracut ] && DRACUTARG=--dracut
7/sbin/new-kernel-pkg --mkinitrd $DRACUTARG --install $NAME
8/sbin/new-kernel-pkg --rpmposttrans $NAME
90
=== removed directory 'client/k12linux/template'
=== removed file 'client/k12linux/template/plymouth-default-boot-duration'
--- client/k12linux/template/plymouth-default-boot-duration 2011-08-10 13:38:12 +0000
+++ client/k12linux/template/plymouth-default-boot-duration 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
10.788:RCkernelparam
20.789:RChostname
30.867:RCmountfs
40.876:RCswap
50.888:portreserve
60.895:rsyslog
70.901:nfslock
80.928:messagebus
90.937:haldaemon
100.990:udev-post
110.996:local
120
=== removed file 'client/k12linux/template/sl-other.repo'
--- client/k12linux/template/sl-other.repo 2011-08-10 09:42:25 +0000
+++ client/k12linux/template/sl-other.repo 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
1[sl-fastbugs]
2name=Scientific Linux $releasever - $basearch - fastbug updates
3baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
4 http://ftp1.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
5 http://ftp2.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
6 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/$basearch/updates/fastbugs/
7#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
8enabled=1
9gpgcheck=1
10gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
11
12[sl-debuginfo]
13name=Scientific Linux Debuginfo
14baseurl=http://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
15 http://ftp1.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
16 http://ftp2.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
17 ftp://ftp.scientificlinux.org/linux/scientific/$releasever/archive/debuginfo/
18enabled=0
19gpgcheck=1
20gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
21
22
23[sl-testing]
24name=Scientific Linux Testing - $basearch
25baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
26 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
27 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
28 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
29enabled=0
30gpgcheck=0
31gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
32
33[sl-testing-source]
34name=Scientific Linux Testing - Source
35baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
36 http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
37 http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
38 ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
39enabled=0
40gpgcheck=0
41gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson
42
430
=== added file 'client/share/ltsp/background.png'
44Binary 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 differ1Binary 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
=== added file 'client/share/ltsp/background.svg'
--- client/share/ltsp/background.svg 1970-01-01 00:00:00 +0000
+++ client/share/ltsp/background.svg 2013-07-22 07:06:30 +0000
@@ -0,0 +1,447 @@
1<?xml version="1.0" standalone="no"?>
2<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
3 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
4<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
5 width="640.000000pt" height="480.000000pt" viewBox="0 0 640.000000 480.000000"
6 preserveAspectRatio="xMidYMid meet">
7<metadata>
8Created by potrace 1.11, written by Peter Selinger 2001-2013
9</metadata>
10<g transform="translate(0.000000,480.000000) scale(0.100000,-0.100000)"
11fill="#000000" stroke="none">
12<path d="M0 3645 c0 -806 3 -1155 11 -1155 6 0 7 -5 2 -12 -12 -19 -10 -58 2
13-58 7 0 18 -12 26 -28 8 -15 18 -30 23 -34 6 -4 4 -13 -3 -22 -8 -9 -10 -16
14-5 -16 5 -1 -6 -7 -23 -15 -25 -11 -33 -20 -33 -40 0 -25 23 -35 35 -15 4 6
1510 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
1646 -7 30 -5 39 13 56 27 25 33 10 13 -29 -15 -29 -15 -30 14 -42 23 -10 33
17-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
1848 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
1916 17 43 21 100 15 103 16 82 32 -20 14 -69 10 -92 -9 -6 -5 -27 -8 -45 -6
20-30 3 -33 6 -36 38 -2 29 3 41 28 63 36 33 39 57 7 57 -25 0 -57 -28 -57 -48
210 -7 -4 -12 -8 -12 -5 0 -23 -13 -40 -28 -31 -28 -44 -72 -21 -72 6 0 17 -6
2224 -14 12 -11 10 -15 -11 -26 -15 -8 -28 -28 -34 -52 -6 -21 -17 -38 -24 -38
23-8 0 -19 -7 -26 -15 -17 -21 -30 -19 -30 4 0 11 -4 22 -9 26 -5 3 -12 19 -16
2436 -6 25 -10 29 -28 23 -12 -3 -29 -13 -38 -20 -8 -8 -26 -14 -38 -14 -20 0
25-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
2637 30 20 10 81 62 136 117 98 97 102 100 148 102 37 1 45 4 37 14 -15 17 56
2716 180 -3 124 -20 182 -36 182 -52 0 -10 -22 -13 -82 -14 -46 0 -76 -3 -68 -6
288 -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
2920 2 36 -4 29 -10 56 1 29 11 -22 8 22 34 48 29 28 -5 30 0 8 33 -15 23 -15
3025 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
31-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
328 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
33-18 13 -5 13 -4 1 10 -7 10 -19 17 -25 17 -18 0 -56 43 -56 63 0 25 37 21 66
34-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
3511 -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
360 8 -6 32 -15 54 -19 22 -4 59 -15 83 -25 34 -15 42 -23 38 -37 -6 -16 0 -19
3742 -20 29 0 64 -9 86 -21 20 -12 47 -21 59 -21 21 0 96 -35 107 -49 9 -13 78
38-41 98 -41 12 0 24 -4 27 -10 3 -5 13 -10 22 -10 28 0 190 -147 263 -239 14
39-17 28 -31 32 -31 5 0 8 101 8 223 0 204 2 225 18 240 17 15 56 17 358 17 281
400 344 -3 368 -15 15 -8 30 -15 31 -15 8 0 -10 46 -22 58 -7 7 -13 22 -13 33 0
4110 -4 19 -10 19 -5 0 -10 11 -10 25 0 14 -5 25 -10 25 -12 0 -8 91 4 125 26
4267 79 165 91 165 7 0 26 6 42 14 46 23 97 36 139 36 55 0 155 -25 165 -41 6
43-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
44-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
45-20 0 -14 -5 -18 -17 -13 -10 4 -1 -9 18 -28 20 -19 38 -41 42 -49 4 -12 6
46-12 6 2 1 10 9 16 19 15 14 -1 17 -7 13 -31 -2 -17 -6 -25 -8 -18 -9 23 -23
4712 -23 -18 0 -23 4 -30 16 -28 11 2 18 -5 19 -19 1 -16 -4 -23 -17 -23 -14 0
48-18 -8 -18 -35 0 -33 12 -46 24 -26 3 5 20 11 38 14 18 3 57 12 86 19 51 13
4952 14 32 31 -25 21 -25 34 0 42 26 8 40 -1 40 -26 0 -12 7 -19 19 -19 11 0 18
506 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
51-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
52-3 28 c-2 15 -7 25 -12 22 -4 -3 -6 -14 -3 -24 6 -24 -9 -33 -42 -25 -19 5
53-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
54-5 c-20 -3 -27 0 -27 12 -1 15 -1 15 -10 0 -10 -18 -58 -15 -73 5 -5 7 -6 3
55-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
5635 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
57-41 -12 -45 -43 -25 -17 10 -22 9 -30 -3 -5 -8 -10 -10 -10 -4 0 7 -26 12 -72
5812 -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
5911 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
60-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
61-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
6218 -6 3 -12 20 -12 39 0 28 4 34 22 34 26 0 16 13 -12 15 -14 1 -20 -7 -25
63-36 -4 -21 -4 -42 -2 -46 3 -4 -7 -9 -21 -10 -25 -1 -72 30 -72 48 0 8 34 21
6460 24 8 0 15 5 15 10 0 11 -11 11 -39 -1 -16 -6 -18 -4 -13 10 6 14 3 17 -9
6512 -8 -3 -18 -6 -20 -6 -2 0 -4 -20 -4 -44 0 -49 -19 -66 -46 -39 -15 16 -17
6616 -29 0 -7 -9 -15 -17 -19 -17 -4 0 -15 -7 -23 -16 -13 -12 -13 -15 -2 -14
6730 5 39 -1 39 -25 0 -21 -5 -25 -29 -25 -33 0 -54 19 -42 39 12 19 -28 62 -54
6859 -15 -2 -20 3 -20 22 0 18 6 26 23 28 12 2 22 10 22 18 0 13 -13 19 -33 15
69-5 -1 -11 8 -14 19 -3 11 -14 20 -24 20 -12 0 -16 -5 -13 -14 3 -8 1 -16 -4
70-20 -14 -9 -52 5 -52 20 0 8 -9 14 -20 14 -13 0 -18 -5 -14 -15 5 -11 -1 -15
71-20 -15 -16 0 -26 6 -26 15 0 9 -10 15 -26 15 -14 0 -23 -4 -19 -10 8 -14 -21
72-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
73-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
7443 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
750 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
763 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
7713 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
78-45 -12 -84 -12 -68 -1 -76 3 -70 37 3 17 -21 5 -26 -13 -3 -11 -12 -20 -20
79-20 -18 0 -73 -56 -73 -75 0 -8 -8 -15 -17 -15 -29 0 -73 -44 -73 -74 0 -19
80-5 -25 -17 -23 -45 7 -52 43 -11 49 20 3 20 3 1 28 -20 25 -21 44 -8 88 5 14
813 22 -4 22 -6 0 -11 6 -11 14 0 8 -4 17 -9 20 -14 9 -41 -4 -41 -20 0 -8 -9
82-14 -20 -14 -13 0 -20 7 -20 20 0 12 -7 20 -16 20 -9 0 -18 -9 -21 -20 -3 -13
83-14 -20 -29 -20 -16 0 -22 4 -18 14 6 16 -19 28 -41 20 -8 -4 -15 -12 -15 -20
840 -8 -7 -14 -16 -14 -10 0 -14 6 -10 15 6 18 10 17 -79 19 -80 1 -95 8 -95 42
850 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
86-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
8740 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
8825 15 0 11 -7 14 -25 9 -23 -6 -25 -3 -25 28 0 19 6 40 13 47 10 11 10 14 0
8918 -16 6 -17 73 -2 73 5 0 7 5 4 10 -15 24 -27 -6 -23 -56 3 -29 2 -51 -2 -49
90-3 2 -4 -11 -2 -30 4 -38 -8 -50 -44 -41 -21 6 -25 12 -22 39 2 24 8 33 26 35
9130 5 28 22 -3 22 -22 0 -25 4 -25 35 0 25 -4 35 -15 35 -9 0 -15 -6 -14 -12 5
92-42 -2 -56 -30 -60 -33 -5 -41 9 -31 52 4 18 12 25 29 25 13 0 27 7 29 15 4
9312 2 13 -9 3 -9 -8 -20 -9 -29 -3 -9 6 -769 10 -1867 10 l-1853 0 0 -1155z
94m2629 467 c61 -59 111 -111 111 -117 0 -5 -22 -30 -49 -55 -28 -25 -82 -76
95-121 -113 -87 -84 -98 -81 -102 31 l-3 77 -220 5 -220 5 -3 45 c-3 33 1 47 14
9657 27 20 40 15 16 -6 -15 -12 -22 -30 -22 -55 l0 -36 225 0 225 0 0 -80 c0
97-70 2 -80 18 -80 10 0 64 46 121 101 l103 102 -111 110 c-127 126 -131 126
98-131 11 l0 -72 -55 -1 c-67 0 -74 17 -7 21 l47 3 1 63 c3 125 21 123 163 -16z
99m-1141 -220 c105 -103 192 -193 192 -200 0 -7 -43 -54 -96 -105 -53 -51 -141
100-136 -196 -189 -144 -141 -161 -135 -166 63 l-4 128 -369 3 c-427 3 -400 -3
101-402 100 -2 105 -29 98 402 98 l371 0 0 120 c0 230 14 229 268 -18z m1863 80
102c38 -36 69 -72 69 -81 0 -23 -138 -151 -155 -144 -11 3 -15 21 -15 59 l0 54
103-145 0 -145 0 0 26 c0 43 17 49 130 48 155 -1 160 0 160 47 0 40 21 90 29 67
1042 -6 35 -41 72 -76z m-1140 -329 c17 -10 33 -29 36 -43 3 -14 10 -31 16 -37
10514 -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
10610 10 10 6 0 10 -7 10 -15 0 -12 -18 -15 -105 -15 -87 0 -105 -3 -105 -15 0
107-8 -5 -15 -11 -15 -5 0 -8 4 -4 9 8 14 -12 23 -35 16 -14 -4 -20 -15 -20 -36
1080 -16 -4 -29 -9 -29 -5 0 -17 -8 -27 -17 -23 -23 -124 -25 -145 -3 -56 60 -60
109125 -10 179 24 26 36 31 76 31 27 0 60 -8 76 -17z m294 -495 c24 -19 25 -23
11025 -147 0 -165 4 -161 -153 -164 -82 -2 -120 1 -133 10 -15 11 4 13 118 13
111115 0 137 2 142 16 3 9 6 66 6 129 0 82 -4 116 -14 124 -17 14 -246 14 -263
112-1 -7 -6 -13 -28 -13 -49 l0 -39 58 -2 57 -1 -55 -6 -55 -6 0 -78 c0 -42 -3
113-77 -7 -77 -13 0 -10 288 3 292 7 2 68 4 136 5 108 1 126 -2 148 -19z"/>
114<path d="M1260 4055 c-8 -10 -12 -56 -11 -145 l2 -130 -371 0 c-435 0 -420 3
115-420 -88 0 -40 5 -58 18 -68 13 -11 97 -13 395 -14 l378 0 -2 -122 c-2 -156
116-2 -155 16 -162 11 -4 73 51 200 176 102 100 185 187 185 193 0 6 -79 87 -176
117181 -97 93 -183 174 -189 181 -10 10 -16 9 -25 -2z"/>
118<path d="M3266 3980 c-3 -23 -4 -45 -1 -50 3 -6 -56 -11 -142 -12 -145 -3
119-148 -3 -151 -25 -3 -23 -3 -23 142 -23 l146 0 1 -27 c1 -16 1 -40 1 -55 -1
120-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
12124 -42 53 -87 84 -85 84 -93 37z"/>
122<path d="M2088 3633 c-35 -23 -55 -81 -38 -114 26 -49 52 -69 92 -69 29 0 45
1237 62 25 27 30 41 87 27 112 -28 54 -96 75 -143 46z"/>
124<path d="M3758 4492 c-1 -37 -1 -88 0 -114 2 -46 2 -47 -25 -45 -23 2 -27 7
125-25 25 3 18 -2 22 -23 22 -22 0 -24 -3 -16 -19 9 -16 7 -20 -14 -23 -29 -6
126-35 -1 -35 24 0 11 -7 18 -20 18 -13 0 -20 -7 -20 -20 0 -15 -7 -20 -26 -20
127-21 0 -25 4 -21 20 4 16 0 20 -23 20 -23 0 -27 -4 -23 -20 4 -16 0 -20 -22
128-20 -22 0 -26 4 -22 20 4 17 0 20 -29 20 -32 0 -34 -2 -24 -21 10 -18 9 -20
129-7 -17 -10 2 -17 12 -17 21 2 14 -5 17 -29 15 -28 -3 -32 -7 -34 -38 l-3 -35
130215 3 c244 4 248 3 244 -62 -1 -23 -2 -58 -1 -80 2 -33 4 -37 17 -26 8 7 15
13118 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
13214 -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
133-6 -28 -12 -31 -20 -7 -58 15 -58 33 0 26 20 41 42 29 28 -15 22 -1 -17 35
134-32 30 -34 31 -37 12 -3 -23 -35 -29 -55 -9 -21 19 -16 51 8 55 19 3 18 6 -15
13540 l-36 37 -2 -67z"/>
136<path d="M4150 4124 c0 -9 11 -14 30 -14 17 0 31 -6 31 -12 1 -7 2 -20 3 -28
1371 -20 -24 -30 -46 -18 -15 7 -18 4 -18 -16 0 -23 2 -24 30 -16 30 9 30 8 30
138-31 0 -39 -1 -40 -32 -37 -25 2 -34 8 -36 26 -2 12 -8 22 -14 22 -5 0 -8 -6
139-5 -14 7 -19 -12 -36 -40 -36 -18 0 -23 6 -23 25 0 18 -5 25 -20 25 -17 0 -19
140-4 -14 -27 6 -24 5 -26 -17 -20 -13 4 -27 7 -31 7 -5 0 -8 11 -8 25 0 16 -6
14125 -15 25 -9 0 -15 -9 -15 -24 0 -17 -7 -25 -25 -28 -21 -4 -25 -1 -25 17 0
14213 -6 25 -14 28 -16 6 -36 -11 -36 -31 0 -8 -9 -12 -22 -10 -15 2 -23 10 -23
14323 0 13 -7 20 -20 20 -13 0 -20 -6 -19 -17 2 -26 -32 -23 -39 3 -7 27 -27 15
144-27 -16 0 -54 -3 -53 198 -49 103 2 202 6 220 8 18 2 32 -1 32 -6 0 -6 16 -8
14535 -6 34 4 35 3 35 -29 0 -30 -3 -33 -30 -33 -22 0 -30 -5 -30 -17 0 -28 74
146-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
1478 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
14822 7 22 -8 0 -15 8 -15 18 0 14 -2 15 -10 2 -6 -9 -5 -17 3 -22 6 -4 -2 -5
149-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
1503 0 18 -37 42 -51 33 -6 -3 -19 2 -30 12 -12 11 -16 20 -9 24 7 4 3 15 -10 30
151-23 26 -70 36 -70 14z"/>
152<path d="M3746 3347 c-16 -12 -16 -14 -2 -26 9 -8 16 -18 16 -23 0 -5 9 -21
15319 -36 33 -47 35 -106 5 -165 -42 -84 -97 -120 -180 -118 -55 1 -131 32 -141
15457 -10 28 -24 13 -21 -22 2 -24 10 -41 23 -48 11 -6 27 -19 36 -28 43 -46 200
155-13 281 59 22 19 51 84 66 143 15 62 -9 147 -53 190 -27 26 -33 28 -49 17z"/>
156<path d="M3934 3346 c-4 -10 -13 -11 -44 -2 -22 5 -42 8 -44 5 -6 -6 25 -94
15737 -105 11 -11 8 -121 -3 -144 -5 -11 -15 -30 -21 -41 -12 -24 5 -54 19 -33 6
1589 44 28 107 53 113 47 105 39 105 97 0 29 -4 56 -10 59 -5 3 -10 12 -10 18 0
1597 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
16031 -53 17 -13 -13 -47 -15 -47 -2 0 15 -30 21 -36 7z"/>
161<path d="M3576 3321 c-3 -4 -20 -11 -37 -15 -49 -10 -89 -73 -89 -142 0 -43 1
162-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
16310 -15 6 0 10 18 10 40 0 36 -3 40 -24 40 -14 0 -28 5 -31 10 -8 12 -42 13
164-49 1z"/>
165<path d="M3710 3192 c0 -96 -10 -104 -133 -103 -78 1 -97 -2 -108 -16 -9 -10
166-9 -14 -2 -10 16 10 53 -13 53 -33 0 -13 1 -13 10 0 8 12 13 13 30 3 24 -15
16766 -17 75 -3 3 6 15 10 25 10 53 0 103 119 78 186 -19 52 -28 41 -28 -34z"/>
168<path d="M4742 3216 c5 -23 3 -23 -26 -13 -17 5 -36 14 -42 18 -6 5 -25 2 -44
169-7 -21 -11 -34 -13 -39 -6 -7 12 -160 -3 -196 -18 -11 -5 -29 -11 -40 -13 -18
170-4 -18 -5 3 -6 17 -1 22 -7 22 -27 0 -21 -4 -25 -22 -22 -15 2 -24 11 -26 26
171-2 12 -9 22 -16 22 -18 0 -35 -21 -29 -36 7 -20 -24 -18 -35 2 -9 16 -13 15
172-50 -2 -48 -22 -59 -59 -19 -67 l22 -4 -22 -2 c-13 0 -23 -5 -23 -11 0 -15 66
173-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
1744 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
175-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
17611 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
1777 10 15 0 11 -11 15 -41 15 -32 0 -42 4 -46 20 -8 28 -26 25 -21 -4z"/>
178<path d="M4675 3119 c-130 -14 -220 -30 -229 -39 -7 -7 -4 -10 7 -10 10 0 17
179-8 17 -20 0 -15 -7 -20 -25 -20 -18 0 -25 5 -25 20 0 13 -7 20 -20 20 -13 0
180-20 -7 -20 -20 0 -15 -7 -20 -26 -20 -14 0 -23 4 -19 10 9 14 -17 12 -67 -4
181-24 -8 -57 -17 -74 -21 -31 -6 -32 -8 -33 -60 l0 -53 27 9 c56 18 62 22 63 35
1821 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
18379 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
18441 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
18530 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
1869 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
187-6 0 -11 -5 -11 -11 0 -7 -9 -9 -22 -6 -13 3 -32 7 -43 10 -11 2 -51 1 -90 -4z"/>
188<path d="M4065 3092 c-10 -3 -29 -10 -40 -18 -11 -7 -30 -15 -40 -17 -11 -2
189-42 -13 -69 -25 -27 -12 -53 -22 -59 -22 -5 0 -19 -10 -31 -23 -12 -13 -37
190-32 -56 -43 -19 -10 -37 -22 -40 -25 -3 -3 -26 -11 -52 -18 -53 -15 -150 -7
191-193 15 -15 8 -31 14 -36 14 -5 0 -9 -43 -9 -95 0 -139 -14 -132 280 -134 188
192-1 247 2 280 14 48 17 62 19 40 5 -8 -5 -12 -12 -8 -15 10 -10 49 19 43 32 -2
1937 -1 13 4 13 11 0 21 63 14 89 -6 25 -12 23 -146 -39 -37 -17 -73 -29 -80 -26
194-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
195124 115 -5 35 -5 35 -39 25 -19 -6 -34 -14 -34 -18 0 -4 -18 -11 -40 -14 -22
196-4 -40 -10 -40 -15 0 -5 -7 -9 -15 -9 -26 0 -16 19 13 26 15 4 38 15 52 25 14
1979 42 20 62 24 42 8 46 15 38 70 -4 34 -8 40 -25 37z"/>
198<path d="M4690 3009 c-136 -18 -137 -18 -132 -50 5 -31 -6 -36 -39 -18 -11 5
199-17 14 -14 18 7 13 -20 21 -36 10 -8 -5 -10 -9 -5 -9 5 0 3 -7 -4 -15 -15 -18
200-41 -20 -37 -3 3 17 -34 23 -44 7 -4 -7 -27 -14 -51 -16 -24 -1 -52 -7 -63
201-12 -11 -4 -39 -17 -62 -27 -41 -18 -43 -21 -43 -61 0 -24 4 -43 10 -43 17 0
202144 43 158 53 7 5 10 18 7 28 -5 15 -1 19 19 19 19 0 26 -5 26 -20 0 -16 4
203-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
20469 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
205-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
20610 -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
2073 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
208-167 -4 -197 -9z"/>
209<path d="M2692 2907 c-20 -21 -22 -34 -22 -130 l0 -107 116 0 c88 0 119 3 130
21015 12 11 14 39 12 127 l-3 113 -105 3 c-100 2 -107 1 -128 -21z"/>
211<path d="M2950 2928 c0 -2 -2 -59 -5 -128 -3 -104 -7 -126 -21 -137 -12 -9
212-56 -13 -136 -13 l-118 0 0 -114 c0 -81 4 -123 15 -143 8 -15 20 -42 26 -59 7
213-17 25 -40 40 -50 32 -21 41 -62 19 -84 -11 -11 -30 -14 -63 -12 -40 3 -47 1
214-47 -14 0 -16 -1 -16 -18 -1 -23 21 -52 22 -52 2 0 -14 64 -37 99 -36 9 1 25
2152 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
216-38 19 -30 29 -77 16 -77 -5 0 -10 -7 -10 -16 0 -13 3 -14 14 -5 15 13 32 -1
21722 -18 -3 -5 1 -28 9 -51 8 -23 15 -45 15 -47 0 -9 -26 23 -33 40 -10 26 -24
21820 -29 -13 -6 -39 17 -90 42 -97 11 -3 20 -9 20 -14 0 -9 -13 -12 -26 -6 -4 1
219-11 -8 -15 -21 -12 -32 6 -62 36 -62 23 0 35 -23 18 -33 -5 -2 -2 -2 5 -1 7 2
22012 -8 12 -26 0 -17 4 -30 9 -30 6 0 10 -8 10 -17 0 -10 2 -35 5 -55 4 -22 2
221-40 -5 -44 -8 -4 -7 -9 2 -15 10 -6 11 -9 2 -9 -7 0 -13 -9 -13 -20 0 -11 -4
222-20 -10 -20 -5 0 -10 5 -10 12 0 9 -3 9 -11 1 -9 -9 -8 -16 4 -27 21 -21 24
223-20 31 10 6 21 10 24 19 15 8 -8 8 -14 2 -19 -6 -4 -17 -20 -24 -37 -11 -23
224-15 -26 -18 -12 -3 9 -9 17 -15 17 -5 0 -8 -6 -5 -14 3 -8 1 -17 -6 -19 -9 -3
225-9 -8 1 -18 17 -18 15 -32 -3 -26 -9 4 -21 -5 -32 -23 -11 -20 -25 -30 -40
226-30 -13 0 -26 -7 -29 -15 -4 -8 -12 -15 -20 -15 -8 0 -14 -4 -14 -10 0 -16 27
227-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
228-32 -3 -1 -17 -10 -30 -22 -13 -11 -28 -19 -33 -17 -15 4 -40 -15 -32 -24 5
229-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
230-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
231-8 13 -9 7 -19 24 -23 40 -5 20 -12 27 -31 27 -26 0 -34 -15 -12 -23 7 -3 5
232-6 -5 -6 -10 -1 -18 -7 -18 -13 0 -9 -3 -8 -10 2 -8 13 -11 12 -24 -5 -9 -11
233-16 -27 -16 -36 0 -21 -61 -139 -72 -139 -4 0 -8 -7 -8 -16 0 -9 -12 -25 -26
234-36 -22 -18 -25 -28 -24 -72 4 -126 1 -148 -20 -153 -24 -6 -27 -23 -5 -23 13
2350 13 -2 3 -14 -8 -9 -15 -10 -19 -4 -4 6 -11 8 -17 4 -5 -3 -10 4 -10 17 -1
23640 -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
237-20 52 -11 23 -20 48 -20 55 0 7 -4 13 -9 13 -4 0 -9 12 -9 28 -4 81 -15 132
238-28 132 -8 0 -19 10 -24 22 -6 17 -9 18 -9 6 -2 -30 -21 -30 -52 1 -20 20 -25
23931 -16 31 8 0 18 7 21 16 4 11 1 14 -12 12 -18 -4 -55 29 -85 75 -17 26 -21
24027 -75 22 -75 -8 -87 -8 -152 1 -58 7 -73 17 -84 52 -11 35 -29 25 -55 -28
241-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
2424 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
243-3 5 -8 -21 -13 -3 -50 30 -63 18 -7 40 -22 49 -33 19 -23 24 -66 8 -66 -5 0
244-10 -9 -10 -19 0 -10 -7 -21 -15 -25 -8 -3 -15 -17 -15 -31 0 -17 -12 -38 -35
245-59 -19 -19 -35 -38 -35 -43 0 -5 -19 -16 -42 -24 -51 -19 -57 -32 -21 -46
246l28 -11 -36 -1 c-41 -1 -99 -23 -129 -48 -16 -14 -20 -30 -20 -75 0 -54 2 -58
24723 -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
248-4 -3 -7 -15 -7 -25 0 -18 -16 -59 -62 -156 -11 -23 -24 -39 -30 -36 -6 4 -8
249-1 -3 -15 3 -11 3 -21 -2 -21 -5 0 -14 -13 -20 -30 -6 -16 -18 -30 -27 -30 -9
2500 -16 -4 -16 -10 0 -5 -6 -10 -14 -10 -7 0 -19 -6 -26 -14 -6 -8 -19 -12 -28
251-9 -14 6 -15 4 -5 -9 11 -12 9 -17 -10 -26 -12 -6 -31 -13 -42 -15 -14 -3 -11
252-5 9 -6 24 -1 26 -3 16 -15 -6 -8 -19 -12 -27 -9 -12 5 -15 2 -10 -10 3 -9 1
253-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
254-2 -17 -11 -22 -10 -30 2 -6 10 -10 11 -10 3 0 -7 -9 -13 -20 -13 -11 0 -20 6
255-20 13 0 9 -3 8 -9 -2 -13 -21 -292 -3 -331 21 -11 7 -7 8 12 5 16 -2 28 -1
25628 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
257-16 -7 -16 -15 0 -14 -23 -15 -188 -11 -103 2 -229 10 -279 16 -51 6 -97 9
258-102 6 -17 -11 -65 23 -66 45 0 12 -11 29 -25 38 -14 9 -21 11 -16 4 4 -9 1
259-13 -10 -13 -12 0 -15 -7 -12 -30 5 -30 4 -31 -36 -26 -23 3 -62 5 -88 5 -37
2601 -46 4 -42 15 4 11 12 13 31 5 38 -14 68 -11 88 11 17 19 17 20 -1 21 -10 1
261-29 0 -42 -1 -13 -1 -32 6 -43 16 -12 11 -19 13 -19 5 0 -7 -6 -11 -12 -8 -7
2622 -21 -2 -30 -11 -16 -14 -18 -13 -18 2 0 9 -11 34 -25 54 -17 25 -25 31 -25
26319 0 -10 -5 -15 -11 -12 -5 4 -9 17 -8 28 0 12 1 26 0 30 -1 10 -25 -13 -34
264-33 -4 -8 -5 -1 -2 15 3 17 2 25 -2 19 -14 -20 -79 -11 -107 15 -14 13 -24 28
265-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
2661 l35 -5 -33 17 c-28 14 -35 15 -42 4 -5 -8 -9 -164 -10 -347 l-1 -333 3201 0
267c3133 0 3200 0 3200 19 0 10 -7 21 -15 25 -8 3 -15 17 -15 30 0 18 4 24 15 20
26810 -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
26915 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
27015 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
27115 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
27219 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
273-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
27463 -60 63 -25 0 -29 4 -29 28 -1 38 -22 62 -57 62 -27 0 -30 3 -30 32 0 35
275-32 68 -67 68 -16 0 -21 7 -22 26 -2 28 -30 64 -51 64 -7 0 -22 6 -33 12 -17
27611 -22 10 -30 -2 -8 -12 -14 -12 -44 -2 -24 9 -41 10 -54 3 -11 -6 -23 -6 -33
2770 -7 5 -35 7 -61 3 -44 -5 -48 -4 -48 15 0 21 0 21 -20 1 -24 -24 -43 -25 -60
278-5 -15 18 -56 16 -52 -3 1 -6 -7 -12 -18 -12 -13 0 -20 7 -20 20 0 12 -7 20
279-16 20 -9 0 -18 -9 -21 -20 -3 -12 -14 -20 -27 -20 -19 1 -19 2 -3 11 21 12
28023 33 2 25 -8 -3 -21 1 -29 9 -8 8 -31 15 -50 15 -24 0 -36 5 -36 14 0 11 10
28111 63 0 139 -29 192 -35 217 -25 22 9 20 10 -22 10 -26 1 -49 5 -52 10 -4 5
282-41 12 -84 16 -42 3 -86 10 -97 15 -21 9 -115 29 -175 38 -19 2 -38 9 -41 14
283-3 5 -46 10 -95 12 -72 3 -111 11 -195 41 -57 20 -111 39 -119 42 -9 2 -31 -9
284-50 -26 -19 -17 -39 -31 -43 -31 -5 0 -28 -14 -51 -30 -39 -28 -76 -33 -76
285-10 0 16 -79 59 -116 63 -22 2 -10 4 25 3 41 0 65 -5 68 -13 3 -7 11 -13 19
286-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
287l-190 6 197 2 c108 1 199 6 202 11 8 13 -46 19 -149 15 -87 -2 -88 -2 -25 6
28836 4 81 12 100 18 29 7 32 11 17 17 -10 4 -29 3 -43 -4 -29 -13 -98 -15 -90
289-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
290-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
2914 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
292-4 15 -10 0 -5 10 -10 23 -10 12 0 49 -14 82 -30 33 -16 67 -30 76 -30 8 0 19
293-4 25 -8 5 -4 34 -16 64 -26 30 -10 70 -25 88 -33 32 -14 72 -10 72 7 0 5 8
29411 18 14 10 4 27 14 38 24 20 18 109 89 165 132 18 14 38 30 44 36 6 6 21 15
29533 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
296-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
297-18 -2 -12 2 -19 11 -19 8 0 14 -3 14 -8 0 -10 66 -33 113 -39 22 -3 37 -11
29837 -19 0 -18 35 -49 82 -74 46 -24 48 -24 48 -5 0 9 9 15 25 15 21 0 25 -5 25
299-29 0 -17 -5 -33 -11 -36 -19 -12 33 -39 71 -36 34 2 35 1 36 -34 1 -41 15
300-55 57 -55 23 0 27 -4 27 -30 0 -23 6 -33 25 -42 14 -6 25 -15 25 -19 0 -5 10
301-8 23 -6 14 1 21 -3 19 -12 -4 -19 8 -51 19 -51 6 0 18 -7 26 -16 14 -13 30
302-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
303-44 -29 -37 7 -37 57 0 78 l27 14 -27 1 c-25 0 -28 4 -28 35 0 19 -5 35 -10
30435 -6 0 -10 -6 -9 -13 6 -46 -1 -57 -36 -57 -33 0 -35 2 -35 35 0 34 2 35 38
30536 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
306-15 16 -83 15 -45 -1 -88 -4 -95 -9 -9 -5 -12 6 -12 42 l0 49 42 -7 c24 -5 50
307-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
30822 l-8 22 -5 -22 c-5 -16 -14 -22 -36 -22 -26 0 -30 4 -35 33 -2 17 -4 33 -2
30935 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
3109 -19 1 -8 -12 -64 -13 -73 -2 -3 4 -3 23 -1 42 3 29 9 36 31 39 17 3 12 5
311-16 6 -42 1 -43 1 -39 -31 5 -46 -1 -56 -35 -53 -40 3 -43 8 -30 46 8 24 8 35
3120 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
313-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
31421 -2 38 -6 38 -5 0 -8 -9 -8 -19 0 -46 -65 -38 -72 8 -4 25 -1 30 22 35 15 3
31537 2 49 -1 21 -5 22 -3 15 33 -8 48 -14 56 -14 22 0 -29 -12 -37 -46 -30 -28
3165 -33 38 -27 161 3 64 1 91 -6 86 -6 -3 -11 -17 -11 -30 0 -43 -58 -44 -78 -2
317l-11 22 0 -23 c-1 -20 -5 -23 -33 -20 -29 3 -33 7 -36 36 -2 24 1 32 12 32 20
3180 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
319-25 -4 -13 -8 11 -13 12 -16 3 -8 -19 -54 6 -54 29 0 11 -5 16 -11 13 -6 -4
320-8 -13 -5 -20 5 -14 -25 -22 -63 -17 -17 3 -20 6 -11 12 14 9 7 40 -10 40 -5
3210 -10 -11 -10 -25 0 -21 -5 -25 -30 -25 -25 0 -30 4 -30 25 0 16 -6 25 -15 25
322-9 0 -15 -9 -15 -25 0 -21 -5 -25 -31 -25 -22 0 -30 4 -26 13 7 19 -8 41 -22
32333 -6 -4 -11 -16 -11 -27 0 -14 -7 -19 -30 -19 -20 0 -30 5 -30 15 0 8 -7 15
324-15 15 -8 0 -15 -7 -15 -15 0 -9 -9 -15 -25 -15 -16 0 -25 6 -25 15 0 8 -4 15
325-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
326185 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
327-4 -13 8 -22 -20 -50 -44 -43 -17 6 -22 15 -22 42 0 24 -5 34 -15 34 -10 0
328-15 -11 -15 -35 0 -32 -3 -35 -29 -35 -31 0 -43 16 -34 49 4 16 1 21 -13 21
329-15 0 -19 -7 -19 -32 0 -29 -3 -33 -25 -33 -21 0 -26 5 -28 33 -2 19 -9 32
330-17 32 -8 0 -15 -13 -17 -32 -2 -28 -7 -33 -28 -33 -20 0 -26 6 -28 28 -4 32
331-25 31 -30 -1 -5 -30 -52 -31 -52 -2 0 13 -7 20 -20 20 -13 0 -20 -7 -20 -20
3320 -15 -7 -20 -25 -20 -15 0 -24 5 -23 13 2 7 -7 12 -22 12 -16 0 -24 -5 -22
333-14 2 -10 -4 -12 -25 -7 -38 9 -43 9 -82 1 -29 -7 -33 -6 -29 11 3 16 15 19
33496 21 51 1 101 7 112 13 10 5 37 10 59 10 43 0 56 18 21 27 -13 3 -20 14 -20
33529 0 19 5 24 25 24 23 0 25 -4 23 -35 -3 -42 7 -53 32 -37 11 7 43 13 72 13
33629 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
3375 -30 18 -30 15 0 18 6 14 30 -4 27 -2 30 24 31 29 1 29 1 -4 9 -45 11 -282
33811 -318 0 -16 -4 -24 -9 -18 -9 6 -1 12 -12 12 -26 0 -20 -6 -25 -24 -25 -19
3390 -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
340-20 -11 -15 0 -20 -7 -20 -26 0 -21 -4 -25 -22 -22 -13 2 -23 10 -23 18 0 23
341-32 24 -51 1 -13 -15 -21 -18 -31 -9 -28 23 -12 34 65 46 118 19 132 23 132
34233 0 6 -8 9 -17 7 -13 -2 -17 3 -15 17 7 40 54 46 57 8 1 -13 -2 -23 -7 -23
343-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
34426 -6 28 -22 2 -13 10 -23 17 -23 7 0 15 10 17 23 2 17 10 22 33 22 25 0 30
345-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
34632 -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
347-47 11 -430 14 -527 4 -63 -7 -74 -13 -69 -40 3 -15 -20 -35 -34 -30 -8 3 -15
34815 -17 27 -4 27 -19 27 -33 0 -8 -16 -15 -18 -38 -10 -15 5 -27 12 -27 16 0
34911 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
35023 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
35113 31 13 51 0 12 -8 13 -12 2 -19 -11 -7 -11 -9 0 -13 21 -8 38 2 38 23 0 14
3527 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
35315 26 0 33 -3 29 -15 -4 -9 0 -15 9 -15 8 0 17 13 21 32 7 36 -7 59 -26 40
354-14 -14 -68 -16 -68 -2 0 6 -7 10 -15 10 -8 0 -15 -4 -15 -10 0 -5 -11 -10
355-25 -10 -14 0 -25 5 -25 10 0 6 -9 10 -20 10 -11 0 -20 -4 -20 -8 0 -5 -61
356-12 -136 -15 -143 -7 -174 0 -174 35 0 27 38 23 42 -4 4 -31 31 -29 38 2 7 29
35747 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
358c22 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
3595 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
360-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
361-20 15 -10 0 -24 8 -29 18 -10 16 -10 16 -11 0 0 -14 -8 -18 -35 -18 -24 0
362-35 5 -35 15 0 8 -7 15 -16 15 -10 0 -14 -6 -11 -14 4 -10 -4 -15 -24 -18 -23
363-4 -29 -1 -29 14 0 10 -7 18 -15 18 -8 0 -15 -7 -15 -15 0 -19 -66 -21 -73 -2
364-3 9 -8 9 -18 1 -8 -6 -59 -11 -113 -12 -54 -1 -104 -6 -110 -11 -6 -5 -28 -8
365-49 -7 -20 0 -37 -2 -37 -6 0 -5 -11 -8 -24 -8 -18 0 -25 -7 -29 -30 -4 -19
366-13 -30 -24 -30 -13 0 -14 3 -5 12 19 19 14 28 -13 28 -30 0 -79 -21 -66 -29
3675 -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
368-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
36918 -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
37019 20 19 11 0 20 -7 20 -15 0 -21 23 -19 43 5 14 17 21 19 38 10 11 -7 28 -8
37137 -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
372-9 9 -9 14 -1 16 6 2 8 10 4 16 -12 20 -26 13 -26 -13 0 -18 -7 -26 -24 -31
373-31 -7 -46 1 -46 27 0 10 -7 19 -15 19 -9 0 -15 -9 -15 -24 0 -22 -3 -23 -27
374-17 -16 4 -28 14 -28 22 0 8 -7 14 -15 14 -8 0 -14 -5 -13 -12 4 -17 -35 -27
375-51 -14 -8 7 -31 9 -52 6 -22 -3 -57 -7 -79 -10 -62 -8 -126 -21 -176 -38 -26
376-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
37710 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
3786 132 11 132 22 0 7 -4 13 -9 13 -5 0 -12 10 -14 23 -4 18 -4 17 -6 -6 -1 -26
379-4 -28 -33 -25 -28 2 -34 8 -36 31 -4 34 -27 31 -27 -4 0 -20 -5 -24 -30 -24
380-26 0 -30 3 -28 28 1 18 -3 27 -13 27 -8 0 -14 -10 -14 -24 0 -41 -53 -45 -63
381-4 -7 23 -32 19 -32 -5 0 -9 -3 -17 -7 -17 -45 -1 -50 1 -44 15 7 20 -18 20
382-34 0 -10 -12 -35 -14 -60 -5 -3 2 -9 1 -15 0 -15 -4 -137 -30 -167 -37 -16
383-3 -28 -9 -28 -13 0 -4 -19 -10 -42 -14 -23 -4 -48 -12 -55 -18 -7 -6 -31 -12
384-53 -13 -21 -2 -45 -7 -52 -12 -21 -13 -78 -31 -78 -24 0 8 80 41 100 41 8 0
38524 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
3863 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
387-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
388-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
3899 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
39032 0 30 4 35 28 39 15 2 -28 5 -96 6 -90 1 -124 -2 -126 -11 -3 -7 -7 -25 -10
391-40 -4 -19 -13 -28 -26 -28 -19 0 -36 32 -25 50 4 6 -5 10 -20 10 -21 0 -26
392-4 -23 -22 2 -19 -2 -24 -25 -26 -15 -2 -27 0 -26 5 4 21 -2 33 -16 33 -8 0
393-15 -6 -15 -14 0 -19 -40 -32 -50 -17 -5 9 -18 9 -51 1 -24 -6 -66 -16 -94
394-21 -27 -6 -65 -19 -83 -30 -19 -11 -38 -17 -43 -13 -22 13 -71 -22 -95 -68
395-40 -78 -41 -78 -376 -78 -239 1 -297 3 -312 15 -10 8 -22 12 -27 10 -4 -3 -7
396-93 -8 -201 0 -168 -3 -200 -17 -223 -38 -58 -28 -56 -298 -59 -263 -3 -296
397-1 -296 23 0 21 18 23 265 24 156 1 237 6 255 14 l25 12 3 314 c2 311 2 315
398-20 338 -21 22 -26 23 -205 23 -101 0 -183 -1 -183 -2z"/>
399<path d="M812 2208 c-7 -7 -12 -20 -12 -29 0 -9 -7 -19 -15 -23 -9 -3 -15 -18
400-15 -40 0 -19 -6 -36 -12 -39 -23 -7 9 -52 39 -54 14 0 21 2 16 5 -6 4 -13 21
401-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
402-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
4033 18 -10 -4 -12 0 -16 15 -16 12 0 21 -6 21 -15 0 -19 11 -19 36 0 37 28 72
40418 172 -49 23 -16 45 -26 48 -23 7 7 -48 57 -63 57 -7 0 -13 3 -13 8 0 29
405-139 58 -155 32 -9 -15 -25 -12 -25 5 0 9 -7 18 -16 22 -12 4 -13 7 -3 14 18
40610 11 15 -31 23 -23 4 -40 2 -48 -6z"/>
407<path d="M333 2153 c-7 -3 -13 -18 -13 -33 0 -16 6 -33 13 -37 6 -4 17 -17 23
408-28 6 -11 28 -29 50 -40 67 -34 68 -35 44 -52 -15 -11 -18 -18 -11 -27 8 -9 7
409-21 -2 -39 -16 -35 -28 -34 -21 2 5 23 0 34 -32 65 -20 20 -41 36 -45 36 -15
4100 -60 44 -75 73 -20 38 -36 37 -89 -11 -8 -7 -30 -12 -50 -10 -35 2 -54 -11
411-55 -39 0 -7 -16 -24 -35 -39 -35 -26 -35 -27 -35 -105 l0 -79 29 0 c17 0 33
4124 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
413-33 5 -14 3 -28 -6 -40 -8 -11 -15 -22 -15 -26 0 -11 76 -48 99 -48 32 0 52
414-12 62 -36 6 -17 16 -24 34 -24 14 0 37 -7 50 -16 37 -24 59 -12 51 30 -5 28
415-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
41634 14 72 4 19 1 31 -15 45 -14 13 -17 21 -9 26 8 5 4 15 -14 32 -15 13 -27 29
417-27 35 0 5 -7 12 -15 16 -9 3 -15 18 -15 40 0 36 -21 66 -46 66 -8 0 -14 5
418-14 10 0 6 -6 10 -13 10 -8 0 -24 11 -37 25 -13 14 -29 25 -36 25 -7 0 -14 6
419-16 13 -2 8 -9 12 -15 10z"/>
420<path d="M2653 2043 c-7 -2 -13 -16 -13 -29 0 -24 8 -28 44 -24 11 1 38 -1 62
421-5 79 -11 63 -74 -23 -90 -18 -3 -33 -10 -33 -15 0 -6 -6 -10 -13 -10 -31 0
422-47 -35 -47 -103 l0 -67 80 -1 c160 -2 150 -3 150 20 0 11 6 23 13 28 7 5 -27
42310 -78 13 -85 5 -90 6 -93 28 -4 25 21 51 48 52 8 0 34 7 57 16 37 14 45 23
42453 56 16 58 -3 103 -52 123 -36 14 -128 19 -155 8z"/>
425<path d="M2517 2013 c-3 -15 1 -23 9 -23 10 0 14 -16 14 -61 0 -47 4 -65 18
426-75 15 -12 15 -13 1 -14 -20 0 -29 -20 -29 -66 0 -45 16 -74 39 -74 24 0 29
42725 26 130 -2 47 -4 113 -4 148 l-1 63 -34 -3 c-27 -1 -35 -7 -39 -25z"/>
428<path d="M645 1970 c-14 -28 -14 -31 5 -50 21 -21 19 -40 -4 -40 -7 0 -12 -10
429-11 -22 1 -13 -1 -27 -5 -33 -5 -5 -9 -28 -10 -50 -4 -81 -12 -75 108 -74 59
4301 97 4 84 6 -12 2 -27 13 -32 24 -6 10 -17 19 -25 19 -8 0 -15 7 -15 15 0 18
43112 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
43238 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
4330 16 -52 11 -72 -7 -19 -17 -21 -17 -50 0 -37 21 -48 21 -63 0 -10 -13 -16
434-15 -26 -6 -8 6 -28 14 -45 17 -25 6 -31 11 -27 25 6 22 -16 39 -27 21 -5 -8
435-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
436-15 29 6 8 6 15 -2 23 -21 21 -47 13 -63 -18z"/>
437<path d="M1120 1338 c0 -8 9 -27 20 -41 20 -25 20 -25 0 -20 -14 4 -20 0 -20
438-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
4397 -46 15 -69 33 -85 13 -11 32 -44 41 -73 l17 -51 56 3 c69 4 74 17 29 84 -18
44027 -40 61 -47 77 -8 15 -20 27 -27 27 -18 0 -44 46 -44 80 0 30 -15 41 -23 18
441-2 -7 -2 -1 0 14 3 20 -4 35 -26 59 -20 21 -31 27 -31 17z"/>
442<path d="M1290 939 c-25 -3 -38 -7 -30 -7 8 -1 36 -25 62 -53 39 -43 46 -55
44337 -70 -7 -15 -6 -21 5 -25 8 -3 18 -15 21 -26 5 -15 13 -18 33 -13 15 3 37 7
44450 10 12 2 27 7 32 10 11 7 13 48 4 92 -5 26 -9 29 -35 25 -15 -2 -34 -10 -40
445-18 -6 -8 -19 -14 -28 -14 -17 0 -41 42 -41 71 0 22 -15 26 -70 18z"/>
446</g>
447</svg>
0448
=== added file 'client/share/ltsp/init-ltsp.d/00-overlay'
--- client/share/ltsp/init-ltsp.d/00-overlay 1970-01-01 00:00:00 +0000
+++ client/share/ltsp/init-ltsp.d/00-overlay 2013-07-22 07:06:30 +0000
@@ -0,0 +1,123 @@
1#!/bin/sh
2#
3# Overlay filesystem mounting -*- overlay-module -*-
4#
5# 2013, Joshua Trimm <enslaver@enslaver.com>
6#
7# Derived from previously modified scripts written by:
8# 2008, Stephane Graber <stgraber@ubuntu.com>
9# 2009, Vagrant Cascadian <vagrant@freegeek.org>
10#
11# This program is free software; you can redistribute it and/or
12# modify it under the terms of the GNU General Public License as
13# published by the Free Software Foundation; either version 2 of the
14# License, or (at your option) any later version.
15#
16# This program is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with this program. If not, you can find it on the World Wide
23# Web at http://www.gnu.org/copyleft/gpl.html, or write to the Free
24# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
25# MA 02110-1301, USA.
26#
27# The idea is to make this a double script, running from init-ltsp
28# and also be installed to the initramfs using either dracut or
29# initramfs-tools.
30
31#set -x
32
33[ -f /usr/share/ltsp/ltsp-client-vendor-functions ] && . /usr/share/ltsp/ltsp-client-vendor-functions
34
35# On by default
36OVERLAY=${OVERLAY:-Y}
37
38if [ -f /.inside-cow ]; then
39 # Already inside copy-on-write filesystem
40 return
41fi
42
43if [ ! $OVERLAY ]; then
44 # Someone doesnt love me
45 return
46fi
47
48
49
50# Defaults to unionfs if OVERLAY=Y and no OVERLAYFS specified
51OVERLAYFS=${OVERLAYFS:-unionfs}
52
53panic() { echo "Error: $@"; exit 1; }
54
55
56# Try to give us some tmp space in userland
57test ! -w "/tmp" && mount -t tmpfs tmpfs /tmp
58
59[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
60[ -d /scripts/local-top ] && [ -n "${rootmnt}" ] && INSIDE_INITRAMFS=1
61[ -f /etc/ltsp_chroot ] && INSIDE_LTSP_INIT=1
62[ -f /lib/dracut-lib.sh ] && INSIDE_DRACUT=1
63
64if modprobe -q overlayfs; then
65 # For kernel overlays
66 if [ "$DETECT_MODULE_INCOMPLETE" ]; then
67 UNION_TYPE=overlayfs
68 UNION_OPTS="upperdir=$RAMROOT,lowerdir=$HDROOT"
69 fi
70elif modprobe -q fuse; then
71 # For fuse overlays
72 FUSE_OPT='-o allow_other,use_ino,suid,dev,nonempty'
73 if [ "$INSIDE_DRACUT" ]; then
74 . /tmp/root.info
75 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
76 CHROOT_PATH="/tmp/unionfs"
77 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
78 NEWROOT=${NEWROOT:-/sysroot}
79 OLDROOT="$NEWROOT"
80 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
81 mount -t tmpfs tmpfs $CHROOT_PATH/cow
82 mount --move /sysroot /tmp/sysroot
83 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
84 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
85 echo inside-cow-unionfs > /sysroot/.inside-cow || panic "Something went wrong"
86 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
87 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
88 elif [ "$INSIDE_INITRAMFS" ]; then
89 # This is for initramfs-tools that include the fuse module.
90 # it is incomplete but should be similar to above, just set
91 # NEWROOT to where it mounts the nfsroot
92 NEWROOT="${rootmnt}"
93 . /tmp/root.info
94 [ "$OVERLAYFS" = "unionfs" ] && MOUNT_CMD="unionfs"
95 CHROOT_PATH="/tmp/unionfs"
96 UNION_OPT='-ocow,statfs_omit_ro,max_files=32767,chroot=/tmp/unionfs'
97 NEWROOT=${NEWROOT:-/sysroot}
98 OLDROOT="$NEWROOT"
99 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
100 mount -t tmpfs tmpfs $CHROOT_PATH/cow
101 mount --move /sysroot /tmp/sysroot
102 mount --rbind /tmp/sysroot $CHROOT_PATH/rofs
103 unionfs $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /sysroot
104 echo inside-cow-initramfs > /sysroot/.inside-cow
105 [ -e "/proc/cmdline" ] || mount -t proc proc /sysroot/proc
106 cp -a /tmp/net.* /tmp/dhclient.* /sysroot/var/cache/ltsp
107 elif [ "$INSIDE_LTSP_INIT" ]; then
108 CHROOT_PATH="/tmp/unionfs"
109 UNION_OPT="-ocow,chroot=$CHROOT_PATH,max_files=32768"
110 UBIN=/usr/bin/unionfs
111 mkdir -p $CHROOT_PATH/rofs $CHROOT_PATH/cow /tmp/union /tmp/sysroot
112 [ -e "/proc/cmdline" ] || mount -t proc proc /proc
113 mount -t tmpfs tmpfs $CHROOT_PATH/cow
114 mount --bind / $CHROOT_PATH/rofs
115 $UBIN $FUSE_OPT $UNION_OPT /cow=RW:/rofs=RO /tmp/union
116 mount -t proc proc /tmp/union/proc
117 echo inside-cow-ltsp-init > /tmp/union/.inside-cow
118 cd /tmp/union
119 mkdir oldroot
120 pivot_root . oldroot
121 init q
122 fi
123fi
0124
=== modified file 'client/share/ltsp/init-ltsp.d/09-hostname'
--- client/share/ltsp/init-ltsp.d/09-hostname 2012-05-14 13:28:11 +0000
+++ client/share/ltsp/init-ltsp.d/09-hostname 2013-07-22 07:06:30 +0000
@@ -1,4 +1,4 @@
1if [ -z "$HOSTNAME" ]; then1if [ -z "$HOSTNAME" ] || [ "$HOSTNAME" = "localhost" ] || [ "$HOSTNAME" = "(none)" ]; then
2 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}2 HOSTNAME_BASE=${HOSTNAME_BASE:-ltsp}
3 case "$HOSTNAME_EXTRA" in3 case "$HOSTNAME_EXTRA" in
4 mac)4 mac)
55
=== modified file 'client/share/ltsp/init-ltsp.d/50-opengl'
--- client/share/ltsp/init-ltsp.d/50-opengl 2013-02-05 10:35:02 +0000
+++ client/share/ltsp/init-ltsp.d/50-opengl 2013-07-22 07:06:30 +0000
@@ -1,4 +1,5 @@
1if boolean_is_true "$LDM_DIRECTX" && ! boolean_is_true "$LTSP_FATCLIENT"; then1if boolean_is_true "$LDM_DIRECTX" && ! boolean_is_true "$LTSP_FATCLIENT"; then
2 # Work around LP bug #10727112 # Work around LP bug #1072711
3 rm -f /usr/lib/i386-linux-gnu/dri/nouveau_vieux_dri.so3 rm -f /usr/lib/i386-linux-gnu/dri/nouveau_vieux_dri.so
4 #rm -f /usr/lib/xorg/modules/drivers/nouveau_drv.so
4fi5fi
56
=== modified file 'client/share/ltsp/screen-x-common'
--- client/share/ltsp/screen-x-common 2012-10-29 19:34:41 +0000
+++ client/share/ltsp/screen-x-common 2013-07-22 07:06:30 +0000
@@ -37,8 +37,14 @@
37#37#
3838
39TTY=$(tty)39TTY=$(tty)
40TTY=${TTY#/dev/tty}40TTY=${TTY##*[!0-9]}
41DISPLAY=":$TTY"41
42if [[ -n "$SCREEN_NUM" ]]; then
43 DISPLAY=":$TTY"
44elif [ -n "$DISPLAY" ]; then
45 DISPLAY=":$SCREEN_NUM"
46fi
47
42# set DISP for backwards compatibility with older screen scripts48# set DISP for backwards compatibility with older screen scripts
43DISP="$DISPLAY"49DISP="$DISPLAY"
4450
4551
=== added file 'client/share/ltsp/screen.d/x2goclient'
--- client/share/ltsp/screen.d/x2goclient 1970-01-01 00:00:00 +0000
+++ client/share/ltsp/screen.d/x2goclient 2013-07-22 07:06:30 +0000
@@ -0,0 +1,30 @@
1#!/bin/sh
2#
3# Screen script that launches x2goclient. Can be called from lts.conf
4# like this:
5# SCREEN_07="x2goclient"
6#
7# Copyright (c) 2013 Joshua Trimm <enslaver@enslaver.com>
8#
9# This software is licensed under the GNU General Public License version 2,
10# the full text of which can be found in the COPYING file.
11
12. /usr/share/ltsp/screen-x-common
13export HOME=${HOME:-/root}
14
15# Make XINITRC_DAEMON default to "True", to prevent X from restarting after
16# logout. If you don't want that, force XINITRC_DAEMON=False in lts.conf.
17export XINITRC_DAEMON="${XINITRC_DAEMON-True}"
18
19. /usr/share/ltsp/x2gothinclient_init
20
21#COMMAND="/usr/bin/x2goclient"
22#ARGS="--no-menu --maximize --link=lan --geometry=fullscreen \
23#--thinclient --haltbt --read-exports-from=/usr/share/ltsp/x2goclient/export \
24#--background=/usr/share/ltsp/background.svg --no-session-edit \
25#--session=X2Go.Example --add-to-known-hosts"
26
27# The following logic is described at the top of xinitrc.
28if [ -x /usr/share/ltsp/xinitrc ]; then
29 exec xinit /usr/share/ltsp/xinitrc "/usr/share/ltsp/x2gothinclient_start" -- "$DISPLAY" "vt${TTY}" $X_ARGS >/dev/null
30fi
031
=== added file 'client/share/ltsp/x2gothinclient_sessions'
--- client/share/ltsp/x2gothinclient_sessions 1970-01-01 00:00:00 +0000
+++ client/share/ltsp/x2gothinclient_sessions 2013-07-22 07:06:30 +0000
@@ -0,0 +1,38 @@
1[20100623163928371]
2defsndport = false
3useiconv = false
4iconvfrom = ISO8859-15
5height = 768
6export =
7speed = 4
8fullscreen = true
9layout = us
10width = 1024
11quality = 9
12xdmcpserver = localhost
13soundtunnel = 1
14rdpoptions =
15soundsystem = pulse
16print = 1
17type = pc104/us
18sndport = 4713
19usekbd = true
20fstunnel = true
21applications = OFFICE, WWWBROWSER, MAILCLIENT, TERMINAL
22host = server
23link = ADSL
24user =
25key =
26startsoundsystem = false
27icon =
28sound = true
29rootless = false
30name = server
31iconvto = UTF-8
32rdpserver =
33useexports = true
34command = GNOME
35dpi = 96
36sshport = 22
37setdpi = false
38pack = 16m-jpeg
039
=== added file 'client/share/ltsp/x2gothinclient_start'
--- client/share/ltsp/x2gothinclient_start 1970-01-01 00:00:00 +0000
+++ client/share/ltsp/x2gothinclient_start 2013-07-22 07:06:30 +0000
@@ -0,0 +1,61 @@
1#!/bin/bash
2#
3# Modified for use with LTSP by Joshua Trimm <enslaver@enslaver.com>
4#
5
6# Copyright (C) 2010-2012 by X2Go project, http://wiki.x2go.org
7# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
8# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de>
9# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
10
11# X2Go is free software; you can redistribute it and/or modify
12# it under the terms of the GNU General Public License as published by
13# the Free Software Foundation; either version 2 of the License, or
14# (at your option) any later version.
15#
16# X2Go is distributed in the hope that it will be useful,
17# but WITHOUT ANY WARRANTY; without even the implied warranty of
18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19# GNU General Public License for more details.
20#
21# You should have received a copy of the GNU General Public License
22# along with this program; if not, write to the
23# Free Software Foundation, Inc.,
24# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
25
26[ ! -x /usr/bin/x2goclient ] && echo You must install x2goclient in the chroot
27
28if ! `getent passwd |grep -q "^x2goclient:" >/dev/null` ; then
29/usr/sbin/useradd x2goclient -r -d /tmp/x2goclient
30mkdir -p /tmp/x2goclient
31mkdir -p /tmp/x2goclient/.x2goclient
32
33#TODO: have this built by lts.conf
34test -e /usr/share/ltsp/x2gothinclient_sessions && cp /usr/share/ltsp/x2gothinclient_sessions /tmp/x2goclient/.x2goclient/sessions
35
36mkdir -p /tmp/x2goclient/.kde
37mkdir -p /tmp/x2goclient/.kde/socket-`cat /etc/hostname`
38mkdir -p /tmp/x2goclient/export
39mkdir -p /tmp/x2goclient/logins
40mkdir -p /tmp/x2goclient/.ssh
41cp -a /etc/ssh/ssh_known_hosts /tmp/x2goclient/.ssh
42mkdir -p /tmp/x2goclient/.x2go
43chown x2goclient:x2goclient /tmp/x2goclient -Rf
44chmod go-rwx /tmp/x2goclient -Rf
45fi
46
47su - x2goclient -c 'DISPLAY=$DISPLAY bash -c \"/usr/bin/x2goclient --no-menu \
48 --maximize \
49 --link=lan \
50#TODO: add keyboard support from lts.conf
51 # --kbd-layout=us \
52 # --kbd-type=pc104/us \
53 # --set-kbd=1 \
54 --geometry=fullscreen \
55 --thinclient \
56 --haltbt \
57 --read-exports-from=/tmp/x2goclient/export \
58 --background=/usr/share/ltsp/background.svg \
59 --no-session-edit \
60 --session=X2Go.Example \
61 --add-to-known-hosts \"'
062
=== modified file 'common/ltsp-common-functions'
--- common/ltsp-common-functions 2013-01-14 20:18:23 +0000
+++ common/ltsp-common-functions 2013-07-22 07:06:30 +0000
@@ -97,8 +97,7 @@
97}97}
9898
99detect_vendor() {99detect_vendor() {
100 if [ -e /etc/sysconfig/ltspdist ]; then100 if [ -n "$VENDORDEF" ]; then
101 . /etc/sysconfig/ltspdist
102 echo "$VENDORDEF"101 echo "$VENDORDEF"
103 else102 else
104 echo $(lsb_release --id --short | tr " " "_")103 echo $(lsb_release --id --short | tr " " "_")
@@ -111,6 +110,20 @@
111 echo $(uname -m)110 echo $(uname -m)
112}111}
113112
113# copied from ltsp-build-kernel
114detect_latest_kernel() {
115 ROOT=$BASE/$arch
116
117 # If not already specified by the command line, try to find the latest kernel automatically
118 unset kernelversion
119 kernelversion="`ls -d $ROOT/lib/modules/2* | sort -nr | head -n1 | xargs basename`"
120 if [ ! -d $ROOT/lib/modules/$kernelversion ]; then
121 echo "ERROR: $0: Unable to detect installed kernel version."
122 exit 1
123 fi
124 return 0
125}
126
114require_root()127require_root()
115{128{
116 if [ ${UID:-$(id -u)} -ne 0 ]; then129 if [ ${UID:-$(id -u)} -ne 0 ]; then
@@ -175,6 +188,10 @@
175188
176debug "Started"189debug "Started"
177190
191if [ -e /etc/sysconfig/ltspdist ]; then
192 . /etc/sysconfig/ltspdist
193fi
194
178# Source tool-specific settings and functions, if they're provided195# Source tool-specific settings and functions, if they're provided
179ltsp_tool=${0##*/}196ltsp_tool=${0##*/}
180if [ -f "/usr/share/ltsp/$ltsp_tool-functions" ]; then197if [ -f "/usr/share/ltsp/$ltsp_tool-functions" ]; then
181198
=== added directory 'server/Fedora'
=== removed directory 'server/Fedora'
=== added directory 'server/Fedora/configs'
=== removed directory 'server/Fedora/configs'
=== added file 'server/Fedora/configs/dhcpd.conf'
--- server/Fedora/configs/dhcpd.conf 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dhcpd.conf 2013-07-22 07:06:30 +0000
@@ -0,0 +1,36 @@
1#
2# Default LTSP dhcpd.conf config file.
3#
4ddns-update-style interim;
5ignore client-updates;
6allow booting;
7allow bootp;
8
9option option-128 code 128 = string;
10option option-129 code 129 = string;
11
12use-host-decl-names on;
13
14next-server 192.168.67.1;
15
16authoritative;
17
18subnet 192.168.67.0 netmask 255.255.255.0 {
19 range 192.168.67.20 192.168.67.250;
20 option domain-name "ltsp";
21 option domain-name-servers 192.168.67.1;
22 option broadcast-address 192.168.67.255;
23 option routers 192.168.67.1;
24 get-lease-hostnames true;
25 option subnet-mask 255.255.255.0;
26 option root-path "nfs:/opt/ltsp/i386";
27# Use this root-path line instead for NBD clients. Dont forget to run
28# ltsp-update-image!
29# option root-path "nbd:192.168.67.1:2000:squashfs:ro";
30 if substring( option vendor-class-identifier, 0, 9 ) = "PXEClient" {
31 filename "/ltsp/i386/pxelinux.0";
32 } else {
33 filename "/ltsp/i386/nbi.img";
34 }
35
36}
037
=== added directory 'server/Fedora/configs/dracut'
=== added file 'server/Fedora/configs/dracut/ifcfg-eth0'
--- server/Fedora/configs/dracut/ifcfg-eth0 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/ifcfg-eth0 2013-07-22 07:06:30 +0000
@@ -0,0 +1,3 @@
1DEVICE=eth0
2BOOTPROTO=dhcp
3ONBOOT=no
04
=== added file 'server/Fedora/configs/dracut/ltsp-dracut.conf'
--- server/Fedora/configs/dracut/ltsp-dracut.conf 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/ltsp-dracut.conf 2013-07-22 07:06:30 +0000
@@ -0,0 +1,28 @@
1logfile=/var/log/dracut.log
2fileloglvl=6
3
4# Specific list of dracut modules to use
5#dracutmodules+=""
6
7# Dracut modules to omit
8omit_dracutmodules+="xen crypt dmcrypt dmraid lvm multipath dasd dasd_mod resume uswsusp zfcp znet"
9
10# Dracut modules to add to the default
11add_dracutmodules+="unionfs nfs nbd iscsi dmsquash-live"
12
13# additional kernel modules to the default
14add_drivers+="fuse nbd nfsv4 nfs iscsi"
15
16# list of kernel filesystem modules to be included in the generic initramfs
17#filesystems+=""
18
19# build initrd only to boot current hardware
20hostonly="no"
21#
22
23# install local /etc/mdadm.conf
24mdadmconf="no"
25
26# install local /etc/lvm/lvm.conf
27lvmconf="no"
28
029
=== added file 'server/Fedora/configs/dracut/ltsp-postinst.d'
--- server/Fedora/configs/dracut/ltsp-postinst.d 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/ltsp-postinst.d 2013-07-22 07:06:30 +0000
@@ -0,0 +1,57 @@
1#!/bin/bash
2
3# Skip first time (optimization)
4if [ -f /etc/dracut.conf.d/skip-first-time.conf ]; then
5 rm -f /etc/dracut.conf.d/skip-first-time.conf
6 exit 0
7fi
8
9if [ -f /boot/initramfs-$1.img ]; then
10 INITRD=initramfs-$1.img
11 rm -f /boot/initrd-$1.img
12else
13 INITRD=initrd-$1.img
14fi
15
16# Prep kernel and initrd for various types of LTSP netboot
17[ ! -e /etc/ltsp_chroot ] && exit 0
18KERNELOPTS="ro quiet selinux=0 rhgb"
19
20# Image for ELF and coreboot, Etherboot-5.4
21# Not using wraplinux for ELF because it cannot boot on coreboot.
22if [ -x /usr/sbin/mkelfImage ]; then
23 rm -f /boot/elf-$1.img
24 /usr/sbin/mkelfImage --kernel=/boot/vmlinuz-$1 --initrd=/boot/$INITRD --output=/boot/elf-$1.img --append="$KERNELOPTS"
25 ln -sf elf-$1.img /boot/elf.ltsp
26fi
27
28# Wraplinux NBI
29if [ -x /usr/bin/wraplinux ]; then
30 rm -f /boot/wraplinux-nbi-$1.img
31 /usr/bin/wraplinux --nbi /boot/vmlinuz-$1 --initrd /boot/$INITRD -o /boot/wraplinux-nbi-$1.img
32 ln -sf wraplinux-nbi-$1.img /boot/wraplinux-nbi.ltsp
33fi
34
35# PPC: Copy yaboot into /boot
36if [ -e /usr/lib/yaboot/yaboot ]; then
37 cp /usr/lib/yaboot/yaboot /boot/yaboot
38 chmod 644 /boot/yaboot
39fi
40
41# SPARC: Convert ELF to AOUT for OFW netboot, and use piggyback to add System.map and initrd to the image
42if [ -x /usr/bin/elftoaout ]; then
43 elftoaout /boot/vmlinuz-$1 -o /boot/aout-$1
44fi
45if [ -x /usr/bin/piggyback64 ]; then
46 if file /boot/vmlinuz-$1 |grep -q "ELF 64-bit"; then
47 PIGGY=/usr/bin/piggyback64
48 else
49 PIGGY=/usr/bin/piggyback
50 fi
51 $PIGGY /boot/aout-$1 /boot/System.map-$1 /boot/$INITRD
52fi
53
54# Symlink vmlinuz.ltsp and initrd.ltsp and set permissions for tftp server
55ln -sf vmlinuz-$1 /boot/vmlinuz.ltsp
56ln -sf $INITRD /boot/initrd.ltsp
57chmod 644 /boot/$INITRD
058
=== added file 'server/Fedora/configs/dracut/ltsp-prerm.d'
--- server/Fedora/configs/dracut/ltsp-prerm.d 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/ltsp-prerm.d 2013-07-22 07:06:30 +0000
@@ -0,0 +1,7 @@
1#!/bin/bash
2
3# Remove netboot images
4[ ! -e /etc/ltsp_chroot ] && exit 0
5
6rm -f /boot/elf-$1.img
7rm -f /boot/wraplinux-nbi-$1.img
08
=== added file 'server/Fedora/configs/dracut/sysconfig-dracut'
--- server/Fedora/configs/dracut/sysconfig-dracut 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/sysconfig-dracut 2013-07-22 07:06:30 +0000
@@ -0,0 +1,28 @@
1logfile=/var/log/dracut.log
2fileloglvl=6
3
4# Specific list of dracut modules to use
5#dracutmodules+=""
6
7# Dracut modules to omit
8omit_dracutmodules+="xen crypt dmcrypt dmraid lvm multipath dasd dasd_mod resume uswsusp zfcp znet"
9
10# Dracut modules to add to the default
11add_dracutmodules+="unionfs nfs nbd iscsi dmsquash-live"
12
13# additional kernel modules to the default
14add_drivers+="fuse nbd nfsv4 nfs"
15
16# list of kernel filesystem modules to be included in the generic initramfs
17#filesystems+=""
18
19# build initrd only to boot current hardware
20hostonly="no"
21#
22
23# install local /etc/mdadm.conf
24mdadmconf="no"
25
26# install local /etc/lvm/lvm.conf
27lvmconf="no"
28
029
=== added file 'server/Fedora/configs/dracut/sysconfig-dracut-skip-first-time'
--- server/Fedora/configs/dracut/sysconfig-dracut-skip-first-time 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/sysconfig-dracut-skip-first-time 2013-07-22 07:06:30 +0000
@@ -0,0 +1,3 @@
1# Skip dracut on the first run, avoid running it twice during install
2# This file is deleted by chroot-creator kickstart prior to ltsp-rewrap-latest-kernel
3exit 0
04
=== added file 'server/Fedora/configs/dracut/sysconfig-mkinitrd'
--- server/Fedora/configs/dracut/sysconfig-mkinitrd 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/sysconfig-mkinitrd 2013-07-22 07:06:30 +0000
@@ -0,0 +1,26 @@
1# OBSOLETE: Fedora 12+ and RHEL6 use dracut instead of mkinitrd
2# /etc/sysconfig/mkinitrd configuration directs mkinitrd to generate a netboot capable image
3# initrd obtains from netboot the IP address and rootfs type
4unset MODESETTING
5for name in modesetting drm; do
6 if [ -e /lib/modules/`ls /boot/vmlinuz-* |sed 's/vmlinuz-//' | sort -nr | head -n1 | xargs basename`/modules.$name ]; then
7 MODESETTING=$name
8 break
9 fi
10done
11if [ -n "$MODESETTING" ]; then
12 # F10+ has modesetting drivers, include them if they exist
13 availmodules="=networking =$MODESETTING"
14else
15 availmodules="=networking"
16fi
17# exclude wireless drivers because they cannot netboot, and they can often cause boot problems because of missing firmware
18excludemodules="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"
19NET_LIST="eth0"
20# These parameters are overridden by root="dhcp" in newer versions of mkinitrd
21rootfs="nfs"
22rootdev="server:/opt/ltsp/i386"
23rootopts="noatime,dhcp"
24BOOTPROTO="dhcp"
25# This option is recognized only by newer mkinitrd, but it doesn't harm older versions.
26root="dhcp"
027
=== added file 'server/Fedora/configs/dracut/sysconfig-network'
--- server/Fedora/configs/dracut/sysconfig-network 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/dracut/sysconfig-network 2013-07-22 07:06:30 +0000
@@ -0,0 +1,1 @@
1NETWORKING=yes
02
=== added file 'server/Fedora/configs/fat-client-groups'
--- server/Fedora/configs/fat-client-groups 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/fat-client-groups 2013-07-22 07:06:30 +0000
@@ -0,0 +1,7 @@
1Desktop
2Desktop Platform
3General Purpose Desktop
4Internet Browser
5Office Suite and Productivity
6SNMP Support
7Virtualization Client
08
=== removed directory 'server/Fedora/configs/kickstart'
=== removed directory 'server/Fedora/configs/kickstart/11'
=== removed file 'server/Fedora/configs/kickstart/11/ltsp-i386.ks'
--- server/Fedora/configs/kickstart/11/ltsp-i386.ks 2011-08-12 06:17:12 +0000
+++ server/Fedora/configs/kickstart/11/ltsp-i386.ks 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
1# Kickstart Definition for Client Chroot for i386
2
3# we are going to install into a chroot, such as /opt/ltsp/i386
4install
5
6repo --name=released-11-i386 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=i386
7repo --name=updates-11-i386 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=i386
8repo --name=temporary-11-i386 --baseurl=http://mplug.org/~k12linux/rpm/f11/i386/
9
10%include ../common/common.ks
11%include ../common/arch/i586.ks
12%include ../common/release/11.ks
13
14%packages --excludedocs
15dracut
16dracut-network
17%end
18
190
=== removed directory 'server/Fedora/configs/kickstart/14'
=== removed file 'server/Fedora/configs/kickstart/14/ltsp-i386.ks'
--- server/Fedora/configs/kickstart/14/ltsp-i386.ks 2011-07-13 02:48:43 +0000
+++ server/Fedora/configs/kickstart/14/ltsp-i386.ks 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1# Kickstart Definition for Client Chroot for i686
2
3# we are going to install into a chroot, such as /opt/ltsp/i386
4install
5
6repo --name=released-14-i686 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386
7repo --name=updates-14-i686 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386
8repo --name=temporary-14-i686 --baseurl=http://mplug.org/~k12linux/rpm/f14/i686/
9
10%include ../common/common.ks
11%include ../common/arch/i686.ks
12%include ../common/release/14.ks
130
=== removed file 'server/Fedora/configs/kickstart/14/ltsp-x86_64.ks'
--- server/Fedora/configs/kickstart/14/ltsp-x86_64.ks 2011-07-13 02:48:43 +0000
+++ server/Fedora/configs/kickstart/14/ltsp-x86_64.ks 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1# Kickstart Definition for Client Chroot for i686 and generic x86_64
2
3# we are going to install into a chroot, such as /opt/ltsp/x86_64
4install
5
6repo --name=released-14-x86_64 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=x86_64
7repo --name=updates-14-x86_64 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=x86_64
8repo --name=temporary-14-x86_64 --baseurl=http://mplug.org/~k12linux/rpm/f14/x86_64/
9
10%include ../common/common.ks
11%include ../common/arch/x86_64.ks
12%include ../common/release/14.ks
130
=== removed directory 'server/Fedora/configs/kickstart/common'
=== removed directory 'server/Fedora/configs/kickstart/common/arch'
=== removed file 'server/Fedora/configs/kickstart/common/arch/i586.ks'
--- server/Fedora/configs/kickstart/common/arch/i586.ks 2011-08-12 06:17:12 +0000
+++ server/Fedora/configs/kickstart/common/arch/i586.ks 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1%packages --excludedocs
2kernel.i586
3glibc.i586
4openssl.i586
5wraplinux
6mkelfimage
7%end
80
=== removed file 'server/Fedora/configs/kickstart/common/arch/i686.ks'
--- server/Fedora/configs/kickstart/common/arch/i686.ks 2011-08-09 08:47:49 +0000
+++ server/Fedora/configs/kickstart/common/arch/i686.ks 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1%packages --excludedocs
2kernel.i686
3glibc.i686
4openssl.i686
5wraplinux
6mkelfimage
7%end
80
=== removed file 'server/Fedora/configs/kickstart/common/arch/ppc.ks'
--- server/Fedora/configs/kickstart/common/arch/ppc.ks 2009-01-22 03:46:50 +0000
+++ server/Fedora/configs/kickstart/common/arch/ppc.ks 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1%packages --excludedocs
2kernel.ppc
3glibc.ppc
4openssl.ppc
5yaboot
6%end
70
=== removed file 'server/Fedora/configs/kickstart/common/arch/x86_64.ks'
--- server/Fedora/configs/kickstart/common/arch/x86_64.ks 2009-01-22 03:46:50 +0000
+++ server/Fedora/configs/kickstart/common/arch/x86_64.ks 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1%packages --excludedocs
2kernel.x86_64
3glibc.x86_64
4openssl.x86_64
5wraplinux
6mkelfimage
7%end
80
=== removed file 'server/Fedora/configs/kickstart/common/common.ks'
--- server/Fedora/configs/kickstart/common/common.ks 2011-08-09 10:12:33 +0000
+++ server/Fedora/configs/kickstart/common/common.ks 1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
1### Include this from other .ks files
2
3# this is just garbage, it is not used, but if left empty the user is prompted
4rootpw --iscrypted $1$7RBvKHQ2$gozxTbUdO9.xBncKZQ9760
5
6# should be selectable...
7lang en_US.UTF-8
8keyboard us
9firewall --enabled --port=22:tcp
10network --bootproto=dhcp --device=eth0
11authconfig --enableshadow --enablemd5
12selinux --disabled
13timezone --utc America/Los_Angeles
14
15# cookie-cutter stuff from here
16bootloader --location=none
17reboot
18
19# this could probably be slimmed-down quite a bit
20%packages --excludedocs
21k12linux-release
22ltsp-client
23ltspfsd
24ldm
25alsa-utils
26alsa-plugins-pulseaudio
27atk
28audit-libs
29audit-libs-python
30basesystem
31bash
32bind-libs
33bind-utils
34bitmap-fonts
35bzip2-libs
36cairo
37chkconfig
38coreutils
39cpio
40cpp
41cracklib
42cracklib-dicts
43cups-libs
44cyrus-sasl-lib
45db4
46dbus
47device-mapper
48diffutils
49dmraid
50e2fsprogs
51e2fsprogs-libs
52pulseaudio-esound-compat
53elfutils-libelf
54ethtool
55expat
56filesystem
57findutils
58fontconfig
59freetype
60fuse-sshfs
61gawk
62gdbm
63glib2
64glibc-common
65gnutls
66#gphoto2
67grep
68gzip
69hpijs
70hwdata
71info
72initscripts
73iproute
74iputils
75kpartx
76krb5-libs
77#kudzu
78less
79libacl
80libattr
81libcap
82libdmx
83libdrm
84libexif
85libfontenc
86#libFS
87libgcc
88libgcrypt
89libgpg-error
90libICE
91libieee1284
92libjpeg
93libpng
94libsane-hpaio
95libselinux
96libselinux-python
97libsemanage
98libsepol
99libSM
100libstdc++
101libtiff
102libusb
103libuser
104libX11
105libXau
106libXaw
107libXdmcp
108libXext
109libXfont
110libXft
111libXi
112libXinerama
113libxkbfile
114libxml2
115libxml2-python
116libXmu
117libXpm
118libXrandr
119libXrender
120libXt
121libXtst
122libXv
123libXxf86dga
124libXxf86misc
125libXxf86vm
126lockdev
127lvm2
128MAKEDEV
129mcstrans
130mesa-libGL
131mingetty
132module-init-tools
133nbd
134nc
135ncurses
136neon
137net-snmp-libs
138net-tools
139openldap
140openssh-clients
141pam
142passwd
143pcre
144perl
145popt
146rpcbind
147plymouth-plugin-solar
148procps
149psmisc
150pulseaudio-utils
151pulseaudio-module-x11
152python
153#python-sqlite2
154python-urlgrabber
155readline
156rpm
157rpm-libs
158rpm-python
159sane-backends
160sane-backends-libs
161sed
162setup
163shadow-utils
164sqlite
165system-release
166rsyslog
167#system-config-display
168system-config-firewall-tui
169tar
170tftp
171time
172ttmkfdir
173tzdata
174udev
175util-linux-ng
176which
177xkeyboard-config
178xorg-x11-drivers
179xorg-x11-fonts-100dpi
180xorg-x11-server-utils
181xorg-x11-server-Xorg
182xorg-x11-xauth
183#xorg-x11-xfs
184xorg-x11-xkb-utils
185xorg-x11-xinit
186xterm
187ypbind
188yp-tools
189yum
190yum-metadata-parser
191zlib
192%end
193
194%post
195if [ -f /usr/sbin/plymouth-set-default-theme ]; then
196 /usr/sbin/plymouth-set-default-theme -r
197 /usr/sbin/ltsp-rewrap-latest-kernel
198fi
199%end
200
2010
=== removed directory 'server/Fedora/configs/kickstart/common/release'
=== removed file 'server/Fedora/configs/kickstart/common/release/11.ks'
--- server/Fedora/configs/kickstart/common/release/11.ks 2011-08-12 06:17:12 +0000
+++ server/Fedora/configs/kickstart/common/release/11.ks 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1%packages --excludedocs
2dejavu-sans-fonts
3dejavu-sans-mono-fonts
4dejavu-serif-fonts
5%end
60
=== removed file 'server/Fedora/configs/kickstart/common/release/14.ks'
--- server/Fedora/configs/kickstart/common/release/14.ks 2011-08-09 00:59:16 +0000
+++ server/Fedora/configs/kickstart/common/release/14.ks 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1%packages --excludedocs
2# needed for lspci
3pciutils
4plymouth-system-theme
5dejavu-sans-fonts
6dejavu-sans-mono-fonts
7dejavu-serif-fonts
8dracut-network
9# needed for lokkit which is needed by livecd-creator
10system-config-firewall-base
11%end
120
=== removed file 'server/Fedora/configs/kickstart/common/release/el6.ks'
--- server/Fedora/configs/kickstart/common/release/el6.ks 2011-08-10 09:30:25 +0000
+++ server/Fedora/configs/kickstart/common/release/el6.ks 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1%packages --excludedocs
2epel-release
3# needed for lspci
4pciutils
5plymouth-system-theme
6dejavu-sans-fonts
7dejavu-sans-mono-fonts
8dejavu-serif-fonts
9dracut-network
10# needed for lokkit which is needed by livecd-creator
11system-config-firewall-base
12%end
130
=== removed directory 'server/Fedora/configs/kickstart/el6'
=== removed file 'server/Fedora/configs/kickstart/el6/ltsp-i386.ks'
--- server/Fedora/configs/kickstart/el6/ltsp-i386.ks 2011-08-10 11:31:24 +0000
+++ server/Fedora/configs/kickstart/el6/ltsp-i386.ks 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
1# Kickstart Definition for Client Chroot for i686
2
3# we are going to install into a chroot, such as /opt/ltsp/i386
4install
5
6repo --name=sl6-os-i686 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/i386/os/
7repo --name=sl6-fastbugs-i686 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/i386/updates/fastbugs/
8repo --name=sl6-security-i686 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/i386/updates/security/
9repo --name=epel6-i686 --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=i386
10repo --name=temporary-el6-i686 --baseurl=http://mplug.org/~k12linux/rpm/el6/i686/
11
12%include ../common/common.ks
13#%include ../common/arch/i686.ks
14%include ../common/release/el6.ks
15
16# EL6 i686 uses a custom kernel
17# * Disable PAE
18# * Enable nbd.ko
19# * Turn off many other drivers to make it smaller
20%packages --excludedocs
21kernel-thinclient.i686
22glibc.i686
23openssl.i686
24wraplinux
25mkelfimage
26%end
27
280
=== removed file 'server/Fedora/configs/kickstart/el6/ltsp-x86_64.ks'
--- server/Fedora/configs/kickstart/el6/ltsp-x86_64.ks 2011-07-26 21:45:15 +0000
+++ server/Fedora/configs/kickstart/el6/ltsp-x86_64.ks 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1# Kickstart Definition for Client Chroot for x86_64
2
3# we are going to install into a chroot, such as /opt/ltsp/x86_64
4install
5
6repo --name=sl6-os-x86_64 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/x86_64/os/
7repo --name=sl6-fastbugs-x86_64 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/x86_64/updates/fastbugs/
8repo --name=sl6-security-x86_64 --baseurl=http://mirror.ancl.hawaii.edu/linux/scientific/6.1/x86_64/updates/security/
9repo --name=epel6-x86_64 --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=x86_64
10repo --name=temporary-el6-x86_64 --baseurl=http://mplug.org/~k12linux/rpm/el6/x86_64/
11
12%include ../common/common.ks
13%include ../common/arch/x86_64.ks
14%include ../common/release/el6.ks
150
=== added file 'server/Fedora/configs/lts.conf'
--- server/Fedora/configs/lts.conf 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/lts.conf 2013-07-22 07:06:30 +0000
@@ -0,0 +1,81 @@
1# If using NFS, lts.conf goes in /opt/ltsp/<arch>/etc/lts.conf.
2# For NBD (the default in Ubuntu), /var/lib/tftpboot/ltsp/<arch>/lts.conf
3# is used instead.
4# A list of directives is available at http://manpages.ubuntu.com/lts.conf
5# or your installed lts.conf man page.
6# Lines starting with '#' are comments.
7# Avoid empty [Sections] as they're considered syntax errors.
8
9
10# This section applies to all clients and is overriden by the other sections.
11[Default]
12#SERVER=192.168.67.1
13# For troubleshooting, the following open a local console with Alt+Ctrl+F2.
14#SCREEN_02=shell
15SCREEN_07=ldm
16
17# Don't encrypt X traffic. Gives much faster graphics at a security cost.
18LDM_DIRECTX=True
19
20# If you're using Unity, you might want to install gnome-session-fallback and
21# use it by default instead, as it performs better on LTSP thin clients.
22#LDM_SESSION="gnome-fallback"
23
24# Force all clients to a specific resolution.
25#XRANDR_MODE_0=1024x768
26
27# If the default 16bit color mode is giving you problems on thin clients:
28#X_SMART_COLOR_DEPTH=False
29
30# A space separated list of services to disable on thin/fat clients.
31RM_SYSTEM_SERVICES="dnsmasq nbd-server iptables"
32
33# An additional list of services to disable on thin clients only.
34RM_THIN_SYSTEM_SERVICES="qemu-kvm virtualbox iptables"
35
36# Use any local swap partitions on the clients.
37USE_LOCAL_SWAP=True
38
39# Provide a "Login as Guest" button, which uses LDM_USERNAME/LDM_PASSWORD.
40#LDM_GUESTLOGIN=False
41
42# Automatically login clients with the specified LDM_USERNAME/LDM_PASSWORD.
43#LDM_AUTOLOGIN=False
44
45# Some other frequently used directives, described in the lts.conf manpage.
46# For really low RAM clients, disable SOUND, LOCAL_APPS and LOCALDEV.
47#SOUND=False
48#VOLUME=50
49#LOCAL_APPS=True
50#LOCAL_APPS_EXTRAMOUNTS=/srv
51#LOCALDEV=False
52#LOCALDEV_DENY_INTERNAL_DISKS=False
53#FSTAB_1="server:/home /home nfs defaults,nolock 0 0"
54#XSERVER=vesa
55#X_BLANKING=0
56#X_NUMLOCK=True
57#XKBLAYOUT="us,gr"
58#XKBOPTIONS="grp:alt_shift_toggle,grp_led:scroll"
59#LDM_LIMIT_ONE_SESSION=True
60#LDM_LIMIT_ONE_SESSION_PROMPT=True
61#LDM_PRINTER_DEFAULT="psc-1310-series"
62#OVERLAY="yes"
63
64# You can define sections to be included later on with "LIKE" directives.
65[OLD_MONITOR]
66# The following directives are useful in cases where the driver can't detect
67# the (possibly old CRT) monitor timings and only offers low resolutions.
68# Consult your monitor manual for the correct values, those are for 1024x768.
69X_HORZSYNC=30.0-88.0
70X_VERTREFRESH=50.0-88.0
71
72
73# You can specify directives per client with MAC address (or IP or hostname)
74# based sections.
75# One way to get their MAC addresses is to run `arp -n` when they're at LDM.
76#[A1:B1:C2:D4:E5:F6]
77#HOSTNAME=pc01
78#LDM_USERNAME=user01
79#LDM_PASSWORD=pass01
80# Include another section.
81#LIKE=OLD_MONITOR
082
=== added file 'server/Fedora/configs/ltsp-build-client.conf'
--- server/Fedora/configs/ltsp-build-client.conf 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/ltsp-build-client.conf 2013-07-22 07:06:30 +0000
@@ -0,0 +1,10 @@
1### Redhat EL6 Build Client Configuration ###
2#
3# By default ltsp-build-client will install a chroot matching your OS into /opt/ltsp/i386.
4# You can either override options using --option=value or override them here in this config file.
5# See /usr/share/ltsp/plugins/ltsp-build-client for more possible options.
6#
7## Persistent RPM Cache Directory --cachedir=/path/to/cachedir
8# option_cache_value=/var/cache/chroot
9## Target Architecture --arch=i386|x86_64|ppc|ppc64 etc.
10option_arch_value=i386
011
=== added file 'server/Fedora/configs/ltsp-server.conf'
--- server/Fedora/configs/ltsp-server.conf 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/ltsp-server.conf 2013-07-22 07:06:30 +0000
@@ -0,0 +1,23 @@
1# /etc/ltsp/ltsp-server.conf
2# Contains variables which are shared by ltsp-tools.
3#VENDORDEF="Fedora"
4#RELEASEDEF=18
5
6VENDORDEF="RHEL"
7RELEASEDEF=el6
8
9# The LTSP base directory. Defaults to "/opt/ltsp".
10#BASE="/opt/ltsp"
11
12# Space-separated list of TFTP directories to update kernels and initrd's to.
13# Defaults to "/var/lib/tftpboot /tftpboot /srv/tftp".
14TFTP_DIRS="/var/lib/tftpboot"
15
16# The LTSP subdirectory within the TFTP base directory.
17# Defaults to "ltsp".
18#TFTP_BOOT_DIR="students"
19
20# The default network device that the server will be using for ltsp-dhcpd.
21LTSP_DEV=eth1
22# Changes this to the IP address of the server
23LTSP_DEFAULTIP="192.168.67.1"
024
=== added directory 'server/Fedora/configs/mock'
=== added file 'server/Fedora/configs/mock/fat-groups.list'
--- server/Fedora/configs/mock/fat-groups.list 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/mock/fat-groups.list 2013-07-22 07:06:30 +0000
@@ -0,0 +1,7 @@
1Desktop
2Desktop Platform
3General Purpose Desktop
4Internet Browser
5Office Suite and Productivity
6SNMP Support
7Virtualization Client
08
=== added file 'server/Fedora/configs/mock/logging.ini'
--- server/Fedora/configs/mock/logging.ini 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/mock/logging.ini 2013-07-22 07:06:30 +0000
@@ -0,0 +1,84 @@
1[formatters]
2keys: detailed,simple,unadorned,state
3
4[handlers]
5keys: simple_console,detailed_console,unadorned_console,simple_console_warnings_only
6
7[loggers]
8keys: root,build,state,mockbuild
9
10[formatter_state]
11format: %(asctime)s - %(message)s
12
13[formatter_unadorned]
14format: %(message)s
15
16[formatter_simple]
17format: %(levelname)s: %(message)s
18
19;useful for debugging:
20[formatter_detailed]
21format: %(levelname)s %(filename)s:%(lineno)d: %(message)s
22
23[handler_unadorned_console]
24class: StreamHandler
25args: []
26formatter: unadorned
27level: INFO
28
29[handler_simple_console]
30class: StreamHandler
31args: []
32formatter: simple
33level: INFO
34
35[handler_simple_console_warnings_only]
36class: StreamHandler
37args: []
38formatter: simple
39level: WARNING
40
41[handler_detailed_console]
42class: StreamHandler
43args: []
44formatter: detailed
45level: WARNING
46
47; usually dont want to set a level for loggers
48; this way all handlers get all messages, and messages can be filtered
49; at the handler level
50;
51; all these loggers default to a console output handler
52;
53[logger_root]
54level: NOTSET
55handlers: simple_console
56
57; mockbuild logger normally has no output
58; catches stuff like mockbuild.trace_decorator and mockbuild.util
59; dont normally want to propagate to root logger, either
60[logger_mockbuild]
61level: NOTSET
62handlers:
63qualname: mockbuild
64propagate: 1
65
66[logger_state]
67level: NOTSET
68; unadorned_console only outputs INFO or above
69handlers: unadorned_console
70qualname: mockbuild.Root.state
71propagate: 0
72
73[logger_build]
74level: NOTSET
75handlers: simple_console_warnings_only
76qualname: mockbuild.Root.build
77propagate: 0
78
79; the following is a list mock logger qualnames used within the code:
80;
81; qualname: mockbuild.util
82; qualname: mockbuild.uid
83; qualname: mockbuild.trace_decorator
84
085
=== added file 'server/Fedora/configs/mock/ltsp-template.cfg'
--- server/Fedora/configs/mock/ltsp-template.cfg 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/mock/ltsp-template.cfg 2013-07-22 07:06:30 +0000
@@ -0,0 +1,58 @@
1config_opts['basedir'] = '/opt/ltsp/mock/'
2config_opts['cache_topdir'] = '/var/cache/mock'
3config_opts['root'] = 'i386'
4config_opts['target_arch'] = 'i686'
5config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
6config_opts['chroot_setup_cmd'] = 'groupinstall Base'
7config_opts['dist'] = 'el6' # only useful for --resultdir variable subst
8
9config_opts['yum.conf'] = """
10[main]
11cachedir=/var/cache/mock
12debuglevel=1
13reposdir=/dev/null
14logfile=/var/log/ltsp-build-client.log
15retries=20
16obsoletes=1
17gpgcheck=0
18assumeyes=1
19syslog_ident=ltsp
20syslog_device=
21
22# repos
23[base]
24name=BaseOS
25enabled=1
26baseurl=http://mirror.lstn.net/scientific/6.3/i386/os/
27failovermethod=priority
28
29[fastbugs]
30name=updates
31enabled=1
32baseurl=http://mirror.lstn.net/scientific/6.3/i386/updates/fastbugs/
33failovermethod=priority
34
35[epel]
36name=epel
37mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=i386
38failovermethod=priority
39
40[security]
41name=security
42enabled=1
43baseurl=http://mirror.lstn.net/scientific/6.3/i386/updates/security/
44failovermethod=priority
45
46# do something like this if you want to point to a local repo
47[local]
48name=local
49baseurl=http://192.168.67.1/repo/rpm/el6/i686/
50cost=2000
51enabled=0
52
53[ltsp]
54name=ltsp
55baseurl=http://mirror.ancl.hawaii.edu/~k12linux/rpm/el6/i386/
56failovermethod=priority
57enabled=1
58"""
059
=== added file 'server/Fedora/configs/mock/ltsp.cfg'
--- server/Fedora/configs/mock/ltsp.cfg 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/mock/ltsp.cfg 2013-07-22 07:06:30 +0000
@@ -0,0 +1,17 @@
1[ltsp]
2name=ltsp
3#baseurl=http://ltsprepo.s3.amazonaws.com/rpm/DIST/ARCH/
4mirrorlist=http://ltsp.repo.inode0.com/mirrorlist.php?dist=DIST&arch=ARCH&repo=ltsp
5failovermethod=priority
6enabled=1
7
8[X11_RemoteDesktop_x2go]
9name=X2go - after NoMachine ditched the open version (Fedora_18)
10type=rpm-md
11baseurl=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_18/
12gpgcheck=1
13gpgkey=http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_18/repodata/repomd.xml.key
14enabled=1
15
16"""
17
018
=== added file 'server/Fedora/configs/mock/site-defaults.cfg'
--- server/Fedora/configs/mock/site-defaults.cfg 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/mock/site-defaults.cfg 2013-07-22 07:06:30 +0000
@@ -0,0 +1,153 @@
1# mock defaults
2# vim:tw=0:ts=4:sw=4:et:
3#
4# This config file is for site-specific default values that apply across all
5# configurations. Options specified in this config file can be overridden in
6# the individual mock config files.
7#
8# The site-defaults.cfg delivered by default has NO options set. Only set
9# options here if you want to override the defaults.
10#
11# Entries in this file follow the same format as other mock config files.
12# config_opts['foo'] = bar
13
14#############################################################################
15#
16# Things that we recommend you set in site-defaults.cfg:
17#
18config_opts['basedir'] = '/opt/ltsp/mock/'
19config_opts['cache_topdir'] = '/var/cache/mock'
20# Note: the path pointed to by basedir and cache_topdir must be owned
21# by group 'mock' and must have mode: g+rws
22# config_opts['rpmbuild_timeout'] = 0
23# config_opts['use_host_resolv'] = True
24
25# You can configure log format to pull from logging.ini formats of these names:
26# config_opts['build_log_fmt_name'] = "unadorned"
27# config_opts['root_log_fmt_name'] = "detailed"
28# config_opts['state_log_fmt_name'] = "state"
29#
30# mock will normally set up a minimal chroot /dev.
31# If you want to use a pre-configured /dev, disable this and use the bind-mount
32# plugin to mount your special /dev
33# config_opts['internal_dev_setup'] = True
34#
35# internal_setarch defaults to 'True' if the python 'ctypes' package is
36# available. It is in the python std lib on >= python 2.5. On older versions,
37# it is available as an addon. On systems w/o ctypes, it will default to 'False'
38# config_opts['internal_setarch'] = False
39#
40# the cleanup_on_* options allow you to automatically clean and remove the
41# mock build directory, but only take effect if --resultdir is used.
42# config_opts provides fine-grained control. cmdline only has big hammer
43#
44config_opts['cleanup_on_success'] = 0
45# config_opts['cleanup_on_failure'] = 1
46
47# if you want mock to automatically run createrepo on the rpms in your
48# resultdir.
49# config_opts['createrepo_on_rpms'] = False
50# config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
51
52#############################################################################
53#
54# plugin related. Below are the defaults. Change to suit your site
55# policy. site-defaults.cfg is a good place to do this.
56#
57# NOTE: Some of the caching options can theoretically affect build
58# reproducability. Change with care.
59#
60# config_opts['plugin_conf']['package_state_enable'] = True
61# config_opts['plugin_conf']['ccache_enable'] = True
62# config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '4G'
63# config_opts['plugin_conf']['ccache_opts']['compress'] = None
64# config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/%(root)s/ccache/"
65# config_opts['plugin_conf']['yum_cache_enable'] = True
66# config_opts['plugin_conf']['yum_cache_opts']['max_age_days'] = 30
67# config_opts['plugin_conf']['yum_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/yum_cache/"
68# config_opts['plugin_conf']['root_cache_enable'] = True
69# config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 15
70# config_opts['plugin_conf']['root_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/root_cache/"
71# config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "pigz"
72# config_opts['plugin_conf']['root_cache_opts']['extension'] = ".gz"
73# config_opts['plugin_conf']['root_cache_opts']['exclude_dirs'] = ["./proc", "./sys", "./dev",
74# "./tmp/ccache", "./var/cache/yum" ]
75#
76# bind mount plugin is enabled by default but has no configured directories to
77# mount
78# config_opts['plugin_conf']['bind_mount_enable'] = True
79# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/host/path', '/bind/mount/path/in/chroot/' ))
80#
81# config_opts['plugin_conf']['tmpfs_enable'] = False
82# config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
83# config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '512m'
84
85#############################################################################
86#
87# environment for chroot
88#
89# config_opts['environment']['TERM'] = 'vt100'
90# config_opts['environment']['SHELL'] = '/bin/bash'
91# config_opts['environment']['HOME'] = '/builddir'
92# config_opts['environment']['HOSTNAME'] = 'mock'
93# config_opts['environment']['PATH'] = '/usr/bin:/bin:/usr/sbin:/sbin'
94# config_opts['environment']['PROMPT_COMMAND'] = 'echo -n "<mock-chroot>"'
95config_opts['environment']['LANG'] = os.environ.setdefault('LANG', 'en_US.UTF-8')
96#config_opts['environment']['TZ'] = os.environ.setdefault('TZ', 'CST6CDT')
97
98#############################################################################
99#
100# Things that you can change, but we dont recommend it:
101# config_opts['chroothome'] = '/var/cache/mock'
102# config_opts['clean'] = False
103
104#############################################################################
105#
106# Things that must be adjusted if SCM integration is used:
107#
108# config_opts['scm'] = True
109# config_opts['scm_opts']['method'] = 'git'
110# config_opts['scm_opts']['cvs_get'] = 'cvs -d /srv/cvs co SCM_BRN SCM_PKG'
111# config_opts['scm_opts']['git_get'] = 'git clone SCM_BRN git://localhost/SCM_PKG.git SCM_PKG'
112# config_opts['scm_opts']['svn_get'] = 'svn co file:///srv/svn/SCM_PKG/SCM_BRN SCM_PKG'
113# config_opts['scm_opts']['spec'] = 'SCM_PKG.spec'
114# config_opts['scm_opts']['ext_src_dir'] = '/dev/null'
115# config_opts['scm_opts']['write_tar'] = True
116# config_opts['scm_opts']['git_timestamps'] = True
117
118# These options are also recognized but usually defined in cmd line
119# with --scm-option package=<pkg> --scm-option branch=<branch>
120# config_opts['scm_opts']['package'] = 'mypkg'
121# config_opts['scm_opts']['branch'] = 'master'
122
123#############################################################################
124#
125# Things that are best suited for individual chroot config files:
126#
127# MUST SET (in individual chroot cfg file):
128# config_opts['root'] = 'name-of-yum-build-dir'
129# config_opts['target_arch'] = 'i386'
130# config_opts['yum.conf'] = ''
131# config_opts['yum_common_opts'] = []
132#
133# CAN SET, defaults usually work ok:
134# config_opts['chroot_setup_cmd'] = 'install buildsys-build'
135# config_opts['log_config_file'] = 'logging.ini'
136# config_opts['more_buildreqs']['srpm_name-version-release'] = 'dependencies'
137# config_opts['macros']['%Add_your_macro_name_here'] = "add macro value here"
138# config_opts['files']['path/name/no/leading/slash'] = "put file contents here."
139# config_opts['chrootuid'] = os.getuid()
140
141# If you change chrootgid, you must also change "mock" to the correct group
142# name in this line of the mock PAM config:
143# auth sufficient pam_succeed_if.so user ingroup mock use_uid quiet
144# config_opts['chrootgid'] = grp.getgrnam("mock")[2]
145
146# config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s -n %(user)s' # Fedora/RedHat
147#
148# Security related
149# config_opts['no_root_shells'] = False
150#
151# Proxy settings (https_proxy, ftp_proxy, and no_proxy can also be set)
152# config_opts['http_proxy'] = 'http://localhost:3128'
153
0154
=== added file 'server/Fedora/configs/nbdswapd.conf'
--- server/Fedora/configs/nbdswapd.conf 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/nbdswapd.conf 2013-07-22 07:06:30 +0000
@@ -0,0 +1,4 @@
1
2SWAPDIR=/var/lib/ltsp/swapfiles
3SIZE=64
4
05
=== added file 'server/Fedora/configs/pxe-default.conf'
--- server/Fedora/configs/pxe-default.conf 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/pxe-default.conf 2013-07-22 07:06:30 +0000
@@ -0,0 +1,5 @@
1DEFAULT linux
2 LABEL linux
3 SAY Booting Linux
4 KERNEL vmlinuz.ltsp
5 APPEND rw initrd=initrd.ltsp init=/sbin/init-ltsp selinux=0 root=dhcp rhgb video=LVDS-1:d rdshell
06
=== added directory 'server/Fedora/configs/services'
=== removed directory 'server/Fedora/configs/services'
=== added file 'server/Fedora/configs/services/ltsp-dhcpd.init'
--- server/Fedora/configs/services/ltsp-dhcpd.init 1970-01-01 00:00:00 +0000
+++ server/Fedora/configs/services/ltsp-dhcpd.init 2013-07-22 07:06:30 +0000
@@ -0,0 +1,156 @@
1#!/bin/sh
2#
3### BEGIN INIT INFO
4# Provides: ltsp-dhcpd
5# Default-Start:
6# Default-Stop: 0 1 6
7# Should-Start:
8# Required-Start: $network
9# Required-Stop:
10# Short-Description: Start and stop the DHCP server
11# Description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP)
12# server.
13### END INIT INFO
14#
15# The fields below are left around for legacy tools (will remove later).
16#
17# chkconfig: - 98 35
18# description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP) \
19# server
20# processname: dhcpd
21# config: /etc/ltsp/dhcpd.conf
22# config: /var/lib/dhcpd/dhcpd.leases
23# pidfile: /var/run/dhcpd.pid
24
25. /etc/init.d/functions
26
27RETVAL=0
28
29prog=dhcpd
30dhcpd=/usr/sbin/dhcpd
31lockfile=/var/lock/subsys/ltsp-dhcpd
32pidfile=/var/run/ltsp-dhcpd.pid
33
34[ -f /etc/sysconfig/ltsp-dhcpd ] && . /etc/sysconfig/ltsp-dhcpd
35
36# if the user specified a different config file, make sure we reference it
37findConfig() {
38 for arg in $DHCPDARGS ; do
39 if [ "$found" = 1 ]; then
40 [ -f "$arg" ] && echo "$arg"
41 return
42 fi
43 if [ "$arg" = "-cf" ]; then
44 found=1
45 continue
46 fi
47 done
48 echo "/etc/ltsp/dhcpd.conf"
49}
50
51conf="$(findConfig "$DHCPDARGS")"
52if [ ! "$found" ]; then
53 DHCPDARGS="$DHCPARGS -cf $conf"
54fi
55
56if [ ! -f /var/lib/dhcpd/dhcpd.leases ] ; then
57 mkdir -p /var/lib/dhcpd
58 touch /var/lib/dhcpd/dhcpd.leases
59 [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcp/dhcpd.leases >/dev/null 2>&1
60fi
61
62configtest() {
63 [ -x $dhcpd ] || return 5
64 [ -f $conf ] || return 6
65 $dhcpd -q -t -cf $conf
66 RETVAL=$?
67 return $RETVAL
68}
69
70start() {
71 [ -x $dhcpd ] || return 5
72 [ -f $conf ] || return 6
73
74 pidofproc $prog >/dev/null 2>&1
75 RETVAL=$?
76 [ $RETVAL -eq 0 ] && return $RETVAL
77
78 echo -n "Starting ltsp-$prog:"
79 daemon $dhcpd $DHCPDARGS 2>/dev/null
80 RETVAL=$?
81 echo
82 [ $RETVAL = 0 ] && touch $lockfile
83
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: