rpm/yast2-installation
SHA256
1
0
Fork 0
forked from pool/yast2-installation
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=25

Browse Source
This commit is contained in:
OBS User unknown 2007-06-10 22:22:46 +00:00 committed by Git OBS Bridge
parent 4a59118e51
commit a80fc0cd5c
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
yast2-installation-2.15.28.diff Normal file
View File

@ -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

5
yast2-installation.changes
View File

@ -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 Fri Jun 1 12:41:10 CEST 2007 - mzugec@suse.cz

6
yast2-installation.spec
View File

@ -12,11 +12,12 @@
Name: yast2-installation Name: yast2-installation
Version: 2.15.28 Version: 2.15.28
Release: 1 Release: 6
License: GNU General Public License (GPL) License: GNU General Public License (GPL)
Group: System/YaST Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-2.15.28.tar.bz2 Source0: yast2-installation-2.15.28.tar.bz2
Patch: yast2-installation-2.15.28.diff
prefix: /usr 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: 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 BuildRequires: yast2 >= 2.15.35
@ -85,6 +86,7 @@ Authors:
%prep %prep
%setup -n yast2-installation-2.15.28 %setup -n yast2-installation-2.15.28
%patch
%build %build
%{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2autoconf
@ -147,6 +149,8 @@ rm -rf "$RPM_BUILD_ROOT"
%endif %endif
%changelog %changelog
* Sun Jun 10 2007 - schwab@suse.de
- Fix quoting.
* Fri Jun 01 2007 - mzugec@suse.cz * Fri Jun 01 2007 - mzugec@suse.cz
- use shared isNetworkRunning() function in network_finish - use shared isNetworkRunning() function in network_finish
- 2.15.28 - 2.15.28