Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-09-28 19:58:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-19 13:55:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-09-28 19:58:58.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Sep 26 11:09:37 CEST 2014 - [email protected] + +- s390x: revert hypervisor check (bnc #887238) +- 5.0.23 + +------------------------------------------------------------------- +Wed Sep 24 08:28:54 CEST 2014 - [email protected] + +- s390x: write LLADDR only on LPAR +- s390x: store MAC address for layer2 devices in ifcfg (bnc #887238) +- add 'archive' target to Makefile +- use improved git2log script +- 5.0.22 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.21.tar.xz New: ---- linuxrc-5.0.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.ZUWc74/_old 2014-09-28 19:58:58.000000000 +0200 +++ /var/tmp/diff_new_pack.ZUWc74/_new 2014-09-28 19:58:58.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.21 +Version: 5.0.23 Release: 0 -Source: linuxrc-5.0.21.tar.xz +Source: linuxrc-5.0.23.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-5.0.21.tar.xz -> linuxrc-5.0.23.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/Makefile new/linuxrc-5.0.23/Makefile --- old/linuxrc-5.0.21/Makefile 2014-08-18 15:17:24.000000000 +0200 +++ new/linuxrc-5.0.23/Makefile 2014-09-23 13:21:51.000000000 +0200 @@ -2,7 +2,11 @@ CFLAGS = -c -g -O2 -Wall -Wno-pointer-sign LDFLAGS = -rdynamic -lhd -lblkid -lcurl -lreadline -GIT2LOG = $(shell [ -x ./git2log ] && echo ./git2log ) +GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) +GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) +VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) +BRANCH := $(shell git branch | perl -ne 'print $$_ if s/^\*\s*//') +PREFIX := linuxrc-$(VERSION) SRC = $(filter-out inflate.c,$(wildcard *.c)) INC = $(wildcard *.h) @@ -11,20 +15,15 @@ SUBDIRS = mkpsfu .EXPORT_ALL_VARIABLES: -.PHONY: all clean install libs +.PHONY: all clean install libs archive %.o: %.c $(CC) $(CFLAGS) -o $@ $< all: changelog libs linuxrc -ifneq ($(GIT2LOG),) -changelog: .git/HEAD .git/refs/heads .git/refs/tags - $(GIT2LOG) --log >changelog - -VERSION: .git/HEAD .git/refs/heads .git/refs/tags - $(GIT2LOG) --version >VERSION -endif +changelog: $(GITDEPS) + $(GIT2LOG) --changelog changelog version.h: VERSION @echo "#define LXRC_VERSION \"`cut -d. -f1-2 VERSION`\"" >$@ @@ -47,8 +46,15 @@ libs: @for d in $(SUBDIRS); do $(MAKE) -C $$d $(MAKECMDGOALS); done +archive: changelog + mkdir -p package + git archive --prefix=$(PREFIX)/ $(BRANCH) > package/$(PREFIX).tar + tar -r -f package/$(PREFIX).tar --mode=0664 --owner=root --group=root --mtime="`git show -s --format=%ci`" --transform='s:^:$(PREFIX)/:' VERSION changelog + xz -f package/$(PREFIX).tar + clean: libs rm -f $(OBJ) *~ linuxrc linuxrc.map linuxrc-debug .depend version.h + rm -rf package TAGS: *.c *.h */*.c */*.h etags *.c *.h */*.c */*.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/VERSION new/linuxrc-5.0.23/VERSION --- old/linuxrc-5.0.21/VERSION 2014-09-18 09:50:58.000000000 +0200 +++ new/linuxrc-5.0.23/VERSION 2014-09-26 11:09:18.000000000 +0200 @@ -1 +1 @@ -5.0.21 +5.0.23 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/changelog new/linuxrc-5.0.23/changelog --- old/linuxrc-5.0.21/changelog 2014-09-18 09:51:10.000000000 +0200 +++ new/linuxrc-5.0.23/changelog 2014-09-26 11:09:35.000000000 +0200 @@ -1,58 +1,41 @@ -2014-09-18: HEAD - - Merge pull request #31 from openSUSE/sw_0018 - - add sshkey option tp support ssh pubkey authentication (bnc #230781, bnc... +2014-09-26: 5.0.23 + - s390x: revert hypervisor check (bnc 887238) + +2014-09-23: 5.0.22 + - s390x: write LLADDR only on LPAR + - s390x: store MAC address for layer2 devices in ifcfg (bnc #887238) + - keep going without tags + - add 'archive' target to Makefile + - use improved git2log script + +2014-09-18: 5.0.21 - add sshkey option tp support ssh pubkey authentication (bnc #230781, bnc #421340) -2014-09-18: 5.0.20 - - Merge pull request #30 from openSUSE/sw_0017 - - make ifcfg=dhcp{4,6} work as expected +2014-09-17: 5.0.20 - make ifcfg=dhcp{4,6} work as expected 2014-09-17: 5.0.19 - - Merge pull request #29 from openSUSE/sw_0016 - - Sw 0016 - remove unnecessary check - don't check autoinst.xml digest (bnc #895670) - remove dead code 2014-09-15: 5.0.18 - - Merge pull request #28 from openSUSE/sw_0015 - - moved edd.ko loading into udev start script (bnc #871617) - moved edd.ko loading into udev start script (bnc #871617) - - We need to load more modules before starting udevd. Doing this in udev_setup - - now. See related change in installation-images. -2014-09-12: 5.0.17 - - Merge pull request #27 from openSUSE/sw_0014 - - finalize ifcfg option parsing +2014-09-11: 5.0.17 - finalize ifcfg option parsing -2014-09-11: 5.0.16 - - fix missing parameter to dia_input2() - - Merge pull request #26 from openSUSE/sw_0013 - - look for autoinst.xml and keep the name (don't use autoyast.xml internal... - - look for autoinst.xml and keep the name (don't use autoyast.xml internally; fate #316530) - - Merge pull request #25 from jsrain/master - - increased memory thrreshold for loading inst-sys to RAM (bnc #893982) +2014-08-29: 5.0.16 - increased memory thrreshold for loading inst-sys to RAM (bnc #893982) 2014-08-18: 5.0.15 - - Merge pull request #24 from openSUSE/sw_0012 - - Sw 0012 - clarify return code - add comment - s390x: don't resolve name of x11 server - fix nfs & cifs mounts (bnc #890172) - - We don't do dns lookups in linuxrc any longer. Adjusted code to no longer - - rely on resolved addresses but to just use server names as provided by the - - user. - fix dialog window creation - - Add a minimal width so dialog windows with input lines have at least the - - size of the input line. 2014-08-15: 5.0.14 - - Merge pull request #23 from openSUSE/sw_0011 - - add vlan dialog - fix net_input_vlanid() - add vlan dialog @@ -60,56 +43,33 @@ - add 'nanny' option to control wickedd-nanny; disable by default 2014-08-11: 5.0.12 - - Merge pull request #21 from openSUSE/sw_0009 - - netsetup=dhcp didn't work (bnc #890874, bnc #889887) - netsetup=dhcp didn't work (bnc #890874, bnc #889887) - reactivate netsetup=dhcp,all (bnc #891080) -2014-08-08: 5.0.11 - - Merge pull request #20 from openSUSE/sw_0008 - - Enhance linuxrc network code a bit. +2014-08-07: 5.0.11 - Enhance linuxrc network code a bit. - set WAIT_FOR_INTERFACES (bnc #890643) - allow global network config options that should go to /etc/sysconfig/network/config to be set in ifcfg option 2014-08-06: 5.0.10 - - Merge pull request #19 from openSUSE/sw_0007 - - Sw 0007 - add new 'sshd' option to start sshd during install but don't trigger a ssh installation - apply netwait also to static setup - add wicked.timeout as alias to dhcp.timeout - extend debugwait syntax - - Now shell wildcard patterns are allowed and you can also match against function names. - - The debugwait option accepts comma-separated pattern list. - free screen memory only after we allocated it 2014-08-04: 5.0.9 - - Merge pull request #18 from openSUSE/sw_0006 - - Sw 0006 - explicitly set CURLOPT_IPRESOLVE to debug/workaround resolve issues (bnc #889981) - Unify password handling and add password.enc option to pass encrypted passwords. - - There is an unused 'password' option; make it an alias to 'sshpassword' and - - set password even without ssh enabled (it's also used for rescue system). - - Add 'password.enc' and 'sshpassword.enc' to allow passing passwords in - - encrypted form. 2014-07-31: 5.0.8 - - Merge pull request #16 from openSUSE/sw_0004 - - fix point-to-point interface handling (bnc #889580) - fix point-to-point interface handling (bnc #889580) -2014-07-30: 5.0.7 - - Merge pull request #15 from openSUSE/sw_0003 - - pass along hostname if explicitly set (bnc #889374) - - pass along hostname if explicitly set (bnc #889374) - - Merge pull request #14 from mvidner/readme - - Read me. +2014-07-28: 5.0.7 - Read me. 2014-07-28: 5.0.6 - - Merge pull request #13 from openSUSE/sw_0002 - - Sw 0002 - add missing break - more dead code cleanup - fix evil nameserver config bug @@ -117,8 +77,6 @@ - make log file script behave 2014-07-25: 5.0.5 - - Merge pull request #12 from openSUSE/sw_0001 - - Sw 0001 - remove more parts of old network code - remove obsolete config.netdevice @@ -175,8 +133,6 @@ - code cleanup: better wicked integration, removed obsolete code 2014-07-04: 4.2.40 - - Merge pull request #11 from openSUSE/bnc885676 - - Revert to previous handling of config.hwp.layer2 variable. - read linuxrc config also from /etc/linuxrc.d - Revert to previous handling of config.hwp.layer2 variable. - Try to document why we're using something other than 0 and 1 for values for layer2, protocol, and portno. @@ -186,20 +142,12 @@ - more logging for fcoe and efi detection - reworked ifcfg option to support vlan and setting arbirary config file entries -2014-07-02: 4.2.38 - - Merge pull request #10 from openSUSE/bnc885231 - - Check for a selection of 0 when returning from dia_list to choose the network device +2014-07-01: 4.2.38 - Check for a selection of 0 when returning from dia_list to choose the network device. 2014-07-01: 4.2.37 - move udev start script to /script dir - added new 'ifcfg' option to configure network - - Simple examples are ifcfg=*=dhcp (configure all devices with dhcp) or - - ifcfg=eth0=10.0.1.1/24,10.0.1.254 (eth0: static setup, ip 10.0.1.1, - - netmask 255.255.255.0, gateway 10.0.1.254). See linuxrc docu for more. - - The main difference to the existing (old) network setup strategy is that - - 'ifcfg' just creates config files in /etc/sysconfig/network and runs wicked. - - It doesn't 'try' the config on every interface until one works. 2014-06-25: 4.2.36 - tag ibft interface as persistent @@ -214,7 +162,6 @@ 2014-06-17: 4.2.33 - don't kill haveged (bnc #875848) - - We start haveged early in in linuxrc now. So don't accidentally kill it. 2014-06-06: 4.2.32 - fix s390x network setup properly (bnc #881342) @@ -222,9 +169,7 @@ 2014-06-05: 4.2.31 - s390x: wait 3s after loading qeth module -2014-05-30: 4.2.30 - - Merge pull request #9 from openSUSE/bnc879893 - - s390: choose thermonuclear option to deal with whitespace issues +2014-05-28: 4.2.30 - s390: choose thermonuclear option to deal with whitespace issues once and for all (bnc #706605) - s390: allow empty parameters for portname, portno and @@ -248,14 +193,9 @@ 2014-05-15: 4.2.25 - suppress edd failed message -2014-05-15: 4.2.24 - - fix compilation - - Merge pull request #8 from openSUSE/layer2test - - Layer2test +2014-05-14: 4.2.24 - Adjust the branch to match the current master. - Revert "Initial changes to use IBM-supplied chzdev command instead of our *_configure commands." - - The feature request in FATE for this was withdrawn. - - This reverts commit 883b0f334dfcc00cc03a24911522fb4de57c4a83. - Move check for config.hwp.layer2 to the correct line. - Fix for bnc #855696 - Only ask if DHCP is to be used for Layer 2 interfaces. @@ -274,21 +214,15 @@ - iscsi detection also looks for iscsi_boot* (bnc #876104) 2014-04-24: 4.2.20 - - Merge branch 'netx' - minor corrections - fix some bugs in last patch and add logging - Signature checking of compressed driver updates now works (bnc #836366). - - We do this by delaying the uncompression and handling it in util_mount(). - - Before we uncompressed while downloading. - support unpacking of tar archives - support xz compression - reworked filesystem type detection, added tar - apply timeout option to wicked -2014-04-22: 4.2.19 - - fix compiler warning - - Merge pull request #7 from openSUSE/s390xkvm - - Fix for bnc #843438. +2014-04-21: 4.2.19 - Fix for bnc #843438. Add KVM detection on s390x. If running under KVM on s390x, only offer a virtio network device. @@ -306,15 +240,13 @@ 2014-04-11: 4.2.17 - add withipoib option to trigger loading ip over infiniband modules (bnc #865852) -2014-04-08: 4.2.16 - - Merge pull request #6 from openSUSE/iucvtest - - Introduce detection of z/VM or LPAR hypervisors. +2014-04-07: 4.2.16 - 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) + - 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 @@ -327,13 +259,7 @@ - ensure echo is on (bnc #865956) 2014-03-10: 4.2.13 - - Merge pull request #5 from openSUSE/fate316530 - - Fate316530 - add 'autoyast2' option in preparation to fate #316530 - - The difference to 'autoyast' is that linuxrc itself downloads the file and - - passes the autoyast.xml file to yast. - - We have to use a different option name because autoyast uses it's own - - url schemes different from linuxrc. - s390: make sure network device has been activated before driver update (bnc #616341, bnc #862673) @@ -373,10 +299,7 @@ 2013-12-20: 4.2.4 - make linemode default on s390, swap linemode 1 & 2 -2013-12-19: 4.2.3 - - allow linuxrc to be restarted - - Merge pull request #4 from openSUSE/fate316139 - - Initial changes to use IBM-supplied chzdev command instead of our *_conf... +2013-12-17: 4.2.3 - Initial changes to use IBM-supplied chzdev command instead of our *_configure commands. 2013-12-05: 4.2.2 @@ -388,18 +311,8 @@ - allow media checks of any device (bnc #848020) - add back language menu -2013-11-18: 4.2.0 - - add back language defines - - nfs: use mount(8) and mount.nfs(8) to mount nfs exports (bnc #799496) - - if no install url given, try dvds, then hds - - Merge branch 'master' of gitorious.org:opensuse/linuxrc - - s390: handle empty portname correctly (bnc #760042) - - s390: handle empty portname correctly (bnc #760042) - - Merge branch 'master' of gitorious.org:opensuse/linuxrc - - Conflicts: - dialog.c +2012-07-05: 4.2.0 - remove i18n infrastructure and translations - - Signed-off-by: Ulrich Hecht <[email protected]> 2013-01-16: 4.1.4 - drop /etc/nothing @@ -412,54 +325,13 @@ 2012-12-13: 4.1.1 - Revert "clean-up: removed built-in extend" - - This reverts commit 2c59f72fee9d308dd791090c898b48bbb7fbbc21. -2012-11-26: 4.1.0 - - make sure WORDS_BIGENDIAN is defined correctly where needed (bnc #755861) - - add *.conf to modprobe config files to make them work (bnc #775800) - - fix console setup after plymouth - - turn off plymouth at first opportunity - - add plymouth config option - - remove lots of disabled code - - Signed-off-by: Ulrich Hecht <[email protected]> - - fix warnings about computed values not being used - - Signed-off-by: Ulrich Hecht <[email protected]> - - remove reference to hotplug.h from net.c - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in hotplug - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in extend - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in swapoff, raidautorun, free, wget, fstype, nothing - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in mkdir, chroot, kill, killall - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in ls, rm, mv, ln - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in cat, hex, echo, ps, lsof - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in mount, umount - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: removed built-in rmmod, lsmod - - Signed-off-by: Ulrich Hecht <[email protected]> - - clean-up: remove mkdevs, staticdevices option - - Signed-off-by: Ulrich Hecht <[email protected]> - - slp: error handling bug (found by clang) - - Signed-off-by: Ulrich Hecht <[email protected]> - - url: eliminate non-standard nested functions - - Signed-off-by: Ulrich Hecht <[email protected]> - - Merge branch 'master' of gitorious.org:opensuse/linuxrc +2012-06-05: 4.1.0 - clean-up: dump bootp - - dhcpcd can do bootp if necessary - - Signed-off-by: Ulrich Hecht <[email protected]> - clean-up: ditch exploding windows - - Signed-off-by: Ulrich Hecht <[email protected]> - clean-up: remove unused tftp code - - Signed-off-by: Ulrich Hecht <[email protected]> - clean-up: remove lsh (we have bash now) - - Signed-off-by: Ulrich Hecht <[email protected]> - clean-up: remove token ring code and messages - - Signed-off-by: Ulrich Hecht <[email protected]> 2012-05-30: 4.0.5 - give tmpfs a finite size @@ -610,9 +482,6 @@ - ensure 'extend' returns correct error code (bnc #510999) 2009-09-09: 3.4.5 - - Merge branch 'master' of [email protected]:opensuse/linuxrc - - Conflicts: - Changelog - no blocking popup for DHCP error message (bnc #534078) - starting new network setup code - s390: activate network interface before loading info file @@ -743,8 +612,8 @@ 2008-09-19: 3.3.5 - bump version - - s390: fixed flaky net device name detection (bnc #427475) - - s390: don't ask for network parameters twice + - s390: fixed flaky net device name detection (bnc #427475) + - s390: don't ask for network parameters twice 2008-09-17: 3.3.4 - make 'extend' a bit faster @@ -781,7 +650,7 @@ 2008-07-24: 3.2.2 - pass sax2 parameter - add some options - - 'extend' can now add and remove inst-sys parts + - 'extend' can now add and remove inst-sys parts 2008-07-21: 3.2.1 - reall ppc64 @@ -1219,8 +1088,8 @@ 2006-08-30: 2.1.1 - remove libsysfs but for s390 - changed tftp to bind to different port for each connection (bnc #187745) - - tell the user what file we failed to FTP - - s390: accept upper-case CCW addresses + - tell the user what file we failed to FTP + - s390: accept upper-case CCW addresses - set min vnc password length to 8 (bnc #184204) - s390: make CTC mode dialog wider (bnc #186563) @@ -1371,7 +1240,6 @@ - hare: s390 hotplug fix 2006-01-16: 2.0.9 - - Dutch texts updated - make sure /sbin/hotplug gets events - remove "devz" - pass iscsi option to yast (fate #85) @@ -1488,7 +1356,7 @@ - added armv4l support 2005-04-06: 1.8.9 - - s390: SCRIPTUP_* entries in hwcfg-* files must be lower-case + - s390: SCRIPTUP_* entries in hwcfg-* files must be lower-case after the underscore 2005-04-05: 1.8.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.21/net.c new/linuxrc-5.0.23/net.c --- old/linuxrc-5.0.21/net.c 2014-09-18 09:50:06.000000000 +0200 +++ new/linuxrc-5.0.23/net.c 2014-09-26 11:07:47.000000000 +0200 @@ -2270,6 +2270,14 @@ } } +#if defined(__s390__) || defined(__s390x__) + // s390 layer2 interfaces + if(config.hwp.layer2 && config.hwp.osahwaddr) { + sl = slist_append_str(&sl_ifcfg, "LLADDR"); + str_copy(&sl->value, config.hwp.osahwaddr); + } +#endif + if(sl_ifcfg) { if(asprintf(&fname, "/etc/sysconfig/network/ifcfg-%s%s", device, vlan ?: "") == -1) fname = NULL; fprintf(stderr, "creating ifcfg-%s%s:\n", device, vlan ?: ""); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
