From d05b5f04c92034eae1675dc8102247a3cc3315f7 Mon Sep 17 00:00:00 2001 From: baigk Date: Tue, 4 Aug 2015 22:21:43 -0400 Subject: delete the windows newline character JIRA: COMPASS-7 Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e Signed-off-by: baigk --- .../adapters/cobbler/snippets/keep_ssh_host_keys | 228 ++++++++++----------- 1 file changed, 114 insertions(+), 114 deletions(-) (limited to 'deploy/adapters/cobbler/snippets/keep_ssh_host_keys') diff --git a/deploy/adapters/cobbler/snippets/keep_ssh_host_keys b/deploy/adapters/cobbler/snippets/keep_ssh_host_keys index eb0a43eb..75970477 100644 --- a/deploy/adapters/cobbler/snippets/keep_ssh_host_keys +++ b/deploy/adapters/cobbler/snippets/keep_ssh_host_keys @@ -1,114 +1,114 @@ -#raw -# Nifty trick to restore keys without using a nochroot %post - -echo "Saving keys..." > /dev/ttyS0 - -SEARCHDIR=/etc/ssh -TEMPDIR=ssh -PATTERN=ssh_host_ - -keys_found=no -# /var could be a separate partition -SHORTDIR=${SEARCHDIR#/var} -if [ $SHORTDIR = $SEARCHDIR ]; then - SHORTDIR='' -fi -insmod /lib/jbd.o -insmod /lib/ext3.o - -mkdir -p /tmp/$TEMPDIR - - -function findkeys -{ - for disk in $DISKS; do - name=$(basename $disk) - tmpdir=$(mktemp -d $name.XXXXXX) - mkdir -p /tmp/$tmpdir - mount $disk /tmp/$tmpdir - if [ $? -ne 0 ]; then # Skip to the next partition if the mount fails - rm -rf /tmp/$tmpdir - continue - fi - # Copy current host keys out to be reused - if [ -d /tmp/$tmpdir$SEARCHDIR ] && cp -a /tmp/$tmpdir$SEARCHDIR/${PATTERN}* /tmp/$TEMPDIR; then - keys_found="yes" - umount /tmp/$tmpdir - rm -r /tmp/$tmpdir - break - elif [ -n "$SHORTDIR" ] && [ -d /tmp/$tmpdir$SHORTDIR ] && cp -a /tmp/$tmpdir$SHORTDIR/${PATTERN}* /tmp/$TEMPDIR; then - keys_found="yes" - umount /tmp/$tmpdir - rm -r /tmp/$tmpdir - break - fi - umount /tmp/$tmpdir - rm -r /tmp/$tmpdir - done -} - -DISKS=$(awk '{if ($NF ~ "^[a-zA-Z].*[0-9]$" && $NF !~ "c[0-9]+d[0-9]+$" && $NF !~ "^loop.*") print "/dev/"$NF}' /proc/partitions) -# In the awk line above we want to make list of partitions, but not devices/controllers -# cciss raid controllers have partitions like /dev/cciss/cNdMpL, where N,M,L - some digits, we want to make sure 'pL' is there -# No need to scan loopback niether. -# Try to find the keys on ordinary partitions - -findkeys - -# Try software RAID -if [ "$keys_found" = "no" ]; then - if mdadm -As; then - DISKS=$(awk '/md/{print "/dev/"$1}' /proc/mdstat) - findkeys - # unmount and deactivate all md - for md in $DISKS ; do - umount $md - mdadm -S $md - done - fi -fi - - -# Try LVM if that didn't work -if [ "$keys_found" = "no" ]; then - lvm lvmdiskscan - vgs=$(lvm vgs | tail -n +2 | awk '{ print $1 }') - for vg in $vgs; do - # Activate any VG we found - lvm vgchange -ay $vg - done - - DISKS=$(lvm lvs | tail -n +2 | awk '{ print "/dev/" $2 "/" $1 }') - findkeys - - # And clean up.. - for vg in $vgs; do - lvm vgchange -an $vg - done -fi - -# Loop until the corresponding rpm is installed -if [ "$keys_found" = "yes" ]; then - if [ "$PATTERN" = "ssh_host_" ]; then - while : ; do - sleep 10 - if [ -f /etc/ssh/ssh_host_key ] ; then - cp -af /tmp/$TEMPDIR/${PATTERN}* $SEARCHDIR - break - fi - done 1>/dev/null 2>/dev/null & - fi - while : ; do - sleep 10 - if [ -d /mnt/sysimage$SEARCHDIR ] ; then - cp -af /tmp/$TEMPDIR/${PATTERN}* /mnt/sysimage$SEARCHDIR - if [ -e "/sbin/restorecon"]; then - /sbin/restorecon -r /etc/ssh - fi - logger "keys copied to newly installed system" - break - fi - done 1>/dev/null 2>/dev/null & -fi -#end raw - +#raw +# Nifty trick to restore keys without using a nochroot %post + +echo "Saving keys..." > /dev/ttyS0 + +SEARCHDIR=/etc/ssh +TEMPDIR=ssh +PATTERN=ssh_host_ + +keys_found=no +# /var could be a separate partition +SHORTDIR=${SEARCHDIR#/var} +if [ $SHORTDIR = $SEARCHDIR ]; then + SHORTDIR='' +fi +insmod /lib/jbd.o +insmod /lib/ext3.o + +mkdir -p /tmp/$TEMPDIR + + +function findkeys +{ + for disk in $DISKS; do + name=$(basename $disk) + tmpdir=$(mktemp -d $name.XXXXXX) + mkdir -p /tmp/$tmpdir + mount $disk /tmp/$tmpdir + if [ $? -ne 0 ]; then # Skip to the next partition if the mount fails + rm -rf /tmp/$tmpdir + continue + fi + # Copy current host keys out to be reused + if [ -d /tmp/$tmpdir$SEARCHDIR ] && cp -a /tmp/$tmpdir$SEARCHDIR/${PATTERN}* /tmp/$TEMPDIR; then + keys_found="yes" + umount /tmp/$tmpdir + rm -r /tmp/$tmpdir + break + elif [ -n "$SHORTDIR" ] && [ -d /tmp/$tmpdir$SHORTDIR ] && cp -a /tmp/$tmpdir$SHORTDIR/${PATTERN}* /tmp/$TEMPDIR; then + keys_found="yes" + umount /tmp/$tmpdir + rm -r /tmp/$tmpdir + break + fi + umount /tmp/$tmpdir + rm -r /tmp/$tmpdir + done +} + +DISKS=$(awk '{if ($NF ~ "^[a-zA-Z].*[0-9]$" && $NF !~ "c[0-9]+d[0-9]+$" && $NF !~ "^loop.*") print "/dev/"$NF}' /proc/partitions) +# In the awk line above we want to make list of partitions, but not devices/controllers +# cciss raid controllers have partitions like /dev/cciss/cNdMpL, where N,M,L - some digits, we want to make sure 'pL' is there +# No need to scan loopback niether. +# Try to find the keys on ordinary partitions + +findkeys + +# Try software RAID +if [ "$keys_found" = "no" ]; then + if mdadm -As; then + DISKS=$(awk '/md/{print "/dev/"$1}' /proc/mdstat) + findkeys + # unmount and deactivate all md + for md in $DISKS ; do + umount $md + mdadm -S $md + done + fi +fi + + +# Try LVM if that didn't work +if [ "$keys_found" = "no" ]; then + lvm lvmdiskscan + vgs=$(lvm vgs | tail -n +2 | awk '{ print $1 }') + for vg in $vgs; do + # Activate any VG we found + lvm vgchange -ay $vg + done + + DISKS=$(lvm lvs | tail -n +2 | awk '{ print "/dev/" $2 "/" $1 }') + findkeys + + # And clean up.. + for vg in $vgs; do + lvm vgchange -an $vg + done +fi + +# Loop until the corresponding rpm is installed +if [ "$keys_found" = "yes" ]; then + if [ "$PATTERN" = "ssh_host_" ]; then + while : ; do + sleep 10 + if [ -f /etc/ssh/ssh_host_key ] ; then + cp -af /tmp/$TEMPDIR/${PATTERN}* $SEARCHDIR + break + fi + done 1>/dev/null 2>/dev/null & + fi + while : ; do + sleep 10 + if [ -d /mnt/sysimage$SEARCHDIR ] ; then + cp -af /tmp/$TEMPDIR/${PATTERN}* /mnt/sysimage$SEARCHDIR + if [ -e "/sbin/restorecon"]; then + /sbin/restorecon -r /etc/ssh + fi + logger "keys copied to newly installed system" + break + fi + done 1>/dev/null 2>/dev/null & +fi +#end raw + -- cgit 1.2.3-korg