post-commit ack This not only fixes non-s390 but should also fix s390 to not write layer2=1 if the user did not specify it. But then again, I had the impression that this code is not even executed on s390 any more which is why we had to write OPTIONS in linuxrc.s390 already [8549a36d4b22171992951a272b82f0aa14234dc4]. On 03/26/2010 10:20 PM, David Cantrell wrote: > OPTIONS=layer2=1 is just for s390x, so make sure it doesn't end up on > other architectures. > --- > loader/net.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/loader/net.c b/loader/net.c > index a987050..eff4782 100644 > --- a/loader/net.c > +++ b/loader/net.c > @@ -1200,7 +1200,7 @@ int writeDisabledNetInfo(void) { > * /etc/sysconfig/network > */ > int writeEnabledNetInfo(iface_t *iface) { > - int i = 0, osa_layer2 = 1, osa_portno = 0; > + int i = 0, osa_layer2 = 0, osa_portno = 0; > mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; > FILE *fp = NULL; > char buf[INET6_ADDRSTRLEN+1]; Steffen Linux on System z Development IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list