From b337c57533fffa181cd99b6ff5dbf548cc9d866a Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 4 Aug 2013 12:02:41 +0200 Subject: made it work again --- README | 28 ++++++++++++++-------------- sync_centos.sh | 6 +++--- tftproot/images/centos/6.3/i386/README | 1 - tftproot/images/centos/6.3/x86_64/README | 1 - tftproot/images/centos/6.4/i386/README | 1 + tftproot/images/centos/6.4/x86_64/README | 1 + tftproot/pxelinux.cfg/01-52-54-00-12-34-56 | 16 ++++++++-------- tftproot/pxelinux.cfg/default | 16 ++++++++-------- var/www/html/CentOS-Base.repo | 10 +++++----- var/www/html/kickstart.cfg | 18 +++++++++--------- 10 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 tftproot/images/centos/6.3/i386/README delete mode 100644 tftproot/images/centos/6.3/x86_64/README create mode 100644 tftproot/images/centos/6.4/i386/README create mode 100644 tftproot/images/centos/6.4/x86_64/README diff --git a/README b/README index 87cb4c3..bd069d7 100644 --- a/README +++ b/README @@ -7,30 +7,30 @@ mkdir $PWD/tftproot/pxelinux.cfg cp -av var/www/html/* /var/www/html/. -mkdir -p /var/www/html/Centos/6.3/ +mkdir -p /var/www/html/Centos/6.4/ -wget -O tftproot/images/centos/6.3/i386/vmlinuz \ - http://swissmirror.silyus.net/centos/6.3/os/i386/images/pxeboot/vmlinuz -wget -O tftproot/images/centos/6.3/i386/initrd.img \ - http://swissmirror.silyus.net/centos/6.3/os/i386/images/pxeboot/initrd.img +wget -O tftproot/images/centos/6.4/x86_64/vmlinuz \ + http://mirror.switch.ch/ftp/mirror/centos/6.4/os/x86_64/images/pxeboot/vmlinuz +wget -O tftproot/images/centos/6.4/x86_64/initrd.img \ + http://mirror.switch.ch/ftp/mirror/centos/6.4/os/x86_64/images/pxeboot/initrd.img -qemu-img create centos6.img 32G +qemu-img create centos6.img 1G /usr/local/qemu-1.0.1/bin/qemu-system-x86_64 -hda centos6.img -net nic \ -net user,tftp=$PWD/tftproot,bootfile=pxelinux.0 -m 1024 -nographic \ -machine accel=kvm -redir tcp:2222::22 #local mirror of Centos files (HTTP): -wget 'http://swissmirror.silyus.net/centos/6.3/isos/x86_64/CentOS-6.3-x86_64-bin-DVD1.iso' -wget 'http://swissmirror.silyus.net/centos/6.3/isos/x86_64/CentOS-6.3-x86_64-bin-DVD2.iso' -mount -ro loop CentOS-6.3-x86_64-bin-DVD1.iso /mnt -mkdir -p /var/www/html/Centos/6.3/{os,updates,extras,centosplus,contrib}/x86_64 -rsync -avHPS /mnt/* /var/www/html/Centos/6.3/os/x86_64/ +wget 'http://mirror.switch.ch/ftp/mirror/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD1.iso' +wget 'http://mirror.switch.ch/ftp/mirror/centos/6.4/isos/x86_64/CentOS-6.4-x86_64-bin-DVD2.iso' +mount -ro loop CentOS-6.4-x86_64-bin-DVD1.iso /mnt +mkdir -p var/www/html/Centos/6.4/{os,updates,extras,centosplus,contrib}/x86_64 +rsync -avHPS /mnt/* var/www/html/Centos/6.4/os/x86_64/ umount /mnt -mount -ro loop CentOS-6.3-x86_64-bin-DVD2.iso /mnt -rsync -avHPS /mnt/* /var/www/html/Centos/6.3/os/x86_64/ +mount -ro loop CentOS-6.4-x86_64-bin-DVD2.iso /mnt +rsync -avHPS /mnt/* var/www/html/Centos/6.4/os/x86_64/ umount /mnt +ln -s 6.4 var/www/html/Centos/6 ./sync_centos.sh -ln -s 6.3 /var/www/html/Centos/6 copy cfengine rpms to /var/www/html/cfengine diff --git a/sync_centos.sh b/sync_centos.sh index bd6dece..d9314f5 100755 --- a/sync_centos.sh +++ b/sync_centos.sh @@ -4,14 +4,14 @@ if [ -f /var/lock/subsys/rsync_updates ]; then exit 0 fi # i386 -if [ -d /var/www/html/Centos/6.3 ] ; then +if [ -d /var/www/html/Centos/6.4 ] ; then touch /var/lock/subsys/rsync_updates for a in x86_64; do for i in os updates extras centosplus contrib; do - rsync -avSHP --delete --exclude "local*" --exclude "isos" centos.intergenia.de::centos-linux/6.3/$i/$a/ /var/www/html/Centos/6.3/$i/$a/ + rsync -avSHP --delete --exclude "local*" --exclude "isos" centos.intergenia.de::centos-linux/6.4/$i/$a/ /var/www/html/Centos/6.4/$i/$a/ done done /bin/rm -f /var/lock/subsys/rsync_updates else - echo "Target directory /share/CentOS/6.3 not present." + echo "Target directory /var/www/html/Centos/6.4 not present." fi diff --git a/tftproot/images/centos/6.3/i386/README b/tftproot/images/centos/6.3/i386/README deleted file mode 100644 index 12f6040..0000000 --- a/tftproot/images/centos/6.3/i386/README +++ /dev/null @@ -1 +0,0 @@ -PXE boot image i386 diff --git a/tftproot/images/centos/6.3/x86_64/README b/tftproot/images/centos/6.3/x86_64/README deleted file mode 100644 index 566e206..0000000 --- a/tftproot/images/centos/6.3/x86_64/README +++ /dev/null @@ -1 +0,0 @@ -PXE boot image x86_64 diff --git a/tftproot/images/centos/6.4/i386/README b/tftproot/images/centos/6.4/i386/README new file mode 100644 index 0000000..12f6040 --- /dev/null +++ b/tftproot/images/centos/6.4/i386/README @@ -0,0 +1 @@ +PXE boot image i386 diff --git a/tftproot/images/centos/6.4/x86_64/README b/tftproot/images/centos/6.4/x86_64/README new file mode 100644 index 0000000..566e206 --- /dev/null +++ b/tftproot/images/centos/6.4/x86_64/README @@ -0,0 +1 @@ +PXE boot image x86_64 diff --git a/tftproot/pxelinux.cfg/01-52-54-00-12-34-56 b/tftproot/pxelinux.cfg/01-52-54-00-12-34-56 index bc1d419..878c47e 100644 --- a/tftproot/pxelinux.cfg/01-52-54-00-12-34-56 +++ b/tftproot/pxelinux.cfg/01-52-54-00-12-34-56 @@ -5,12 +5,12 @@ SERIAL 0 9600 0x303 TIMEOUT 20 PROMPT 1 -LABEL Centos 6.0 x86_64 - MENU LABEL Centos 6.3 64-bit - KERNEL images/centos/6.3/x86_64/vmlinuz - APPEND initrd=images/centos/6.3/x86_64/initrd.img ksdevice=eth0 ks=http://192.168.0.159/kickstart.cfg console=ttyS0,9600n81 +LABEL Centos 6.4 x86_64 + MENU LABEL Centos 6.4 64-bit + KERNEL images/centos/6.4/x86_64/vmlinuz + APPEND initrd=images/centos/6.4/x86_64/initrd.img ksdevice=eth0 ks=http://192.168.1.12/kickstart.cfg console=ttyS0,9600n81 -LABEL Centos 6.0 i386 - MENU LABEL Centos 6.3 32-bit - KERNEL images/centos/6.3/i386/vmlinuz - APPEND initrd=images/centos/6.3/i386/initrd.img ksdevice=eth0 ks=http://192.168.0.159/kickstart.cff console=ttyS0,9600n81 +LABEL Centos 6.4 i386 + MENU LABEL Centos 6.4 32-bit + KERNEL images/centos/6.4/i386/vmlinuz + APPEND initrd=images/centos/6.4/i386/initrd.img ksdevice=eth0 ks=http://192.168.1.12/kickstart.cff console=ttyS0,9600n81 diff --git a/tftproot/pxelinux.cfg/default b/tftproot/pxelinux.cfg/default index bc1d419..878c47e 100644 --- a/tftproot/pxelinux.cfg/default +++ b/tftproot/pxelinux.cfg/default @@ -5,12 +5,12 @@ SERIAL 0 9600 0x303 TIMEOUT 20 PROMPT 1 -LABEL Centos 6.0 x86_64 - MENU LABEL Centos 6.3 64-bit - KERNEL images/centos/6.3/x86_64/vmlinuz - APPEND initrd=images/centos/6.3/x86_64/initrd.img ksdevice=eth0 ks=http://192.168.0.159/kickstart.cfg console=ttyS0,9600n81 +LABEL Centos 6.4 x86_64 + MENU LABEL Centos 6.4 64-bit + KERNEL images/centos/6.4/x86_64/vmlinuz + APPEND initrd=images/centos/6.4/x86_64/initrd.img ksdevice=eth0 ks=http://192.168.1.12/kickstart.cfg console=ttyS0,9600n81 -LABEL Centos 6.0 i386 - MENU LABEL Centos 6.3 32-bit - KERNEL images/centos/6.3/i386/vmlinuz - APPEND initrd=images/centos/6.3/i386/initrd.img ksdevice=eth0 ks=http://192.168.0.159/kickstart.cff console=ttyS0,9600n81 +LABEL Centos 6.4 i386 + MENU LABEL Centos 6.4 32-bit + KERNEL images/centos/6.4/i386/vmlinuz + APPEND initrd=images/centos/6.4/i386/initrd.img ksdevice=eth0 ks=http://192.168.1.12/kickstart.cff console=ttyS0,9600n81 diff --git a/var/www/html/CentOS-Base.repo b/var/www/html/CentOS-Base.repo index 449198b..ba4018a 100644 --- a/var/www/html/CentOS-Base.repo +++ b/var/www/html/CentOS-Base.repo @@ -12,7 +12,7 @@ [base] name=CentOS-$releasever - Base -baseurl=http://192.168.0.159/Centos/$releasever/os/$basearch/ +baseurl=http://192.168.1.12/Centos/$releasever/os/$basearch/ #baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 @@ -20,7 +20,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 #released updates [updates] name=CentOS-$releasever - Updates -baseurl=http://192.168.0.159/Centos/$releasever/updates/$basearch/ +baseurl=http://192.168.1.12/Centos/$releasever/updates/$basearch/ #baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 @@ -28,7 +28,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 #additional packages that may be useful [extras] name=CentOS-$releasever - Extras -baseurl=http://192.168.0.159/Centos/$releasever/extras/$basearch/ +baseurl=http://192.168.1.12/Centos/$releasever/extras/$basearch/ #baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 @@ -36,7 +36,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 #additional packages that extend functionality of existing packages [centosplus] name=CentOS-$releasever - Plus -baseurl=http://192.168.0.159/Centos/$releasever/centosplus/$basearch/ +baseurl=http://192.168.1.12/Centos/$releasever/centosplus/$basearch/ #baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/ gpgcheck=1 enabled=0 @@ -45,7 +45,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 #contrib - packages by Centos Users [contrib] name=CentOS-$releasever - Contrib -baseurl=http://192.168.0.159/Centos/$releasever/contrib/$basearch +baseurl=http://192.168.1.12/Centos/$releasever/contrib/$basearch #baseurl=http://mirror.centos.org/centos/$releasever/contrib/$basearch/ gpgcheck=1 enabled=0 diff --git a/var/www/html/kickstart.cfg b/var/www/html/kickstart.cfg index cfbfca4..bc66ea0 100644 --- a/var/www/html/kickstart.cfg +++ b/var/www/html/kickstart.cfg @@ -2,7 +2,7 @@ #version=DEVEL install -url --url=http://192.168.0.159/Centos/6.3/os/x86_64 +url --url=http://192.168.1.12/Centos/6.4/os/x86_64 lang en_US.UTF-8 keyboard us network --onboot yes --device eth0 --bootproto dhcp --noipv6 @@ -16,14 +16,14 @@ bootloader --location=mbr --driveorder=sda --append=" rhgb crashkernel=auto cons zerombr clearpart --all --drives=sda --initlabel -part / --label=ROOT --fstype=ext4 --size=8192 -part swap --label=SWAP --size=4096 -part /data --label=DATA --size=8192 --grow +part / --label=ROOT --fstype=ext4 --size=1000 +part swap --label=SWAP --size=12 +#part /data --label=DATA --size=1012 --grow skipx cmdline -repo --name="CentOS" --baseurl=http://192.168.0.159/Centos/6.3/os/x86_64 --cost=100 +repo --name="CentOS" --baseurl=http://192.168.1.12/Centos/6.4/os/x86_64 --cost=100 reboot @@ -36,19 +36,19 @@ wget exec < /dev/console > /dev/console #!/bin/bash cd /root -wget -O /etc/yum.repos.d/CentOS-Base.repo http://192.168.0.159/CentOS-Base.repo +wget -O /etc/yum.repos.d/CentOS-Base.repo http://192.168.1.12/CentOS-Base.repo rpm --import /etc/pki/rpm-gpg/* yum clean all yum update -y mkdir /root/cfengine cd /root/cfengine -wget -nd -r http://192.168.0.159/cfengine -yum localinstall -y cfengine-community-3.2.1-1.el6.x86_64.rpm +wget -nd -r http://192.168.1.12/cfengine/{cfengine-community-3.5.1-3.x86_64.rpm,{failsafe,update}.cf} +yum localinstall -y cfengine-community-3.5.1-3.x86_64.rpm cp -v {failsafe,update}.cf /var/cfengine/inputs/. cd /root -/usr/local/sbin/cf-agent -B +/usr/local/sbin/cf-agent -B 192.168.1.12 /usr/local/sbin/cf-agent -- cgit v1.2.3-54-g00ecf