openstack
/
fuel-main
Code Issues Proposed changes

Merge "Remove unused syslinux related files"

This commit is contained in:
Jenkins 2016-03-02 16:50:04 +00:00 committed by Gerrit Code Review
parent 1867de9d2f 8503022ade
commit c4cf64e977
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
iso/ks.template
View File

@ -197,7 +197,6 @@ tgtdrive=$(echo $tgtdrive | sed -e 's/!/\//')
# source
iso_volume_id=will_be_substituted_with_ISO_VOLUME_ID
iso_disk_uuid=will_be_substituted_with_actual_uuid
cdrom_device=
if [ -e /proc/sys/dev/cdrom/info ]; then
@ -211,13 +210,6 @@ if [ -e /dev/disk/by-label/${iso_volume_id} ]; then
else
echo "harddrive --partition=LABEL=${iso_volume_id} --dir=/" > /tmp/source.ks
fi
elif [ -e /dev/disk/by-uuid/${iso_disk_uuid} ]; then
real_device=$(readlink -e /dev/disk/by-uuid/${iso_disk_uuid})
if [ "${real_device}" == "/dev/${cdrom_device}" ]; then
echo "cdrom" > /tmp/source.ks
else
echo "harddrive --partition=UUID=${iso_disk_uuid} --dir=/" > /tmp/source.ks
fi
else
echo "cdrom" > /tmp/source.ks
fi
@ -368,16 +360,11 @@ fi
# for access to dist files.
iso_volume_id=will_be_substituted_with_ISO_VOLUME_ID
iso_disk_uuid=will_be_substituted_with_actual_uuid
FS="/mnt/sysimage/tmp/fs"
if ! mountpoint -q "${SOURCE}"; then
if [ -e "/dev/disk/by-label/${iso_volume_id}" ]; then
mount "/dev/disk/by-label/${iso_volume_id}" "${SOURCE}"
elif [ -e "/dev/disk/by-uuid/${iso_disk_uuid}" ]; then
mkdir -p "${FS}"
mount "/dev/disk/by-uuid/${iso_disk_uuid}" "${FS}"
mount -o loop "${FS}/nailgun.iso" "${SOURCE}"
fi
fi

22
iso/syslinux/syslinux.cfg
View File

@ -1,22 +0,0 @@
default vesamenu.c32
#prompt 1
timeout 300
display boot.msg
menu background splash.jpg
menu title Welcome to Fuel Installer (version: will_be_substituted_with_PRODUCT_VERSION)
menu color border 0 #ffffffff #00000000
menu color sel 7 #ffffffff #ff000000
menu color title 0 #ffffffff #00000000
menu color tabmsg 0 #ffffffff #00000000
menu color unsel 0 #ffffffff #00000000
menu color hotsel 0 #ff000000 #ffffffff
menu color hotkey 7 #ffffffff #ff000000
menu color scrollbar 0 #ffffffff #00000000
label nailgunstatic
menu label Fuel Install (^Static IP)
menu default
kernel vmlinuz
append initrd=initrd.img biosdevname=0 repo=hd:UUID=will_be_substituted_with_actual_uuid:/ ks=hd:UUID=will_be_substituted_with_actual_uuid:/ks.cfg ip=10.20.0.2 gw=10.20.0.1 dns1=10.20.0.1 netmask=255.255.255.0 hostname=fuel.domain.tld