From a80fc0cd5cb702e21104ae390b0e97b54ca3d5dc2315ee505a64d5fce7a2e42c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 10 Jun 2007 22:22:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=25 --- yast2-installation-2.15.28.diff | 22 ++++++++++++++++++++++ yast2-installation.changes | 5 +++++ yast2-installation.spec | 6 +++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 yast2-installation-2.15.28.diff diff --git a/yast2-installation-2.15.28.diff b/yast2-installation-2.15.28.diff new file mode 100644 index 0000000..d5f9273 --- /dev/null +++ b/yast2-installation-2.15.28.diff @@ -0,0 +1,22 @@ +--- startup/Second-Stage/S07-medium ++++ startup/Second-Stage/S07-medium +@@ -19,7 +19,7 @@ + #============================================= + # 11.1) activate network if counfiguration found + #--------------------------------------------- +-if [ ! -z $(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo') ] ;then ++if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo')" ]; then + log "\tnetwork configuration found -> activate network" + rcnetwork start && Y2_NETWORK_ACTIVE=1 + +--- startup/Second-Stage/S08-start ++++ startup/Second-Stage/S08-start +@@ -17,7 +17,7 @@ + # will be displayed on the controling terminal + # --- + disable_splash +-if [ "$VNC" -eq 1 ] || [ -z $USE_SSH ] || [ "$USE_SSH" -eq 0 ] ; then ++if [ "$VNC" -eq 1 ] || [ -z "$USE_SSH" ] || [ "$USE_SSH" -eq 0 ] ; then + log "\tStarting X11/VNC based session..." + #================================================== + # We are going to start a VNC or X11 based session diff --git a/yast2-installation.changes b/yast2-installation.changes index b2e1628..a401168 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 10 21:11:13 CEST 2007 - schwab@suse.de + +- Fix quoting. + ------------------------------------------------------------------- Fri Jun 1 12:41:10 CEST 2007 - mzugec@suse.cz diff --git a/yast2-installation.spec b/yast2-installation.spec index 45da5a1..f05af3e 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -12,11 +12,12 @@ Name: yast2-installation Version: 2.15.28 -Release: 1 +Release: 6 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-2.15.28.tar.bz2 +Patch: yast2-installation-2.15.28.diff prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.15.35 @@ -85,6 +86,7 @@ Authors: %prep %setup -n yast2-installation-2.15.28 +%patch %build %{prefix}/bin/y2tool y2autoconf @@ -147,6 +149,8 @@ rm -rf "$RPM_BUILD_ROOT" %endif %changelog +* Sun Jun 10 2007 - schwab@suse.de +- Fix quoting. * Fri Jun 01 2007 - mzugec@suse.cz - use shared isNetworkRunning() function in network_finish - 2.15.28