Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2013-12-13 14:55:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-iscsi" Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2013-12-03 14:26:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2013-12-13 14:55:08.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 11 17:40:51 PST 2013 - [email protected] + +- Fixed mkinitrd setup to not scan /etc/fstab + (bnc#826700), changing: + open-iscsi-openSUSE-Factory-first-merge.diff.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi-openSUSE-Factory-first-merge.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.9IbHNL/_old 2013-12-13 14:55:08.000000000 +0100 +++ /var/tmp/diff_new_pack.9IbHNL/_new 2013-12-13 14:55:08.000000000 +0100 @@ -88,6 +88,51 @@ /sbin/iscsid -n if [ -d /sys/firmware/ibft/initiator ] ; then +diff --git a/etc/mkinitrd/mkinitrd-setup.sh b/etc/mkinitrd/mkinitrd-setup.sh +index ae35ca7970f7..47e36c0c3617 100644 +--- a/etc/mkinitrd/mkinitrd-setup.sh ++++ b/etc/mkinitrd/mkinitrd-setup.sh +@@ -48,6 +48,7 @@ function check_iscsi() + } + + ++# perform sanity checks on an iSCSI device (given a sysfs path) + check_for_node_onboot() + { + local ip="$1" startup target +@@ -86,7 +87,7 @@ check_for_node_onboot() + if [[ "${startup}" != "onboot" ]] ; then + [[ -z "${startup}" ]] && return # No parameter - either iBFT or not iSCSI: return + +- ## Note: could set "onboot" ourselves here, but that seems heavy-handed ++ ## Note: not sure this warning is useful any longer, but leave in for now + echo >&2 "Warning: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}'" + echo >&2 " System may not be bootable with this setting," + echo >&2 " need to be set to 'onboot' instead, using:" +@@ -106,20 +107,9 @@ for bd in $blockdev ; do + check_iscsi $bd && root_iscsi=1 + done + +-# Are any of the defined file partitions to be mounted at system boot +-# attached to iSCSI devices? In case they are, ensure: +-# (1) the iSCSI gets included in "initrd", and +-# (2) the iSCSI sessions have been configured with +-# "node.conn[0].startup = onboot". +-if [[ -z "${root_iscsi}" ]] ; then +- for bd in $(awk '/^[[:space:]]*(\/dev\/|(LABEL|UUID)=)/ { print $1 }' /etc/fstab) ; do +- bd="${bd/LABEL=//dev/disk/by-label/}" +- bd="${bd/UUID=//dev/disk/by-uuid/}" +- update_blockdev $bd +- check_iscsi $bd && root_iscsi=1 +- done +-fi +- ++# No need to check for non-root volumes listed in fstab here, since ++# we will assume that the user has set "onboot" for any volumes ++# they wish mounted at this time + + # Include the iSCSI stack, when at least one active iSCSI session has + # been configured with "node.conn[0].startup = onboot", even if it was diff --git a/etc/mkinitrd/mkinitrd-stop.sh b/etc/mkinitrd/mkinitrd-stop.sh index 393a410971a3..a099c60eb86d 100644 --- a/etc/mkinitrd/mkinitrd-stop.sh @@ -207,11 +252,18 @@ # and patch them into the spec file as "Patch$NEXT_PATCH" if (( $uncommitted_changes )) ; then diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 35da303d2e0c..324c2a2f9bda 100644 +index 35da303d2e0c..53685c7dfcf9 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes -@@ -1,4 +1,93 @@ +@@ -1,4 +1,100 @@ ------------------------------------------------------------------- ++Wed Dec 11 17:40:51 PST 2013 - [email protected] ++ ++- Fixed mkinitrd setup to not scan /etc/fstab ++ (bnc#826700), changing: ++ open-iscsi-openSUSE-Factory-first-merge.diff.bz2 ++ ++------------------------------------------------------------------- +Mon Dec 2 14:46:25 PST 2013 - [email protected] + +- Dropped this patch from OBS; moved to github repostiory: @@ -304,7 +356,7 @@ Wed Jun 5 15:53:34 PDT 2013 - [email protected] - check return from nice() correctly (bnc#807936) -@@ -35,6 +124,14 @@ Fri Apr 5 11:04:21 PDT 2013 - [email protected] +@@ -35,6 +131,14 @@ Fri Apr 5 11:04:21 PDT 2013 - [email protected] flash (bnc#810208) ------------------------------------------------------------------- @@ -319,7 +371,7 @@ Mon Mar 11 15:20:47 PDT 2013 - [email protected] - Updated iscsiuio to latest (bnc#769125) -@@ -105,6 +202,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] +@@ -105,6 +209,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] - Stop iscsiuio when run inside initrd (bnc#728095) ------------------------------------------------------------------- @@ -331,7 +383,7 @@ Mon Oct 24 09:13:19 CEST 2011 - [email protected] - Update iscsiuio to 0.7.0.14f (bnc#687392) -@@ -166,6 +268,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] +@@ -166,6 +275,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] - Include scripts for automated build ------------------------------------------------------------------- @@ -343,7 +395,7 @@ Wed Feb 2 11:32:12 CET 2011 - [email protected] - Fix the following issues: -@@ -289,6 +396,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] +@@ -289,6 +403,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] - Read initiatorname correctly from sysfs (bnc#541882) ------------------------------------------------------------------- @@ -355,7 +407,7 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Synchronize startup settings (bnc#514273) -@@ -296,11 +408,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] +@@ -296,11 +415,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Do not use temp file in iscsi_discovery (bnc#528711) ------------------------------------------------------------------- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
