Hello community, here is the log from the commit of package lilo for openSUSE:Factory checked in at 2012-10-09 13:51:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lilo (Old) and /work/SRC/openSUSE:Factory/.lilo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lilo", Maintainer is "jpl...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lilo/lilo.changes 2012-10-03 18:12:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lilo.new/lilo.changes 2012-10-09 13:57:31.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 8 09:29:19 UTC 2012 - dval...@suse.com + +- refresh kvm patch (fix syntax errors) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.ppc-kvm.patch ++++++ --- /var/tmp/diff_new_pack.7UTLXr/_old 2012-10-09 13:57:32.000000000 +0200 +++ /var/tmp/diff_new_pack.7UTLXr/_new 2012-10-09 13:57:32.000000000 +0200 @@ -1,15 +1,13 @@ -From aa67a149d73af0cb4677694a010562a798b5e529 Mon Sep 17 00:00:00 2001 +From 0c8e0e927ce74119cdd2647da9f2e9675ca45e9c Mon Sep 17 00:00:00 2001 From: Dinar Valeev <dval...@suse.com> Date: Mon, 13 Aug 2012 13:03:08 +0200 -Subject: [PATCH] get OF path for virtio. Don't run nvsetenv where - /dev/nvram is not available (under KVM). Extend search - of vscsi disks to disk@id,lun +Subject: [PATCH] get OF path for virtio. Don't run nvsetenv where /dev/nvram is not available (under KVM). Extend search of vscsi disks to disk@id,lun --- lilo-chrp.lib | 29 ++++++++++++++++------------- lilo.new | 8 +++++++- - show_of_path.sh | 12 +++++++++++- - 3 files changed, 34 insertions(+), 15 deletions(-) + show_of_path.sh | 23 +++++++++++++++++++++-- + 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/lilo-chrp.lib b/lilo-chrp.lib index 92cb2ad..a65c0fd 100644 @@ -78,10 +76,26 @@ function running_on_iseries () { source /lib/lilo/lilo-iseries.lib diff --git a/show_of_path.sh b/show_of_path.sh -index 52ceb16..03af210 100644 +index 52ceb16..1beeace 100644 --- a/show_of_path.sh +++ b/show_of_path.sh -@@ -361,6 +361,11 @@ case "$file_full_sysfs_path" in +@@ -327,7 +327,14 @@ case "$file_full_sysfs_path" in + ide_port=$of_disk_scsi_host + ide_channel=$of_disk_scsi_id + +- cd ../../.. ++ until test -f devspec ++ do ++ cd .. ++ if test "$PWD" = "/" ++ then ++ break ++ fi ++ done + ;; + */host+([0-9])/rport-+([0-9]):+([0-9])-+([0-9])/target+([0-9:])/+([0-9]):+([0-9]):+([0-9]):+([0-9])) + # new sysfs layout starting with kernel 2.6.15 +@@ -361,6 +368,11 @@ case "$file_full_sysfs_path" in fi done ;; @@ -93,16 +107,17 @@ *) # TODO check the rest of the (hardware) world : file_full_sysfs_path $file_full_sysfs_path -@@ -481,6 +486,8 @@ if [ -f devspec ] ; then +@@ -481,6 +493,9 @@ if [ -f devspec ] ; then ;; ieee1394) ;; + block) + file_storage_type=virtio ++ ;; *) error "Unknown device type $(< ${file_of_hw_devtype}/device_type)" ;; -@@ -610,7 +617,7 @@ if [ -f devspec ] ; then +@@ -610,7 +625,7 @@ if [ -f devspec ] ; then ;; vscsi) (( of_disk_vscsi_nr = ( (2 << 14) | (of_disk_scsi_chan<<5) | (of_disk_scsi_id<<8) | of_disk_scsi_lun ) <<48 )); # @@ -111,13 +126,14 @@ of_disk_vscsi_dir=disk elif [ -d ${file_of_hw_devtype}/sd ]; then of_disk_vscsi_dir=sd -@@ -627,6 +634,9 @@ if [ -f devspec ] ; then +@@ -627,6 +642,10 @@ if [ -f devspec ] ; then # MacOS: boot-device=fw/node@1d20000038f29/sbp-2@c000/@0:7,\\:tbxi file_of_hw_path="${file_of_hw_devtype##/proc/device-tree}"/node@${ieee1394_id}/sbp-2/disk@0 ;; + virtio) + file_of_hw_path="${file_of_hw_devtype##/proc/device-tree}" + dbg_show file_of_hw_path ++ ;; *) error "Internal error, can't handle storage type '${file_storage_type}'" ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org