Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-04-09 18:17:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-03-27 06:14:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-04-09 18:17:23.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 8 09:08:37 CEST 2014 - [email protected] + +- Introduce detection of z/VM or LPAR hypervisors. +- Moved the check for config.net.ptp to the correct spot in the logic. +- If running on z/VM always try to modprobe the netiucv kernel module +- Don't prompt for DHCP if using a pont-to-point network interface. (bnc #865097) + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.15.tar.bz2 New: ---- linuxrc-4.2.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.jQm3wk/_old 2014-04-09 18:17:25.000000000 +0200 +++ /var/tmp/diff_new_pack.jQm3wk/_new 2014-04-09 18:17:25.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.15 +Version: 4.2.16 Release: 0 -Source: linuxrc-4.2.15.tar.bz2 +Source: linuxrc-4.2.16.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.15.tar.bz2 -> linuxrc-4.2.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.15/VERSION new/linuxrc-4.2.16/VERSION --- old/linuxrc-4.2.15/VERSION 2014-03-26 08:22:33.000000000 +0100 +++ new/linuxrc-4.2.16/VERSION 2014-04-08 09:08:35.000000000 +0200 @@ -1 +1 @@ -4.2.15 +4.2.16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.15/changelog new/linuxrc-4.2.16/changelog --- old/linuxrc-4.2.15/changelog 2014-03-26 08:22:34.000000000 +0100 +++ new/linuxrc-4.2.16/changelog 2014-04-08 09:08:36.000000000 +0200 @@ -1,4 +1,14 @@ -2014-03-26: HEAD +2014-04-08: HEAD + - Merge pull request #6 from openSUSE/iucvtest + - Introduce detection of z/VM or LPAR hypervisors. + - Added util_umount('/sys/hypervisor/s390'); to lxrc_end. + - Moved the check for config.net.ptp to the correct spot in the logic. + - Add #if/#endif to last change to net.c + - Introduce detection of z/VM or LPAR hypervisors. + - If running on z/VM always try to modprobe the netiucv kernel module + - Don\'t prompt for DHCP if using a pont-to-point network interface. (bnc #865097) + +2014-03-26: 4.2.15 - fix gcc aliasing warning - ctc0 is now slccw0.0.???? - don't do arping on ptp interfaces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.15/global.h new/linuxrc-4.2.16/global.h --- old/linuxrc-4.2.15/global.h 2014-03-26 08:09:51.000000000 +0100 +++ new/linuxrc-4.2.16/global.h 2014-04-08 08:07:11.000000000 +0200 @@ -646,6 +646,7 @@ int layer2; int portno; char* osahwaddr; + char* hypervisor; } hwp; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.15/linuxrc.c new/linuxrc-4.2.16/linuxrc.c --- old/linuxrc-4.2.15/linuxrc.c 2014-03-20 11:59:54.000000000 +0100 +++ new/linuxrc-4.2.16/linuxrc.c 2014-04-08 08:07:11.000000000 +0200 @@ -475,6 +475,9 @@ if(!config.test) { util_umount("/dev/pts"); + #if defined(__s390__) || defined(__s390x__) + util_umount("/sys/hypervisor/s390"); + #endif util_umount("/sys"); util_umount("/proc/bus/usb"); if (!config.rescue) @@ -679,6 +682,9 @@ if(!config.test) { if(config.had_segv) { umount("/dev/pts"); + #if defined(__s390__) || defined(__s390x__) + umount("/sys/hypervisor/s390"); + #endif umount("/sys"); umount("/proc"); } @@ -687,6 +693,36 @@ mount("devpts", "/dev/pts", "devpts", 0, 0); } + #if defined(__s390__) || defined(__s390x__) + if(util_check_exist("/sys/hypervisor/s390")) { + mount("s390_hypfs","/sys/hypervisor/s390","s390_hypfs", 0, 0); + if(util_check_exist("/sys/hypervisor/s390/hyp/type")) { + + FILE *hyp_type; + *buf = 0; + + hyp_type = fopen("/sys/hypervisor/s390/hyp/type", "r"); + if(hyp_type) { + fgets(buf, sizeof buf -1 , hyp_type); + if(*buf) { + if(strncmp(buf,"z/VM",4)==0) { + config.hwp.hypervisor="z/VM"; + } + else if(strncmp(buf,"LPAR",4)==0) { + config.hwp.hypervisor="LPAR"; + } + else { + config.hwp.hypervisor="Unknown"; + } + *buf = 0; + } + fclose(hyp_type); + } + } + } + + #endif + /* add cmdline to info file */ config.info.add_cmdline = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.15/net.c new/linuxrc-4.2.16/net.c --- old/linuxrc-4.2.15/net.c 2014-03-26 08:09:51.000000000 +0100 +++ new/linuxrc-4.2.16/net.c 2014-04-08 08:07:11.000000000 +0200 @@ -210,7 +210,7 @@ config.net.configured = nc_none; if(config.win && config.net.setup != NS_DHCP) { - if((config.net.setup & NS_DHCP)) { + if(config.net.setup & NS_DHCP && !config.net.ptp) { sprintf(buf, "Automatic configuration via %s?", "DHCP"); rc = dia_yesno(buf, NO); } @@ -1342,6 +1342,17 @@ net_drivers_loaded = 1; } + /* The IUCV driver is special. There's no way for anything to detect + IUCV is available for use unless the driver is already loaded. So, + if we're running on z/VM we always load it, no matter what. */ + #if defined(__s390__) || defined(__s390x__) + if(strncmp(config.hwp.hypervisor,"z/VM",4)==0) { + dia_info(&win, "We are running on z/VM", MSGTYPE_INFO); + dia_info(&win, "Loading the IUCV network driver", MSGTYPE_INFO); + mod_modprobe("netiucv",""); + } + #endif + if(config.manual >= 2) { #if defined(__s390__) || defined(__s390x__) /* bring up network devices, write hwcfg */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
